From 7cf70af2d4e7827b86ed237cbb82977ebbdb5b7e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 8 Oct 2023 01:28:20 +0200 Subject: [PATCH] update circleci --- .circleci/config.yml | 18 +++++++++--------- 15-master/bookworm/Dockerfile | 2 +- 16-master/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee052c28..df2ad833 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,6 +24,15 @@ jobs: - run: uname -a - run: docker --version - run: docker info + - run: + name: Install manifest-tool (linux-arm64 ) + command: | + wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz + mkdir manifest-tool + tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool + sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool + manifest-tool -v + - run: pip install lastversion - run: source tools/environment_init.sh - run: make check_version - docker/check: @@ -53,15 +62,6 @@ jobs: circleci-agent step halt fi - - run: - name: Install manifest-tool (linux-arm64 ) - command: | - wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz - mkdir manifest-tool - tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool - sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool - manifest-tool -v - - run: name: "Push docker image : make push-<< parameters.target-version-variant >>" command: | diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 12842668..1134efd6 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS_V1_POSTGIS_CHECKOUT=5c3c66a9282b3472bb161f61d1e762789cf4928b ARG PGIS_V1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS_V1_GDAL_CHECKOUT=2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4 +ARG PGIS_V1_GDAL_CHECKOUT=78d5980666602266a7e532ae5f76ffe1bf70b4ec ARG PGIS_V1_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index f02080ec..09d91689 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS_V1_POSTGIS_CHECKOUT=5c3c66a9282b3472bb161f61d1e762789cf4928b ARG PGIS_V1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS_V1_GDAL_CHECKOUT=2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4 +ARG PGIS_V1_GDAL_CHECKOUT=78d5980666602266a7e532ae5f76ffe1bf70b4ec ARG PGIS_V1_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c diff --git a/README.md b/README.md index 4b078daa..4272da54 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ This image ensures that the default database created by the parent `postgres` im Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`. -## Versions (2023-10-07) +## Versions (2023-10-08) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index a3353f1d..45966a8c 100644 --- a/versions.json +++ b/versions.json @@ -264,8 +264,8 @@ "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", - "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GDAL_CHECKOUT": "78d5980666602266a7e532ae5f76ffe1bf70b4ec", + "GDAL_CHECKOUT_SHA1": "78d5980666602266a7e532ae5f76ffe1bf70b4ec", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0" @@ -370,8 +370,8 @@ "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", - "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GDAL_CHECKOUT": "78d5980666602266a7e532ae5f76ffe1bf70b4ec", + "GDAL_CHECKOUT_SHA1": "78d5980666602266a7e532ae5f76ffe1bf70b4ec", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0"