From d038f6a2d12808c982c4885a8a69321c291422d3 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 7 Oct 2023 23:20:37 +0200 Subject: [PATCH 001/167] total refactoring ; - adapting official Docker PostgreSQL repository best practices ( multi debian, multi tags, templating, version.json, ... ) - auto refreshing README.md .github/workflows/main.yml .circleci/config.yml - adding geo bundle images - new Makefile - etc --- .circleci/config.yml | 116 ++++ .dockerignore | 16 +- .env | 22 + .env.test | 23 + .gitattributes | 11 + .github/workflows/localtest.yml | 17 + .github/workflows/main.yml | 189 +++++- .github/workflows/shellcheck.yml | 16 + .gitignore | 4 +- .travis.yml.disabled | 44 -- 11-3.3/{alpine => alpine3.18}/Dockerfile | 62 +- .../alpine3.18}/initdb-postgis.sh | 8 +- 11-3.3/alpine3.18/tags | 1 + .../{alpine => alpine3.18}/update-postgis.sh | 0 11-3.3/bookworm/Dockerfile | 28 + .../bookworm}/initdb-postgis.sh | 8 +- 11-3.3/bookworm/tags | 1 + 11-3.3/{ => bookworm}/update-postgis.sh | 0 11-3.3/{ => bullseye}/Dockerfile | 6 +- 11-3.3/{ => bullseye}/initdb-postgis.sh | 8 +- 11-3.3/bullseye/tags | 1 + .../bullseye}/update-postgis.sh | 0 .../alpine => 12-3.4/alpine3.18}/Dockerfile | 62 +- .../alpine3.18}/initdb-postgis.sh | 8 +- 12-3.4/alpine3.18/tags | 1 + 12-3.4/{ => alpine3.18}/update-postgis.sh | 0 12-3.4/bookworm/Dockerfile | 28 + 12-3.4/bookworm/initdb-postgis.sh | 25 + 12-3.4/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 12-3.4/{ => bullseye}/Dockerfile | 6 +- 12-3.4/bullseye/initdb-postgis.sh | 25 + 12-3.4/bullseye/tags | 1 + {13-3.4 => 12-3.4/bullseye}/update-postgis.sh | 0 13-3.4-bundle/bookworm/Dockerfile | 327 ++++++++++ 13-3.4-bundle/bookworm/tags | 1 + 13-3.4/alpine/initdb-postgis.sh | 25 - .../alpine => 13-3.4/alpine3.18}/Dockerfile | 62 +- 13-3.4/alpine3.18/initdb-postgis.sh | 25 + 13-3.4/alpine3.18/tags | 1 + .../alpine3.18}/update-postgis.sh | 0 13-3.4/bookworm/Dockerfile | 28 + 13-3.4/bookworm/initdb-postgis.sh | 25 + 13-3.4/bookworm/tags | 1 + {14-3.4 => 13-3.4/bookworm}/update-postgis.sh | 0 13-3.4/{ => bullseye}/Dockerfile | 6 +- 13-3.4/bullseye/initdb-postgis.sh | 25 + 13-3.4/bullseye/tags | 1 + .../bullseye}/update-postgis.sh | 0 13-3.4/initdb-postgis.sh | 25 - 14-3.4-bundle/bookworm/Dockerfile | 327 ++++++++++ 14-3.4-bundle/bookworm/tags | 1 + 14-3.4/alpine/initdb-postgis.sh | 25 - .../alpine => 14-3.4/alpine3.18}/Dockerfile | 62 +- 14-3.4/alpine3.18/initdb-postgis.sh | 25 + 14-3.4/alpine3.18/tags | 1 + .../alpine3.18}/update-postgis.sh | 0 14-3.4/bookworm/Dockerfile | 28 + 14-3.4/bookworm/initdb-postgis.sh | 25 + 14-3.4/bookworm/tags | 1 + {15-3.4 => 14-3.4/bookworm}/update-postgis.sh | 0 14-3.4/{ => bullseye}/Dockerfile | 6 +- 14-3.4/bullseye/initdb-postgis.sh | 25 + 14-3.4/bullseye/tags | 1 + .../bullseye}/update-postgis.sh | 0 14-3.4/initdb-postgis.sh | 25 - 14-master/initdb-postgis.sh | 25 - 15-3.4-bundle/bookworm/Dockerfile | 327 ++++++++++ 15-3.4-bundle/bookworm/tags | 1 + 15-3.4/alpine/initdb-postgis.sh | 25 - .../alpine => 15-3.4/alpine3.18}/Dockerfile | 62 +- 15-3.4/alpine3.18/initdb-postgis.sh | 25 + 15-3.4/alpine3.18/tags | 1 + .../alpine3.18}/update-postgis.sh | 0 15-3.4/bookworm/Dockerfile | 28 + 15-3.4/bookworm/initdb-postgis.sh | 25 + 15-3.4/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 15-3.4/{ => bullseye}/Dockerfile | 6 +- 15-3.4/bullseye/initdb-postgis.sh | 25 + 15-3.4/bullseye/tags | 1 + .../bullseye}/update-postgis.sh | 0 15-3.4/initdb-postgis.sh | 25 - .../bookworm}/Dockerfile | 224 ++++--- 15-master/bookworm/initdb-postgis.sh | 25 + 15-master/bookworm/tags | 1 + 15-master/bookworm/update-postgis.sh | 28 + 15-master/initdb-postgis.sh | 25 - .../bookworm}/Dockerfile | 224 ++++--- 15-recentstack/bookworm/initdb-postgis.sh | 25 + 15-recentstack/bookworm/tags | 1 + 15-recentstack/bookworm/update-postgis.sh | 28 + 16-3.4-bundle/bookworm/Dockerfile | 306 +++++++++ 16-3.4-bundle/bookworm/tags | 1 + 16-3.4/alpine3.18/Dockerfile | 150 +++++ 16-3.4/alpine3.18/initdb-postgis.sh | 25 + 16-3.4/alpine3.18/tags | 1 + 16-3.4/alpine3.18/update-postgis.sh | 28 + 16-3.4/bookworm/Dockerfile | 28 + 16-3.4/bookworm/initdb-postgis.sh | 25 + 16-3.4/bookworm/tags | 1 + 16-3.4/bookworm/update-postgis.sh | 28 + 16-3.4/bullseye/Dockerfile | 28 + 16-3.4/bullseye/initdb-postgis.sh | 25 + 16-3.4/bullseye/tags | 1 + 16-3.4/bullseye/update-postgis.sh | 28 + 16-master/bookworm/Dockerfile | 530 +++++++++++++++ 16-master/bookworm/initdb-postgis.sh | 25 + 16-master/bookworm/tags | 1 + 16-master/bookworm/update-postgis.sh | 28 + .../bookworm}/Dockerfile | 224 ++++--- 16-recentstack/bookworm/initdb-postgis.sh | 25 + 16-recentstack/bookworm/tags | 1 + 16-recentstack/bookworm/update-postgis.sh | 28 + 16beta3-3.4/Dockerfile | 28 - 16beta3-3.4/alpine/Dockerfile | 124 ---- 16beta3-3.4/alpine/initdb-postgis.sh | 25 - 16beta3-3.4/initdb-postgis.sh | 25 - 16beta3-master/initdb-postgis.sh | 25 - Dockerfile.alpine.template | 65 +- Dockerfile.bundle.template | 348 ++++++++++ Dockerfile.debian.template | 23 + Dockerfile.master.template | 229 ++++--- Dockerfile.template | 28 - Makefile | 417 ++++++++---- README.md | 239 ++++--- _migrate.sh | 70 ++ apply-ci.sh | 97 +++ apply-manifest.sh | 84 +++ apply-readme.sh | 91 +++ apply-templates.sh | 74 +++ doc/developers.md | 34 + initdb-postgis.sh | 8 +- localtest.sh | 71 ++ manifest.sh | 491 ++++++++++++++ test/postgis-config.sh | 24 +- test/tests/postgis-basics/run.sh | 66 +- test/tests/postgis-bundle/run.sh | 72 ++ tools/environment_init.sh | 133 ++++ update.sh | 209 +----- versions.json | 404 ++++++++++++ versions.sh | 613 ++++++++++++++++++ 142 files changed, 7255 insertions(+), 1399 deletions(-) create mode 100644 .circleci/config.yml create mode 100644 .env create mode 100644 .env.test create mode 100644 .gitattributes create mode 100644 .github/workflows/localtest.yml create mode 100644 .github/workflows/shellcheck.yml delete mode 100644 .travis.yml.disabled rename 11-3.3/{alpine => alpine3.18}/Dockerfile (72%) rename {12-3.4 => 11-3.3/alpine3.18}/initdb-postgis.sh (81%) create mode 100644 11-3.3/alpine3.18/tags rename 11-3.3/{alpine => alpine3.18}/update-postgis.sh (100%) create mode 100644 11-3.3/bookworm/Dockerfile rename {12-3.4/alpine => 11-3.3/bookworm}/initdb-postgis.sh (81%) create mode 100644 11-3.3/bookworm/tags rename 11-3.3/{ => bookworm}/update-postgis.sh (100%) rename 11-3.3/{ => bullseye}/Dockerfile (87%) rename 11-3.3/{ => bullseye}/initdb-postgis.sh (81%) create mode 100644 11-3.3/bullseye/tags rename {12-3.4/alpine => 11-3.3/bullseye}/update-postgis.sh (100%) rename {13-3.4/alpine => 12-3.4/alpine3.18}/Dockerfile (72%) rename {11-3.3/alpine => 12-3.4/alpine3.18}/initdb-postgis.sh (81%) create mode 100644 12-3.4/alpine3.18/tags rename 12-3.4/{ => alpine3.18}/update-postgis.sh (100%) create mode 100644 12-3.4/bookworm/Dockerfile create mode 100644 12-3.4/bookworm/initdb-postgis.sh create mode 100644 12-3.4/bookworm/tags rename {13-3.4/alpine => 12-3.4/bookworm}/update-postgis.sh (100%) rename 12-3.4/{ => bullseye}/Dockerfile (87%) create mode 100644 12-3.4/bullseye/initdb-postgis.sh create mode 100644 12-3.4/bullseye/tags rename {13-3.4 => 12-3.4/bullseye}/update-postgis.sh (100%) create mode 100644 13-3.4-bundle/bookworm/Dockerfile create mode 100644 13-3.4-bundle/bookworm/tags delete mode 100644 13-3.4/alpine/initdb-postgis.sh rename {14-3.4/alpine => 13-3.4/alpine3.18}/Dockerfile (72%) create mode 100644 13-3.4/alpine3.18/initdb-postgis.sh create mode 100644 13-3.4/alpine3.18/tags rename {14-3.4/alpine => 13-3.4/alpine3.18}/update-postgis.sh (100%) create mode 100644 13-3.4/bookworm/Dockerfile create mode 100644 13-3.4/bookworm/initdb-postgis.sh create mode 100644 13-3.4/bookworm/tags rename {14-3.4 => 13-3.4/bookworm}/update-postgis.sh (100%) rename 13-3.4/{ => bullseye}/Dockerfile (87%) create mode 100644 13-3.4/bullseye/initdb-postgis.sh create mode 100644 13-3.4/bullseye/tags rename {14-master => 13-3.4/bullseye}/update-postgis.sh (100%) delete mode 100644 13-3.4/initdb-postgis.sh create mode 100644 14-3.4-bundle/bookworm/Dockerfile create mode 100644 14-3.4-bundle/bookworm/tags delete mode 100644 14-3.4/alpine/initdb-postgis.sh rename {15-3.4/alpine => 14-3.4/alpine3.18}/Dockerfile (72%) create mode 100644 14-3.4/alpine3.18/initdb-postgis.sh create mode 100644 14-3.4/alpine3.18/tags rename {15-3.4/alpine => 14-3.4/alpine3.18}/update-postgis.sh (100%) create mode 100644 14-3.4/bookworm/Dockerfile create mode 100644 14-3.4/bookworm/initdb-postgis.sh create mode 100644 14-3.4/bookworm/tags rename {15-3.4 => 14-3.4/bookworm}/update-postgis.sh (100%) rename 14-3.4/{ => bullseye}/Dockerfile (87%) create mode 100644 14-3.4/bullseye/initdb-postgis.sh create mode 100644 14-3.4/bullseye/tags rename {15-master => 14-3.4/bullseye}/update-postgis.sh (100%) delete mode 100644 14-3.4/initdb-postgis.sh delete mode 100644 14-master/initdb-postgis.sh create mode 100644 15-3.4-bundle/bookworm/Dockerfile create mode 100644 15-3.4-bundle/bookworm/tags delete mode 100644 15-3.4/alpine/initdb-postgis.sh rename {12-3.4/alpine => 15-3.4/alpine3.18}/Dockerfile (72%) create mode 100644 15-3.4/alpine3.18/initdb-postgis.sh create mode 100644 15-3.4/alpine3.18/tags rename {16beta3-3.4/alpine => 15-3.4/alpine3.18}/update-postgis.sh (100%) create mode 100644 15-3.4/bookworm/Dockerfile create mode 100644 15-3.4/bookworm/initdb-postgis.sh create mode 100644 15-3.4/bookworm/tags rename {16beta3-3.4 => 15-3.4/bookworm}/update-postgis.sh (100%) rename 15-3.4/{ => bullseye}/Dockerfile (87%) create mode 100644 15-3.4/bullseye/initdb-postgis.sh create mode 100644 15-3.4/bullseye/tags rename {16beta3-master => 15-3.4/bullseye}/update-postgis.sh (100%) delete mode 100644 15-3.4/initdb-postgis.sh rename {16beta3-master => 15-master/bookworm}/Dockerfile (64%) create mode 100644 15-master/bookworm/initdb-postgis.sh create mode 100644 15-master/bookworm/tags create mode 100755 15-master/bookworm/update-postgis.sh delete mode 100644 15-master/initdb-postgis.sh rename {14-master => 15-recentstack/bookworm}/Dockerfile (64%) create mode 100644 15-recentstack/bookworm/initdb-postgis.sh create mode 100644 15-recentstack/bookworm/tags create mode 100755 15-recentstack/bookworm/update-postgis.sh create mode 100644 16-3.4-bundle/bookworm/Dockerfile create mode 100644 16-3.4-bundle/bookworm/tags create mode 100644 16-3.4/alpine3.18/Dockerfile create mode 100644 16-3.4/alpine3.18/initdb-postgis.sh create mode 100644 16-3.4/alpine3.18/tags create mode 100755 16-3.4/alpine3.18/update-postgis.sh create mode 100644 16-3.4/bookworm/Dockerfile create mode 100644 16-3.4/bookworm/initdb-postgis.sh create mode 100644 16-3.4/bookworm/tags create mode 100755 16-3.4/bookworm/update-postgis.sh create mode 100644 16-3.4/bullseye/Dockerfile create mode 100644 16-3.4/bullseye/initdb-postgis.sh create mode 100644 16-3.4/bullseye/tags create mode 100755 16-3.4/bullseye/update-postgis.sh create mode 100644 16-master/bookworm/Dockerfile create mode 100644 16-master/bookworm/initdb-postgis.sh create mode 100644 16-master/bookworm/tags create mode 100755 16-master/bookworm/update-postgis.sh rename {15-master => 16-recentstack/bookworm}/Dockerfile (64%) create mode 100644 16-recentstack/bookworm/initdb-postgis.sh create mode 100644 16-recentstack/bookworm/tags create mode 100755 16-recentstack/bookworm/update-postgis.sh delete mode 100644 16beta3-3.4/Dockerfile delete mode 100644 16beta3-3.4/alpine/Dockerfile delete mode 100644 16beta3-3.4/alpine/initdb-postgis.sh delete mode 100644 16beta3-3.4/initdb-postgis.sh delete mode 100644 16beta3-master/initdb-postgis.sh create mode 100644 Dockerfile.bundle.template create mode 100644 Dockerfile.debian.template delete mode 100644 Dockerfile.template create mode 100755 _migrate.sh create mode 100755 apply-ci.sh create mode 100755 apply-manifest.sh create mode 100755 apply-readme.sh create mode 100755 apply-templates.sh create mode 100644 doc/developers.md create mode 100755 localtest.sh create mode 100755 manifest.sh create mode 100755 test/tests/postgis-bundle/run.sh create mode 100644 tools/environment_init.sh create mode 100644 versions.json create mode 100755 versions.sh diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..ee052c284 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,116 @@ +# .circleci/config.yml + +# Circle CI arm64 builder +version: 2.1 + +orbs: + # https://circleci.com/developer/orbs/orb/circleci/docker + docker: circleci/docker@2.2.0 + +jobs: + build-arm64: + machine: + image: ubuntu-2204:current + resource_class: arm.medium + environment: + BUILDX_PLATFORMS: linux/arm64v8 + DOCKER_BUILDKIT: '1' + PLATFORM: linux/arm64v8 + parameters: + target-version-variant: + type: string + steps: + - checkout + - run: uname -a + - run: docker --version + - run: docker info + - run: source tools/environment_init.sh + - run: make check_version + - docker/check: + registry: docker.io + docker-username: DOCKERHUB_USERNAME + docker-password: DOCKERHUB_ACCESS_TOKEN + + - run: + name: Conditional Docker Check - Halt if not on master branch or if it's a PR + command: | + # Check if the current branch is 'master' and the weekly image is not extis + # If weekly image exists, skip docker build and push + if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then + circleci-agent step halt + fi + + - run: make -n test-<< parameters.target-version-variant >> + - run: make test-<< parameters.target-version-variant >> + - run: docker images + + - run: + name: Conditional Docker Check - Halt if not on master branch or if it's a PR + command: | + # Check if the current branch is NOT 'master' or if the build is triggered by a pull request. + # If either of these conditions is met, halt the workflow. + if [ "$CIRCLE_BRANCH" != "master" ] || [ -n "$CIRCLE_PULL_REQUEST" ]; then + 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: | + if [ "$CIRCLE_BRANCH" == "master" ] && [ -z "$CIRCLE_PULL_REQUEST" ]; then + make push-<< parameters.target-version-variant >> + make manifest-<< parameters.target-version-variant >> + echo "...push and manifest done..." + fi + +workflows: + build-deploy: +# AND triggered by weekly from the app.circleci.com UI + jobs: + - build-arm64: + matrix: + parameters: + target-version-variant: [ +# +# They are created using the ./apply-ci.sh script based on the version.json file, +# where the architecture is defined as "arm64". +# These "--skip--" images serve as inputs for the "*-bundle" images, +# hence they must be generated within the bundle JOB. +# +#circleci-targets-start + "11-3.3-alpine3.18", + "11-3.3-bookworm", + "11-3.3-bullseye", + "12-3.4-alpine3.18", + "12-3.4-bookworm", + "12-3.4-bullseye", + "13-3.4-alpine3.18", +# --skip-- "13-3.4-bookworm", --> generated with the related bundle job! + "13-3.4-bullseye", + "13-3.4-bundle-bookworm", + "14-3.4-alpine3.18", +# --skip-- "14-3.4-bookworm", --> generated with the related bundle job! + "14-3.4-bullseye", + "14-3.4-bundle-bookworm", + "15-3.4-alpine3.18", +# --skip-- "15-3.4-bookworm", --> generated with the related bundle job! + "15-3.4-bullseye", + "15-3.4-bundle-bookworm", + "15-master-bookworm", + "15-recentstack-bookworm", + "16-3.4-alpine3.18", +# --skip-- "16-3.4-bookworm", --> generated with the related bundle job! + "16-3.4-bullseye", + "16-3.4-bundle-bookworm", + "16-master-bookworm", + "16-recentstack-bookworm", +#circleci-targets-end + ] diff --git a/.dockerignore b/.dockerignore index 2de8e88c3..a24870387 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,17 @@ -Dockerfile .git _* +.jq-template.awk +.vscode/ + +.git/ +.github/ +.gitignore +.circleci/ + +docs/ +README.md +version.json + +Dockerfile.*.template +localetest.sh +apply-*.sh \ No newline at end of file diff --git a/.env b/.env new file mode 100644 index 000000000..746da9e9c --- /dev/null +++ b/.env @@ -0,0 +1,22 @@ +# PROD setup +# +# Setup info, used by: +# ./update.sh and other scripts ( ./apply-*.sh ) +# ./Makefile +# ./.github/workflows/main.yml +# ./.circleci/config.yml +# +# IF your are changing the values, please run ./update.sh +# to update some hard coded values in the Dockerfiles or README.md +# + +REGISTRY=docker.io +REPO_NAME=imresamu +IMAGE_NAME=postgis +DOCKERHUB_README_REPOSITORY=imresamu/postgis + +dockerhublink='https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=' +githubrepolink='https://github.com/imresamu/docker-postgis/blob/master' + +ENABLE_IMAGE_ARCH=true +ENABLE_IMAGE_VERSION_ID=true diff --git a/.env.test b/.env.test new file mode 100644 index 000000000..e6f2a3862 --- /dev/null +++ b/.env.test @@ -0,0 +1,23 @@ +# Test Setup ; if TEST=true +# +# Setup info, used by: +# ./update.sh and other scripts ( ./apply-*.sh ) +# ./Makefile +# ./.github/workflows/main.yml +# ./.circleci/config.yml +# +# IF your are changing the values, please run ./update.sh +# to update some hard coded values in the Dockerfiles or README.md +# + +REGISTRY=localhost:5000 +REPO_NAME=testrepo +IMAGE_NAME=testpostgisimage +DOCKERHUB_README_REPOSITORY=testrepo/testpostgisimage + +dockerhublink='https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=' +githubrepolink='https://github.com/postgis/docker-postgis/blob/master' + +ENABLE_IMAGE_ARCH=true +ENABLE_IMAGE_VERSION_ID=true + diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..16c09d088 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +# https://github.com/actions/checkout/issues/135#issuecomment-613361104 +* text eol=lf + +/*/**/Dockerfile linguist-generated +/*/**/initdb-postgis.sh linguist-generated +/*/**/update-postgis.sh linguist-generated +/*/**/tags linguist-generated +.github/workflows/main.yml linguist-generated +versions.json linguist-generated +README.md linguist-generated +/Dockerfile*.template linguist-language=Dockerfile diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml new file mode 100644 index 000000000..79a0dfe31 --- /dev/null +++ b/.github/workflows/localtest.yml @@ -0,0 +1,17 @@ +name: "Localtest" +# testing the workflow +on: + push: + pull_request: + schedule: + - cron: '15 5 * * 1' + +jobs: + localtest: + name: "testing ./localtest.sh ( update.sh and build test and push to local registry )" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: docker ps -a + - run: ./localtest.sh + - run: docker images diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ed788d31..ed1d08e01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,65 +1,192 @@ -name: Docker PostGIS CI +name: Build PostGIS images + +# This is the x86_64/Amd64 build worklow on: push: pull_request: schedule: - - cron: '15 5 * * 1' + - cron: '15 5 * * *' defaults: run: shell: bash jobs: - make-docker-images: strategy: matrix: - postgres: [12, 13, 14, 15, 16beta3] - postgis: ['3.4'] - variant: [default, alpine] include: - - postgres: 14 - postgis: master - variant: default - - postgres: 15 - postgis: master - variant: default - - postgres: 16beta3 - postgis: master - variant: default - - postgres: 11 - postgis: 3.3 - variant: default - - postgres: 11 - postgis: 3.3 - variant: alpine - - name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} - runs-on: ubuntu-20.04 +# +# They are created using the ./apply-ci.sh script based on the version.json file, +# +# These "--skip--" images serve as inputs for the "*-bundle" images, +# hence they must be generated within the bundle JOB. +# +#matrix-include-start + - { version: "11-3.3", variant: "alpine3.18", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine", readme_group: "alpine3.18" } + - { version: "11-3.3", variant: "bookworm", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", readme_group: "bookworm" } + - { version: "11-3.3", variant: "bullseye", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bullseye 11-3.3.4-bullseye", readme_group: "bullseye" } + - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", readme_group: "bookworm" } + - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } + - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "13-3.4-bundle", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle", readme_group: "bundle" } + - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } + - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "14-3.4-bundle", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle", readme_group: "bundle" } + - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", readme_group: "bookworm" } + - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "15-3.4-bundle", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle", readme_group: "bundle" } + - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } + - { version: "15-recentstack", variant: "bookworm", postgres: "15", postgis: "recentstack", arch: "amd64 arm64", tags: "15-recentstack-bookworm 15-recentstack", readme_group: "recentstack" } + - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", readme_group: "bookworm" } + - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "16-3.4-bundle", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle", readme_group: "bundle" } + - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } + - { version: "16-recentstack", variant: "bookworm", postgres: "16", postgis: "recentstack", arch: "amd64 arm64", tags: "16-recentstack-bookworm 16-recentstack", readme_group: "recentstack" } +#matrix-include-end + + name: "${{ matrix.version }}-${{ matrix.variant }} docker image" + runs-on: ubuntu-22.04 continue-on-error: ${{ matrix.postgis == 'master' }} env: - VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }} - VARIANT: ${{ matrix.variant }} + PLATFORM: linux/amd64 + DOCKER_BUILDKIT: '1' + BUILDX_PLATFORMS: linux/amd64 steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 + + - name: Environment init + run: source tools/environment_init.sh + + - run: make check_version + + - name: Check if DOCKERHUB_USERNAME exists + run: | + if [[ -z "${{ secrets.DOCKERHUB_USERNAME }}" ]]; then + echo "DOCKERHUB_USERNAME is not set" + exit 1 + else + echo "DOCKERHUB_USERNAME is set" + fi + + - name: Check if DOCKERHUB_ACCESS_TOKEN exists + run: | + if [[ -z "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" ]]; then + echo "DOCKERHUB_ACCESS_TOKEN is not set" + exit 1 + else + echo "DOCKERHUB_ACCESS_TOKEN is set" + fi + + - name: Source the check_image_exists function + run: source tools/environment_init.sh + + - name: Check if image exists + id: check-image + run: | + if check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then + echo "IMAGE_EXISTS=true" >> $GITHUB_ENV + else + echo "IMAGE_EXISTS=false" >> $GITHUB_ENV + fi + + - name: Exit if image exists + if: env.IMAGE_EXISTS == 'true' + run: | + echo "weekly build exists; no need to re-build. STOP" + exit 0 - - name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }} - run: make test + - name: "verify: make -n test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" + if: env.IMAGE_EXISTS == 'false' + run: make -n test-${{ matrix.version }}-${{ matrix.variant }} + + - name: "make test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" + if: env.IMAGE_EXISTS == 'false' + run: make test-${{ matrix.version }}-${{ matrix.variant }} + + - run: make dockerlist - name: Login to dockerhub uses: docker/login-action@v2 - if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: Install manifest-tool + if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + run: | + 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-amd64 /usr/local/bin/manifest-tool + manifest-tool -v + - name: Push docker image to dockerhub + if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + run: | + make push-${{ matrix.version }}-${{ matrix.variant }} + make manifest-${{ matrix.version }}-${{ matrix.variant }} + + + make-manifest: + name: update manifest + needs: make-docker-images + runs-on: ubuntu-22.04 + env: + PLATFORM: linux/amd64 + DOCKER_BUILDKIT: '1' + BUILDX_PLATFORMS: linux/amd64 + + # Todo: wait CircleCI workflow to start updating the manifest + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Environment init + run: source tools/environment_init.sh + + - run: make check_version + +#TODO: fix waiting for CircleCI + - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds + + - name: Login to dockerhub + uses: docker/login-action@v2 + if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: Install manifest-tool + run: | + 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-amd64 /usr/local/bin/manifest-tool + manifest-tool -v + + - name: Update docker manifest + if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + run: ./manifest.sh + + - name: push readme to docker hub api if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - run: make push + run: make push-readme + diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml new file mode 100644 index 000000000..a2e20bc94 --- /dev/null +++ b/.github/workflows/shellcheck.yml @@ -0,0 +1,16 @@ +name: "Shellcheck" + +on: + push: + pull_request: + +jobs: + shellcheck: + name: Shellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Run ShellCheck + uses: ludeeus/action-shellcheck@master + env: + SHELLCHECK_OPTS: --external-sources \ No newline at end of file diff --git a/.gitignore b/.gitignore index c43407444..8c8d8fcd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -_* \ No newline at end of file +.jq-template.awk +_* +.vscode/ diff --git a/.travis.yml.disabled b/.travis.yml.disabled deleted file mode 100644 index 1415e6fe3..000000000 --- a/.travis.yml.disabled +++ /dev/null @@ -1,44 +0,0 @@ ---- -language: bash -services: docker - -dist: xenial - -env: - - VERSION=13-master - - VERSION=13-3.0 - - VERSION=13-3.0 VARIANT=alpine - - VERSION=12-master - - VERSION=12-3.0 - - VERSION=12-3.0 VARIANT=alpine - - VERSION=12-2.5 - - VERSION=12-2.5 VARIANT=alpine - - VERSION=11-3.0 - - VERSION=11-3.0 VARIANT=alpine - - VERSION=11-2.5 - - VERSION=11-2.5 VARIANT=alpine - - VERSION=10-3.0 - - VERSION=10-3.0 VARIANT=alpine - - VERSION=10-2.5 - - VERSION=10-2.5 VARIANT=alpine - - VERSION=9.6-3.0 - - VERSION=9.6-3.0 VARIANT=alpine - - VERSION=9.6-2.5 - - VERSION=9.6-2.5 VARIANT=alpine - - VERSION=9.5-3.0 - - VERSION=9.5-3.0 VARIANT=alpine - - VERSION=9.5-2.5 - - VERSION=9.5-2.5 VARIANT=alpine - -jobs: - allow_failures: - - env: VERSION=12-master - - env: VERSION=13-master - -script: - - if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" == "master" ]]; then - echo "$DOCKERHUB_ACCESS_TOKEN" | docker login -u $DOCKERHUB_USERNAME --password-stdin && - make push ; - else - make test ; - fi diff --git a/11-3.3/alpine/Dockerfile b/11-3.3/alpine3.18/Dockerfile similarity index 72% rename from 11-3.3/alpine/Dockerfile rename to 11-3.3/alpine3.18/Dockerfile index 86b941650..69c39d2eb 100644 --- a/11-3.3/alpine/Dockerfile +++ b/11-3.3/alpine3.18/Dockerfile @@ -1,34 +1,46 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:11-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:11-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.3.4 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=846cce0c6420a3d0483d2a1a3baee182d2fc1217 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 11 Alpine" \ + org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 11 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.3.4 ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +55,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +65,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/12-3.4/initdb-postgis.sh b/11-3.3/alpine3.18/initdb-postgis.sh similarity index 81% rename from 12-3.4/initdb-postgis.sh rename to 11-3.3/alpine3.18/initdb-postgis.sh index e38ad7d66..21f8c373d 100644 --- a/12-3.4/initdb-postgis.sh +++ b/11-3.3/alpine3.18/initdb-postgis.sh @@ -1,19 +1,19 @@ #!/bin/bash - +# shellcheck disable=SC2154 set -e # Perform all actions as $POSTGRES_USER export PGUSER="$POSTGRES_USER" # Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' +"${psql[@]}" <<-'EOSQL' CREATE DATABASE template_postgis IS_TEMPLATE true; EOSQL # Load PostGIS into both template_database and $POSTGRES_DB for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' CREATE EXTENSION IF NOT EXISTS postgis; CREATE EXTENSION IF NOT EXISTS postgis_topology; -- Reconnect to update pg_setting.resetval diff --git a/11-3.3/alpine3.18/tags b/11-3.3/alpine3.18/tags new file mode 100644 index 000000000..74b2f3bde --- /dev/null +++ b/11-3.3/alpine3.18/tags @@ -0,0 +1 @@ +11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine diff --git a/11-3.3/alpine/update-postgis.sh b/11-3.3/alpine3.18/update-postgis.sh similarity index 100% rename from 11-3.3/alpine/update-postgis.sh rename to 11-3.3/alpine3.18/update-postgis.sh diff --git a/11-3.3/bookworm/Dockerfile b/11-3.3/bookworm/Dockerfile new file mode 100644 index 000000000..8128b8566 --- /dev/null +++ b/11-3.3/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:11-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 11 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/alpine/initdb-postgis.sh b/11-3.3/bookworm/initdb-postgis.sh similarity index 81% rename from 12-3.4/alpine/initdb-postgis.sh rename to 11-3.3/bookworm/initdb-postgis.sh index e38ad7d66..21f8c373d 100644 --- a/12-3.4/alpine/initdb-postgis.sh +++ b/11-3.3/bookworm/initdb-postgis.sh @@ -1,19 +1,19 @@ #!/bin/bash - +# shellcheck disable=SC2154 set -e # Perform all actions as $POSTGRES_USER export PGUSER="$POSTGRES_USER" # Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' +"${psql[@]}" <<-'EOSQL' CREATE DATABASE template_postgis IS_TEMPLATE true; EOSQL # Load PostGIS into both template_database and $POSTGRES_DB for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' CREATE EXTENSION IF NOT EXISTS postgis; CREATE EXTENSION IF NOT EXISTS postgis_topology; -- Reconnect to update pg_setting.resetval diff --git a/11-3.3/bookworm/tags b/11-3.3/bookworm/tags new file mode 100644 index 000000000..d3c4a0105 --- /dev/null +++ b/11-3.3/bookworm/tags @@ -0,0 +1 @@ +11-3.3-bookworm 11-3.3.4-bookworm 11-3.3 diff --git a/11-3.3/update-postgis.sh b/11-3.3/bookworm/update-postgis.sh similarity index 100% rename from 11-3.3/update-postgis.sh rename to 11-3.3/bookworm/update-postgis.sh diff --git a/11-3.3/Dockerfile b/11-3.3/bullseye/Dockerfile similarity index 87% rename from 11-3.3/Dockerfile rename to 11-3.3/bullseye/Dockerfile index b09cd77e2..b8724f19c 100644 --- a/11-3.3/Dockerfile +++ b/11-3.3/bullseye/Dockerfile @@ -1,7 +1,8 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - FROM postgres:11-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ @@ -25,4 +26,3 @@ RUN apt-get update \ RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin - diff --git a/11-3.3/initdb-postgis.sh b/11-3.3/bullseye/initdb-postgis.sh similarity index 81% rename from 11-3.3/initdb-postgis.sh rename to 11-3.3/bullseye/initdb-postgis.sh index e38ad7d66..21f8c373d 100644 --- a/11-3.3/initdb-postgis.sh +++ b/11-3.3/bullseye/initdb-postgis.sh @@ -1,19 +1,19 @@ #!/bin/bash - +# shellcheck disable=SC2154 set -e # Perform all actions as $POSTGRES_USER export PGUSER="$POSTGRES_USER" # Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' +"${psql[@]}" <<-'EOSQL' CREATE DATABASE template_postgis IS_TEMPLATE true; EOSQL # Load PostGIS into both template_database and $POSTGRES_DB for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' CREATE EXTENSION IF NOT EXISTS postgis; CREATE EXTENSION IF NOT EXISTS postgis_topology; -- Reconnect to update pg_setting.resetval diff --git a/11-3.3/bullseye/tags b/11-3.3/bullseye/tags new file mode 100644 index 000000000..4fd3ed8b6 --- /dev/null +++ b/11-3.3/bullseye/tags @@ -0,0 +1 @@ +11-3.3-bullseye 11-3.3.4-bullseye diff --git a/12-3.4/alpine/update-postgis.sh b/11-3.3/bullseye/update-postgis.sh similarity index 100% rename from 12-3.4/alpine/update-postgis.sh rename to 11-3.3/bullseye/update-postgis.sh diff --git a/13-3.4/alpine/Dockerfile b/12-3.4/alpine3.18/Dockerfile similarity index 72% rename from 13-3.4/alpine/Dockerfile rename to 12-3.4/alpine3.18/Dockerfile index c8445b93e..2e59d2934 100644 --- a/13-3.4/alpine/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -1,34 +1,46 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:13-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 13 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 12 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.4.0 ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +55,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +65,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/11-3.3/alpine/initdb-postgis.sh b/12-3.4/alpine3.18/initdb-postgis.sh similarity index 81% rename from 11-3.3/alpine/initdb-postgis.sh rename to 12-3.4/alpine3.18/initdb-postgis.sh index e38ad7d66..21f8c373d 100644 --- a/11-3.3/alpine/initdb-postgis.sh +++ b/12-3.4/alpine3.18/initdb-postgis.sh @@ -1,19 +1,19 @@ #!/bin/bash - +# shellcheck disable=SC2154 set -e # Perform all actions as $POSTGRES_USER export PGUSER="$POSTGRES_USER" # Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' +"${psql[@]}" <<-'EOSQL' CREATE DATABASE template_postgis IS_TEMPLATE true; EOSQL # Load PostGIS into both template_database and $POSTGRES_DB for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' CREATE EXTENSION IF NOT EXISTS postgis; CREATE EXTENSION IF NOT EXISTS postgis_topology; -- Reconnect to update pg_setting.resetval diff --git a/12-3.4/alpine3.18/tags b/12-3.4/alpine3.18/tags new file mode 100644 index 000000000..5d3182592 --- /dev/null +++ b/12-3.4/alpine3.18/tags @@ -0,0 +1 @@ +12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine diff --git a/12-3.4/update-postgis.sh b/12-3.4/alpine3.18/update-postgis.sh similarity index 100% rename from 12-3.4/update-postgis.sh rename to 12-3.4/alpine3.18/update-postgis.sh diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile new file mode 100644 index 000000000..c2d8c7faa --- /dev/null +++ b/12-3.4/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:12-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/bookworm/initdb-postgis.sh b/12-3.4/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.4/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags new file mode 100644 index 000000000..5140fdf82 --- /dev/null +++ b/12-3.4/bookworm/tags @@ -0,0 +1 @@ +12-3.4-bookworm 12-3.4.0-bookworm 12-3.4 diff --git a/13-3.4/alpine/update-postgis.sh b/12-3.4/bookworm/update-postgis.sh similarity index 100% rename from 13-3.4/alpine/update-postgis.sh rename to 12-3.4/bookworm/update-postgis.sh diff --git a/12-3.4/Dockerfile b/12-3.4/bullseye/Dockerfile similarity index 87% rename from 12-3.4/Dockerfile rename to 12-3.4/bullseye/Dockerfile index b85e4fde5..b0c0d36ec 100644 --- a/12-3.4/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -1,7 +1,8 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ @@ -25,4 +26,3 @@ RUN apt-get update \ RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin - diff --git a/12-3.4/bullseye/initdb-postgis.sh b/12-3.4/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.4/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags new file mode 100644 index 000000000..2de2a735f --- /dev/null +++ b/12-3.4/bullseye/tags @@ -0,0 +1 @@ +12-3.4-bullseye 12-3.4.0-bullseye diff --git a/13-3.4/update-postgis.sh b/12-3.4/bullseye/update-postgis.sh similarity index 100% rename from 13-3.4/update-postgis.sh rename to 12-3.4/bullseye/update-postgis.sh diff --git a/13-3.4-bundle/bookworm/Dockerfile b/13-3.4-bundle/bookworm/Dockerfile new file mode 100644 index 000000000..f5286ca36 --- /dev/null +++ b/13-3.4-bundle/bookworm/Dockerfile @@ -0,0 +1,327 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.bundle.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 + +ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:13-3.4-bookworm + +ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 + +FROM ${PGIS_V1_BASE_IMAGE} AS builder + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # MobilityDB + libgeos++-dev \ + libgsl-dev \ + libjson-c-dev \ + libproj-dev \ + # TimescaleDB + libkrb5-dev \ + # pgsql-http + libcurl4-gnutls-dev \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS_V1_MOBILITYDB_REPOSITORY +ARG PGIS_V1_MOBILITYDB_CHECKOUT +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY +ARG PGIS_V1_TIMESCALEDB_REPOSITORY +ARG PGIS_V1_TIMESCALEDB_CHECKOUT +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 + +RUN set -ex \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + +RUN set -ex \ + && mkdir -p /pgsql-http \ + && cd pgsql-http \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_http_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +# Install TimescaleDB; no Arm64 apt support, so build from source +RUN set -ex \ + && mkdir -p /timescaledb \ + && cd timescaledb \ + && git init \ + && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_timescaledb_last_commit.txt \ + && ./bootstrap \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + \ + -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DREGRESS_CHECKS=OFF \ + -DSEND_TELEMETRY_DEFAULT=NO \ + -DTAP_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ + -DENABLE_DEBUG_UTILS=OFF \ + && cd build \ + && make -j$(nproc) \ + && make install + + + +# Install MobilityDB +RUN set -ex \ + && mkdir -p /MobilityDB \ + && cd MobilityDB \ + && git init \ + && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_MobilityDB_last_commit.txt \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + .. \ + && make -j$(nproc) \ + && make install + +RUN pgxn install ddlx +RUN pgxn install h3 # https://github.com/zachasme/h3-pg +RUN pgxn install json_accessors +RUN pgxn install lostgis +RUN pgxn install parray_gin +RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install pg_roaringbitmap +RUN pgxn install pg_rowalesce +RUN pgxn install pg_uuidv7 +RUN pgxn install pg_xenophile +RUN pgxn install pg_xxhash +RUN pgxn install pgsql_tweaks + +RUN USE_PGXS=1 pgxn install sqlite_fdw + +RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + + +#TODO: add https://github.com/hydradatabase/hydra +# https://github.com/powa-team/pg_qualstats +# https://github.com/darold/pgtt +# https://github.com/apache/arrow-flight-sql-postgresql +# https://github.com/neondatabase/pg_embedding/ +# pgrust ; "pg-graphql +# https://github.com/kelvich/pg_tiktoken +# +# -------------------------------------------------------------- + + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:13-3.4-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS Bundle - 13-3.4-bookworm " \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +#TODO - uncomment +RUN set -ex \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-pg-fact-loader \ + postgresql-$PG_MAJOR-pglogical \ + postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-squeeze \ + # + # add MobilityDb missing dependency from libgsl-dev + libgsl27 \ + \ + # && pip3 install --upgrade pip \ + \ +# && pipx install geopy \ +# && pipx install plpygis \ +# && pipx install pygml \ +# && pipx install shapely \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +# Install MobilityDB,Timescaledb,h3,etc from builder +COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder /postgres_dba /postgres_dba + +# check any missing dependencies +RUN set -ex \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not allowed. +RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + dpkg -l | grep llvm ; \ + exit 1; \ + fi + +# add MobilityDB requirements +RUN set -eux; \ + cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/13-3.4-bundle/bookworm/tags b/13-3.4-bundle/bookworm/tags new file mode 100644 index 000000000..fb82f1994 --- /dev/null +++ b/13-3.4-bundle/bookworm/tags @@ -0,0 +1 @@ +13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle diff --git a/13-3.4/alpine/initdb-postgis.sh b/13-3.4/alpine/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/13-3.4/alpine/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.4/alpine/Dockerfile b/13-3.4/alpine3.18/Dockerfile similarity index 72% rename from 14-3.4/alpine/Dockerfile rename to 13-3.4/alpine3.18/Dockerfile index ed36cfcaf..814beaf9c 100644 --- a/14-3.4/alpine/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -1,34 +1,46 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:14-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 14 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 13 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.4.0 ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +55,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +65,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/13-3.4/alpine3.18/initdb-postgis.sh b/13-3.4/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.4/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.4/alpine3.18/tags b/13-3.4/alpine3.18/tags new file mode 100644 index 000000000..6c7665f4f --- /dev/null +++ b/13-3.4/alpine3.18/tags @@ -0,0 +1 @@ +13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine diff --git a/14-3.4/alpine/update-postgis.sh b/13-3.4/alpine3.18/update-postgis.sh similarity index 100% rename from 14-3.4/alpine/update-postgis.sh rename to 13-3.4/alpine3.18/update-postgis.sh diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile new file mode 100644 index 000000000..d2c5f4bb6 --- /dev/null +++ b/13-3.4/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:13-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/bookworm/initdb-postgis.sh b/13-3.4/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.4/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags new file mode 100644 index 000000000..06232a75e --- /dev/null +++ b/13-3.4/bookworm/tags @@ -0,0 +1 @@ +13-3.4-bookworm 13-3.4.0-bookworm 13-3.4 diff --git a/14-3.4/update-postgis.sh b/13-3.4/bookworm/update-postgis.sh similarity index 100% rename from 14-3.4/update-postgis.sh rename to 13-3.4/bookworm/update-postgis.sh diff --git a/13-3.4/Dockerfile b/13-3.4/bullseye/Dockerfile similarity index 87% rename from 13-3.4/Dockerfile rename to 13-3.4/bullseye/Dockerfile index b20c0d9f7..d3621705a 100644 --- a/13-3.4/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -1,7 +1,8 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ @@ -25,4 +26,3 @@ RUN apt-get update \ RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin - diff --git a/13-3.4/bullseye/initdb-postgis.sh b/13-3.4/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.4/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags new file mode 100644 index 000000000..94a5d2dc2 --- /dev/null +++ b/13-3.4/bullseye/tags @@ -0,0 +1 @@ +13-3.4-bullseye 13-3.4.0-bullseye diff --git a/14-master/update-postgis.sh b/13-3.4/bullseye/update-postgis.sh similarity index 100% rename from 14-master/update-postgis.sh rename to 13-3.4/bullseye/update-postgis.sh diff --git a/13-3.4/initdb-postgis.sh b/13-3.4/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/13-3.4/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.4-bundle/bookworm/Dockerfile b/14-3.4-bundle/bookworm/Dockerfile new file mode 100644 index 000000000..5cde84a53 --- /dev/null +++ b/14-3.4-bundle/bookworm/Dockerfile @@ -0,0 +1,327 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.bundle.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 + +ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm + +ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 + +FROM ${PGIS_V1_BASE_IMAGE} AS builder + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # MobilityDB + libgeos++-dev \ + libgsl-dev \ + libjson-c-dev \ + libproj-dev \ + # TimescaleDB + libkrb5-dev \ + # pgsql-http + libcurl4-gnutls-dev \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS_V1_MOBILITYDB_REPOSITORY +ARG PGIS_V1_MOBILITYDB_CHECKOUT +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY +ARG PGIS_V1_TIMESCALEDB_REPOSITORY +ARG PGIS_V1_TIMESCALEDB_CHECKOUT +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 + +RUN set -ex \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + +RUN set -ex \ + && mkdir -p /pgsql-http \ + && cd pgsql-http \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_http_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +# Install TimescaleDB; no Arm64 apt support, so build from source +RUN set -ex \ + && mkdir -p /timescaledb \ + && cd timescaledb \ + && git init \ + && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_timescaledb_last_commit.txt \ + && ./bootstrap \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + \ + -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DREGRESS_CHECKS=OFF \ + -DSEND_TELEMETRY_DEFAULT=NO \ + -DTAP_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ + -DENABLE_DEBUG_UTILS=OFF \ + && cd build \ + && make -j$(nproc) \ + && make install + + + +# Install MobilityDB +RUN set -ex \ + && mkdir -p /MobilityDB \ + && cd MobilityDB \ + && git init \ + && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_MobilityDB_last_commit.txt \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + .. \ + && make -j$(nproc) \ + && make install + +RUN pgxn install ddlx +RUN pgxn install h3 # https://github.com/zachasme/h3-pg +RUN pgxn install json_accessors +RUN pgxn install lostgis +RUN pgxn install parray_gin +RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install pg_roaringbitmap +RUN pgxn install pg_rowalesce +RUN pgxn install pg_uuidv7 +RUN pgxn install pg_xenophile +RUN pgxn install pg_xxhash +RUN pgxn install pgsql_tweaks + +RUN USE_PGXS=1 pgxn install sqlite_fdw + +RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + + +#TODO: add https://github.com/hydradatabase/hydra +# https://github.com/powa-team/pg_qualstats +# https://github.com/darold/pgtt +# https://github.com/apache/arrow-flight-sql-postgresql +# https://github.com/neondatabase/pg_embedding/ +# pgrust ; "pg-graphql +# https://github.com/kelvich/pg_tiktoken +# +# -------------------------------------------------------------- + + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS Bundle - 14-3.4-bookworm " \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +#TODO - uncomment +RUN set -ex \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-pg-fact-loader \ + postgresql-$PG_MAJOR-pglogical \ + postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-squeeze \ + # + # add MobilityDb missing dependency from libgsl-dev + libgsl27 \ + \ + # && pip3 install --upgrade pip \ + \ +# && pipx install geopy \ +# && pipx install plpygis \ +# && pipx install pygml \ +# && pipx install shapely \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +# Install MobilityDB,Timescaledb,h3,etc from builder +COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder /postgres_dba /postgres_dba + +# check any missing dependencies +RUN set -ex \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not allowed. +RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + dpkg -l | grep llvm ; \ + exit 1; \ + fi + +# add MobilityDB requirements +RUN set -eux; \ + cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/14-3.4-bundle/bookworm/tags b/14-3.4-bundle/bookworm/tags new file mode 100644 index 000000000..7980ed508 --- /dev/null +++ b/14-3.4-bundle/bookworm/tags @@ -0,0 +1 @@ +14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle diff --git a/14-3.4/alpine/initdb-postgis.sh b/14-3.4/alpine/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/14-3.4/alpine/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/15-3.4/alpine/Dockerfile b/14-3.4/alpine3.18/Dockerfile similarity index 72% rename from 15-3.4/alpine/Dockerfile rename to 14-3.4/alpine3.18/Dockerfile index 21f1cd275..1809db54f 100644 --- a/15-3.4/alpine/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -1,34 +1,46 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:15-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 15 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 14 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.4.0 ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +55,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +65,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/14-3.4/alpine3.18/initdb-postgis.sh b/14-3.4/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.4/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.4/alpine3.18/tags b/14-3.4/alpine3.18/tags new file mode 100644 index 000000000..2a1575478 --- /dev/null +++ b/14-3.4/alpine3.18/tags @@ -0,0 +1 @@ +14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine diff --git a/15-3.4/alpine/update-postgis.sh b/14-3.4/alpine3.18/update-postgis.sh similarity index 100% rename from 15-3.4/alpine/update-postgis.sh rename to 14-3.4/alpine3.18/update-postgis.sh diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile new file mode 100644 index 000000000..1ce16c73c --- /dev/null +++ b/14-3.4/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:14-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/bookworm/initdb-postgis.sh b/14-3.4/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.4/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags new file mode 100644 index 000000000..1ddd86881 --- /dev/null +++ b/14-3.4/bookworm/tags @@ -0,0 +1 @@ +14-3.4-bookworm 14-3.4.0-bookworm 14-3.4 diff --git a/15-3.4/update-postgis.sh b/14-3.4/bookworm/update-postgis.sh similarity index 100% rename from 15-3.4/update-postgis.sh rename to 14-3.4/bookworm/update-postgis.sh diff --git a/14-3.4/Dockerfile b/14-3.4/bullseye/Dockerfile similarity index 87% rename from 14-3.4/Dockerfile rename to 14-3.4/bullseye/Dockerfile index 36d79b7fd..d2ee3dd0b 100644 --- a/14-3.4/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -1,7 +1,8 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ @@ -25,4 +26,3 @@ RUN apt-get update \ RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin - diff --git a/14-3.4/bullseye/initdb-postgis.sh b/14-3.4/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.4/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags new file mode 100644 index 000000000..a6ef03031 --- /dev/null +++ b/14-3.4/bullseye/tags @@ -0,0 +1 @@ +14-3.4-bullseye 14-3.4.0-bullseye diff --git a/15-master/update-postgis.sh b/14-3.4/bullseye/update-postgis.sh similarity index 100% rename from 15-master/update-postgis.sh rename to 14-3.4/bullseye/update-postgis.sh diff --git a/14-3.4/initdb-postgis.sh b/14-3.4/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/14-3.4/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-master/initdb-postgis.sh b/14-master/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/14-master/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/15-3.4-bundle/bookworm/Dockerfile b/15-3.4-bundle/bookworm/Dockerfile new file mode 100644 index 000000000..698a68bae --- /dev/null +++ b/15-3.4-bundle/bookworm/Dockerfile @@ -0,0 +1,327 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.bundle.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 + +ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm + +ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 + +FROM ${PGIS_V1_BASE_IMAGE} AS builder + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # MobilityDB + libgeos++-dev \ + libgsl-dev \ + libjson-c-dev \ + libproj-dev \ + # TimescaleDB + libkrb5-dev \ + # pgsql-http + libcurl4-gnutls-dev \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS_V1_MOBILITYDB_REPOSITORY +ARG PGIS_V1_MOBILITYDB_CHECKOUT +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY +ARG PGIS_V1_TIMESCALEDB_REPOSITORY +ARG PGIS_V1_TIMESCALEDB_CHECKOUT +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 + +RUN set -ex \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + +RUN set -ex \ + && mkdir -p /pgsql-http \ + && cd pgsql-http \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_http_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +# Install TimescaleDB; no Arm64 apt support, so build from source +RUN set -ex \ + && mkdir -p /timescaledb \ + && cd timescaledb \ + && git init \ + && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_timescaledb_last_commit.txt \ + && ./bootstrap \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + \ + -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DREGRESS_CHECKS=OFF \ + -DSEND_TELEMETRY_DEFAULT=NO \ + -DTAP_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ + -DENABLE_DEBUG_UTILS=OFF \ + && cd build \ + && make -j$(nproc) \ + && make install + + + +# Install MobilityDB +RUN set -ex \ + && mkdir -p /MobilityDB \ + && cd MobilityDB \ + && git init \ + && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_MobilityDB_last_commit.txt \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + .. \ + && make -j$(nproc) \ + && make install + +RUN pgxn install ddlx +RUN pgxn install h3 # https://github.com/zachasme/h3-pg +RUN pgxn install json_accessors +RUN pgxn install lostgis +RUN pgxn install parray_gin +RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install pg_roaringbitmap +RUN pgxn install pg_rowalesce +RUN pgxn install pg_uuidv7 +RUN pgxn install pg_xenophile +RUN pgxn install pg_xxhash +RUN pgxn install pgsql_tweaks + +RUN USE_PGXS=1 pgxn install sqlite_fdw + +RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + + +#TODO: add https://github.com/hydradatabase/hydra +# https://github.com/powa-team/pg_qualstats +# https://github.com/darold/pgtt +# https://github.com/apache/arrow-flight-sql-postgresql +# https://github.com/neondatabase/pg_embedding/ +# pgrust ; "pg-graphql +# https://github.com/kelvich/pg_tiktoken +# +# -------------------------------------------------------------- + + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS Bundle - 15-3.4-bookworm " \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +#TODO - uncomment +RUN set -ex \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-pg-fact-loader \ + postgresql-$PG_MAJOR-pglogical \ + postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-squeeze \ + # + # add MobilityDb missing dependency from libgsl-dev + libgsl27 \ + \ + # && pip3 install --upgrade pip \ + \ +# && pipx install geopy \ +# && pipx install plpygis \ +# && pipx install pygml \ +# && pipx install shapely \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +# Install MobilityDB,Timescaledb,h3,etc from builder +COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder /postgres_dba /postgres_dba + +# check any missing dependencies +RUN set -ex \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not allowed. +RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + dpkg -l | grep llvm ; \ + exit 1; \ + fi + +# add MobilityDB requirements +RUN set -eux; \ + cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/15-3.4-bundle/bookworm/tags b/15-3.4-bundle/bookworm/tags new file mode 100644 index 000000000..3fcf4b6c0 --- /dev/null +++ b/15-3.4-bundle/bookworm/tags @@ -0,0 +1 @@ +15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle diff --git a/15-3.4/alpine/initdb-postgis.sh b/15-3.4/alpine/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/15-3.4/alpine/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.4/alpine/Dockerfile b/15-3.4/alpine3.18/Dockerfile similarity index 72% rename from 12-3.4/alpine/Dockerfile rename to 15-3.4/alpine3.18/Dockerfile index 9b0ce6aa5..0eb9d05bb 100644 --- a/12-3.4/alpine/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -1,34 +1,46 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:12-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 12 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 15 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.4.0 ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +55,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +65,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/15-3.4/alpine3.18/initdb-postgis.sh b/15-3.4/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.4/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags new file mode 100644 index 000000000..efefe6a49 --- /dev/null +++ b/15-3.4/alpine3.18/tags @@ -0,0 +1 @@ +15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine diff --git a/16beta3-3.4/alpine/update-postgis.sh b/15-3.4/alpine3.18/update-postgis.sh similarity index 100% rename from 16beta3-3.4/alpine/update-postgis.sh rename to 15-3.4/alpine3.18/update-postgis.sh diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile new file mode 100644 index 000000000..04d8b5929 --- /dev/null +++ b/15-3.4/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:15-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4/bookworm/initdb-postgis.sh b/15-3.4/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.4/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags new file mode 100644 index 000000000..c3385ab20 --- /dev/null +++ b/15-3.4/bookworm/tags @@ -0,0 +1 @@ +15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest diff --git a/16beta3-3.4/update-postgis.sh b/15-3.4/bookworm/update-postgis.sh similarity index 100% rename from 16beta3-3.4/update-postgis.sh rename to 15-3.4/bookworm/update-postgis.sh diff --git a/15-3.4/Dockerfile b/15-3.4/bullseye/Dockerfile similarity index 87% rename from 15-3.4/Dockerfile rename to 15-3.4/bullseye/Dockerfile index 05fd64114..a951b6966 100644 --- a/15-3.4/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -1,7 +1,8 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ @@ -25,4 +26,3 @@ RUN apt-get update \ RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin - diff --git a/15-3.4/bullseye/initdb-postgis.sh b/15-3.4/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.4/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags new file mode 100644 index 000000000..e359ed582 --- /dev/null +++ b/15-3.4/bullseye/tags @@ -0,0 +1 @@ +15-3.4-bullseye 15-3.4.0-bullseye diff --git a/16beta3-master/update-postgis.sh b/15-3.4/bullseye/update-postgis.sh similarity index 100% rename from 16beta3-master/update-postgis.sh rename to 15-3.4/bullseye/update-postgis.sh diff --git a/15-3.4/initdb-postgis.sh b/15-3.4/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/15-3.4/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/16beta3-master/Dockerfile b/15-master/bookworm/Dockerfile similarity index 64% rename from 16beta3-master/Dockerfile rename to 15-master/bookworm/Dockerfile index ed60f7813..128426680 100644 --- a/16beta3-master/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -1,35 +1,53 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG DOCKER_CMAKE_BUILD_TYPE=Release -ARG CGAL_GIT_BRANCH=5.6.x-branch -FROM postgres:16beta3-bullseye as builder +ARG PGIS_V1_BASE_IMAGE=postgres:15-bookworm -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16beta3 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +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_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f +ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 +ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c + +ARG PGIS_V1_BOOST_VERSION=1.74.0 + +ARG PGIS_V1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS_V1_BASE_IMAGE} as builder WORKDIR / +ARG PGIS_V1_BOOST_VERSION +ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + # apt-get install RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -37,7 +55,7 @@ RUN set -ex \ libjson-c5 \ libmpfr6 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # build dependency @@ -80,54 +98,65 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} # cgal & sfcgal -# By utilizing the latest commit of the CGAL 5.x.x-branch and implementing a header-only build for SFCGAL, -# one can benefit from the latest CGAL patches while avoiding compatibility issues. -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c +ARG PGIS_V1_SFCGAL_REPOSITORY +ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} +ARG PGIS_V1_SFCGAL_CHECKOUT +ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} + +ARG PGIS_V1_CGAL_REPOSITORY +ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} +ARG PGIS_V1_CGAL_CHECKOUT +ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} + RUN set -ex \ - && mkdir -p /usr/src \ && cd /usr/src \ - && git clone --branch ${CGAL_GIT_BRANCH} https://github.com/CGAL/cgal \ + && mkdir cgal \ && cd cgal \ - && git checkout ${CGAL5X_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && mkdir SFCGAL \ && cd SFCGAL \ - && git checkout ${SFCGAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ -DSFCGAL_WITH_OSG=OFF \ && make -j$(nproc) \ && make install \ - # - ## testing with -DSFCGAL_BUILD_TESTS=ON - # && CTEST_OUTPUT_ON_FAILURE=TRUE ctest \ - # # clean && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ARG PGIS_V1_PROJ_REPOSITORY +ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} +ARG PGIS_V1_PROJ_CHECKOUT +ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/PROJ.git \ + && mkdir PROJ \ && cd PROJ \ - && git checkout ${PROJ_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -143,7 +172,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -152,28 +181,41 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 +ARG PGIS_V1_GEOS_REPOSITORY +ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} +ARG PGIS_V1_GEOS_CHECKOUT +ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/libgeos/geos.git \ + && mkdir geos \ && cd geos \ - && git checkout ${GEOS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_REPOSITORY +ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} +ARG PGIS_V1_GDAL_CHECKOUT +ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} + RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/gdal.git \ + && mkdir gdal \ && cd gdal \ - && git checkout ${GDAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -196,7 +238,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -252,25 +294,34 @@ RUN set -ex \ # ------------------------------------------- # STAGE final # ------------------------------------------- -FROM postgres:16beta3-bullseye +FROM ${PGIS_V1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 15-master spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ARG PGIS_V1_BASE_IMAGE +ARG PGIS_V1_BOOST_VERSION + +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ + PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -279,12 +330,12 @@ RUN set -ex \ libmpfr6 \ libpcre3 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # gdal+ libblosc1 \ - libcfitsio9 \ + libcfitsio10 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -299,13 +350,23 @@ RUN set -ex \ COPY --from=builder /_pgis*.* / COPY --from=builder /usr/local /usr/local -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_CHECKOUT +ARG PGIS_V1_GDAL_REPOSITORY +ARG PGIS_V1_GEOS_CHECKOUT +ARG PGIS_V1_GEOS_REPOSITORY +ARG PGIS_V1_PROJ_CHECKOUT +ARG PGIS_V1_PROJ_REPOSITORY +ARG PGIS_V1_SFCGAL_CHECKOUT +ARG PGIS_V1_SFCGAL_REPOSITORY + +ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ + PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ + PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ + PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ + PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ + PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ + PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ + PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +385,11 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_REPOSITORY + +ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ + PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} RUN set -ex \ && apt-get update \ @@ -336,6 +401,8 @@ RUN set -ex \ build-essential \ ca-certificates \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -350,6 +417,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ @@ -357,10 +425,13 @@ RUN set -ex \ xsltproc \ && cd \ # postgis - && cd /usr/src/ \ - && git clone https://github.com/postgis/postgis.git \ + && cd /usr/src \ + && mkdir postgis \ && cd postgis \ - && git checkout ${POSTGIS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: @@ -409,6 +480,8 @@ RUN set -ex \ bison \ build-essential \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -422,6 +495,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ diff --git a/15-master/bookworm/initdb-postgis.sh b/15-master/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-master/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-master/bookworm/tags b/15-master/bookworm/tags new file mode 100644 index 000000000..36ce3a2ac --- /dev/null +++ b/15-master/bookworm/tags @@ -0,0 +1 @@ +15-master-bookworm 15-master diff --git a/15-master/bookworm/update-postgis.sh b/15-master/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-master/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-master/initdb-postgis.sh b/15-master/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/15-master/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-master/Dockerfile b/15-recentstack/bookworm/Dockerfile similarity index 64% rename from 14-master/Dockerfile rename to 15-recentstack/bookworm/Dockerfile index a7c04d6a2..ca7c41481 100644 --- a/14-master/Dockerfile +++ b/15-recentstack/bookworm/Dockerfile @@ -1,35 +1,53 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG DOCKER_CMAKE_BUILD_TYPE=Release -ARG CGAL_GIT_BRANCH=5.6.x-branch -FROM postgres:14-bullseye as builder +ARG PGIS_V1_BASE_IMAGE=postgres:15-bookworm -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 14 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS_V1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS_V1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS_V1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS_V1_CGAL_CHECKOUT=tags/v5.6 + +ARG PGIS_V1_BOOST_VERSION=1.74.0 + +ARG PGIS_V1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS_V1_BASE_IMAGE} as builder WORKDIR / +ARG PGIS_V1_BOOST_VERSION +ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + # apt-get install RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -37,7 +55,7 @@ RUN set -ex \ libjson-c5 \ libmpfr6 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # build dependency @@ -80,54 +98,65 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} # cgal & sfcgal -# By utilizing the latest commit of the CGAL 5.x.x-branch and implementing a header-only build for SFCGAL, -# one can benefit from the latest CGAL patches while avoiding compatibility issues. -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c +ARG PGIS_V1_SFCGAL_REPOSITORY +ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} +ARG PGIS_V1_SFCGAL_CHECKOUT +ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} + +ARG PGIS_V1_CGAL_REPOSITORY +ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} +ARG PGIS_V1_CGAL_CHECKOUT +ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} + RUN set -ex \ - && mkdir -p /usr/src \ && cd /usr/src \ - && git clone --branch ${CGAL_GIT_BRANCH} https://github.com/CGAL/cgal \ + && mkdir cgal \ && cd cgal \ - && git checkout ${CGAL5X_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && mkdir SFCGAL \ && cd SFCGAL \ - && git checkout ${SFCGAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ -DSFCGAL_WITH_OSG=OFF \ && make -j$(nproc) \ && make install \ - # - ## testing with -DSFCGAL_BUILD_TESTS=ON - # && CTEST_OUTPUT_ON_FAILURE=TRUE ctest \ - # # clean && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ARG PGIS_V1_PROJ_REPOSITORY +ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} +ARG PGIS_V1_PROJ_CHECKOUT +ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/PROJ.git \ + && mkdir PROJ \ && cd PROJ \ - && git checkout ${PROJ_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -143,7 +172,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -152,28 +181,41 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 +ARG PGIS_V1_GEOS_REPOSITORY +ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} +ARG PGIS_V1_GEOS_CHECKOUT +ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/libgeos/geos.git \ + && mkdir geos \ && cd geos \ - && git checkout ${GEOS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_REPOSITORY +ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} +ARG PGIS_V1_GDAL_CHECKOUT +ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} + RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/gdal.git \ + && mkdir gdal \ && cd gdal \ - && git checkout ${GDAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -196,7 +238,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -252,25 +294,34 @@ RUN set -ex \ # ------------------------------------------- # STAGE final # ------------------------------------------- -FROM postgres:14-bullseye +FROM ${PGIS_V1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 15-recentstack spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ARG PGIS_V1_BASE_IMAGE +ARG PGIS_V1_BOOST_VERSION + +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ + PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -279,12 +330,12 @@ RUN set -ex \ libmpfr6 \ libpcre3 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # gdal+ libblosc1 \ - libcfitsio9 \ + libcfitsio10 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -299,13 +350,23 @@ RUN set -ex \ COPY --from=builder /_pgis*.* / COPY --from=builder /usr/local /usr/local -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_CHECKOUT +ARG PGIS_V1_GDAL_REPOSITORY +ARG PGIS_V1_GEOS_CHECKOUT +ARG PGIS_V1_GEOS_REPOSITORY +ARG PGIS_V1_PROJ_CHECKOUT +ARG PGIS_V1_PROJ_REPOSITORY +ARG PGIS_V1_SFCGAL_CHECKOUT +ARG PGIS_V1_SFCGAL_REPOSITORY + +ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ + PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ + PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ + PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ + PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ + PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ + PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ + PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +385,11 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_REPOSITORY + +ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ + PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} RUN set -ex \ && apt-get update \ @@ -336,6 +401,8 @@ RUN set -ex \ build-essential \ ca-certificates \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -350,6 +417,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ @@ -357,10 +425,13 @@ RUN set -ex \ xsltproc \ && cd \ # postgis - && cd /usr/src/ \ - && git clone https://github.com/postgis/postgis.git \ + && cd /usr/src \ + && mkdir postgis \ && cd postgis \ - && git checkout ${POSTGIS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: @@ -409,6 +480,8 @@ RUN set -ex \ bison \ build-essential \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -422,6 +495,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ diff --git a/15-recentstack/bookworm/initdb-postgis.sh b/15-recentstack/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-recentstack/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-recentstack/bookworm/tags b/15-recentstack/bookworm/tags new file mode 100644 index 000000000..faa7a1924 --- /dev/null +++ b/15-recentstack/bookworm/tags @@ -0,0 +1 @@ +15-recentstack-bookworm 15-recentstack diff --git a/15-recentstack/bookworm/update-postgis.sh b/15-recentstack/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-recentstack/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.4-bundle/bookworm/Dockerfile b/16-3.4-bundle/bookworm/Dockerfile new file mode 100644 index 000000000..383cc568d --- /dev/null +++ b/16-3.4-bundle/bookworm/Dockerfile @@ -0,0 +1,306 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.bundle.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 + +ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm + +ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 + +FROM ${PGIS_V1_BASE_IMAGE} AS builder + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # MobilityDB + libgeos++-dev \ + libgsl-dev \ + libjson-c-dev \ + libproj-dev \ + # TimescaleDB + libkrb5-dev \ + # pgsql-http + libcurl4-gnutls-dev \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS_V1_MOBILITYDB_REPOSITORY +ARG PGIS_V1_MOBILITYDB_CHECKOUT +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY +ARG PGIS_V1_TIMESCALEDB_REPOSITORY +ARG PGIS_V1_TIMESCALEDB_CHECKOUT +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 + +RUN set -ex \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + +RUN set -ex \ + && mkdir -p /pgsql-http \ + && cd pgsql-http \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_http_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +# Timescaledb not supported on pg16 yet + + +# Install MobilityDB +RUN set -ex \ + && mkdir -p /MobilityDB \ + && cd MobilityDB \ + && git init \ + && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_MobilityDB_last_commit.txt \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + .. \ + && make -j$(nproc) \ + && make install + +RUN pgxn install ddlx +RUN pgxn install h3 # https://github.com/zachasme/h3-pg +RUN pgxn install json_accessors +RUN pgxn install lostgis +RUN pgxn install parray_gin +RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install pg_roaringbitmap +RUN pgxn install pg_rowalesce +RUN pgxn install pg_uuidv7 +RUN pgxn install pg_xenophile +RUN pgxn install pg_xxhash +RUN pgxn install pgsql_tweaks + +# sqlite_fdw not supported on pg16 yet +# RUN USE_PGXS=1 pgxn install sqlite_fdw + +RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + + +#TODO: add https://github.com/hydradatabase/hydra +# https://github.com/powa-team/pg_qualstats +# https://github.com/darold/pgtt +# https://github.com/apache/arrow-flight-sql-postgresql +# https://github.com/neondatabase/pg_embedding/ +# pgrust ; "pg-graphql +# https://github.com/kelvich/pg_tiktoken +# +# -------------------------------------------------------------- + + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS Bundle - 16-3.4-bookworm " \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +#TODO - uncomment +RUN set -ex \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + \ +# +# not yet available for 16 +# postgresql-$PG_MAJOR-partman \ +# postgresql-$PG_MAJOR-pg-fact-loader \ +# postgresql-$PG_MAJOR-pglogical \ +# postgresql-$PG_MAJOR-plpgsql-check \ +# postgresql-$PG_MAJOR-pointcloud \ +# postgresql-$PG_MAJOR-squeeze \ +# + # + # add MobilityDb missing dependency from libgsl-dev + libgsl27 \ + \ + # && pip3 install --upgrade pip \ + \ +# && pipx install geopy \ +# && pipx install plpygis \ +# && pipx install pygml \ +# && pipx install shapely \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +# Install MobilityDB,Timescaledb,h3,etc from builder +COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder /postgres_dba /postgres_dba + +# check any missing dependencies +RUN set -ex \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not allowed. +RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + dpkg -l | grep llvm ; \ + exit 1; \ + fi + +# add MobilityDB requirements +RUN set -eux; \ + cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ + # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) + echo "shared_preload_libraries = 'postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/16-3.4-bundle/bookworm/tags b/16-3.4-bundle/bookworm/tags new file mode 100644 index 000000000..83e4de338 --- /dev/null +++ b/16-3.4-bundle/bookworm/tags @@ -0,0 +1 @@ +16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile new file mode 100644 index 000000000..fbaef91ef --- /dev/null +++ b/16-3.4/alpine3.18/Dockerfile @@ -0,0 +1,150 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS_V1_BASE_IMAGE=postgres:16-alpine3.18 +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_VERSION 3.4.0 +ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 + +RUN set -eux \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ + \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + cunit-dev \ + docbook-xml \ + docbook5-xml \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apk del .fetch-deps .build-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/alpine3.18/initdb-postgis.sh b/16-3.4/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.4/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags new file mode 100644 index 000000000..70989ffa3 --- /dev/null +++ b/16-3.4/alpine3.18/tags @@ -0,0 +1 @@ +16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine diff --git a/16-3.4/alpine3.18/update-postgis.sh b/16-3.4/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.4/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile new file mode 100644 index 000000000..4d4ac31a2 --- /dev/null +++ b/16-3.4/bookworm/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:16-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/bookworm/initdb-postgis.sh b/16-3.4/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.4/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags new file mode 100644 index 000000000..4aaa8915e --- /dev/null +++ b/16-3.4/bookworm/tags @@ -0,0 +1 @@ +16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 diff --git a/16-3.4/bookworm/update-postgis.sh b/16-3.4/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.4/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile new file mode 100644 index 000000000..d32955361 --- /dev/null +++ b/16-3.4/bullseye/Dockerfile @@ -0,0 +1,28 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:16-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/bullseye/initdb-postgis.sh b/16-3.4/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.4/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags new file mode 100644 index 000000000..bc470fbcb --- /dev/null +++ b/16-3.4/bullseye/tags @@ -0,0 +1 @@ +16-3.4-bullseye 16-3.4.0-bullseye diff --git a/16-3.4/bullseye/update-postgis.sh b/16-3.4/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.4/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile new file mode 100644 index 000000000..f02080ec2 --- /dev/null +++ b/16-master/bookworm/Dockerfile @@ -0,0 +1,530 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS_V1_BASE_IMAGE=postgres:16-bookworm + +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +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_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f +ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 +ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c + +ARG PGIS_V1_BOOST_VERSION=1.74.0 + +ARG PGIS_V1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS_V1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS_V1_BOOST_VERSION +ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + +# apt-get install +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libkml-dev \ + liblz4-dev \ + liblzma-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS_V1_CMAKE_BUILD_TYPE +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} + +# cgal & sfcgal +ARG PGIS_V1_SFCGAL_REPOSITORY +ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} +ARG PGIS_V1_SFCGAL_CHECKOUT +ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} + +ARG PGIS_V1_CGAL_REPOSITORY +ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} +ARG PGIS_V1_CGAL_CHECKOUT +ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} + +RUN set -ex \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + +# proj +ARG PGIS_V1_PROJ_REPOSITORY +ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} +ARG PGIS_V1_PROJ_CHECKOUT +ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} +RUN set -ex \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + +# geos +ARG PGIS_V1_GEOS_REPOSITORY +ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} +ARG PGIS_V1_GEOS_CHECKOUT +ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} +RUN set -ex \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + +# gdal +ARG PGIS_V1_GDAL_REPOSITORY +ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} +ARG PGIS_V1_GDAL_CHECKOUT +ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} + +RUN set -ex \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 + # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_GEOTIFF=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -ex \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# STAGE final +# ------------------------------------------- +FROM ${PGIS_V1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 16-master spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS_V1_CMAKE_BUILD_TYPE +ARG PGIS_V1_BASE_IMAGE +ARG PGIS_V1_BOOST_VERSION + +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ + PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # gdal+ + libblosc1 \ + libcfitsio10 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libopenjp2-7 \ + libqhull-r8.0 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=builder /_pgis*.* / +COPY --from=builder /usr/local /usr/local + +ARG PGIS_V1_GDAL_CHECKOUT +ARG PGIS_V1_GDAL_REPOSITORY +ARG PGIS_V1_GEOS_CHECKOUT +ARG PGIS_V1_GEOS_REPOSITORY +ARG PGIS_V1_PROJ_CHECKOUT +ARG PGIS_V1_PROJ_REPOSITORY +ARG PGIS_V1_SFCGAL_CHECKOUT +ARG PGIS_V1_SFCGAL_REPOSITORY + +ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ + PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ + PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ + PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ + PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ + PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ + PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ + PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -ex \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# install postgis +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_REPOSITORY + +ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ + PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + && git log -1 > /_pgis_last_commit.txt \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -ex \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/16-master/bookworm/initdb-postgis.sh b/16-master/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-master/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-master/bookworm/tags b/16-master/bookworm/tags new file mode 100644 index 000000000..b9d1ddd89 --- /dev/null +++ b/16-master/bookworm/tags @@ -0,0 +1 @@ +16-master-bookworm 16-master diff --git a/16-master/bookworm/update-postgis.sh b/16-master/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-master/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-master/Dockerfile b/16-recentstack/bookworm/Dockerfile similarity index 64% rename from 15-master/Dockerfile rename to 16-recentstack/bookworm/Dockerfile index df4b646ad..802e85480 100644 --- a/15-master/Dockerfile +++ b/16-recentstack/bookworm/Dockerfile @@ -1,35 +1,53 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. # - # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG DOCKER_CMAKE_BUILD_TYPE=Release -ARG CGAL_GIT_BRANCH=5.6.x-branch -FROM postgres:15-bullseye as builder +ARG PGIS_V1_BASE_IMAGE=postgres:16-bookworm -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 15 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS_V1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS_V1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS_V1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS_V1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS_V1_CGAL_CHECKOUT=tags/v5.6 + +ARG PGIS_V1_BOOST_VERSION=1.74.0 + +ARG PGIS_V1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS_V1_BASE_IMAGE} as builder WORKDIR / +ARG PGIS_V1_BOOST_VERSION +ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + # apt-get install RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -37,7 +55,7 @@ RUN set -ex \ libjson-c5 \ libmpfr6 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # build dependency @@ -80,54 +98,65 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} # cgal & sfcgal -# By utilizing the latest commit of the CGAL 5.x.x-branch and implementing a header-only build for SFCGAL, -# one can benefit from the latest CGAL patches while avoiding compatibility issues. -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c +ARG PGIS_V1_SFCGAL_REPOSITORY +ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} +ARG PGIS_V1_SFCGAL_CHECKOUT +ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} + +ARG PGIS_V1_CGAL_REPOSITORY +ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} +ARG PGIS_V1_CGAL_CHECKOUT +ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} + RUN set -ex \ - && mkdir -p /usr/src \ && cd /usr/src \ - && git clone --branch ${CGAL_GIT_BRANCH} https://github.com/CGAL/cgal \ + && mkdir cgal \ && cd cgal \ - && git checkout ${CGAL5X_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && mkdir SFCGAL \ && cd SFCGAL \ - && git checkout ${SFCGAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ -DSFCGAL_WITH_OSG=OFF \ && make -j$(nproc) \ && make install \ - # - ## testing with -DSFCGAL_BUILD_TESTS=ON - # && CTEST_OUTPUT_ON_FAILURE=TRUE ctest \ - # # clean && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ARG PGIS_V1_PROJ_REPOSITORY +ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} +ARG PGIS_V1_PROJ_CHECKOUT +ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/PROJ.git \ + && mkdir PROJ \ && cd PROJ \ - && git checkout ${PROJ_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -143,7 +172,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -152,28 +181,41 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 +ARG PGIS_V1_GEOS_REPOSITORY +ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} +ARG PGIS_V1_GEOS_CHECKOUT +ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/libgeos/geos.git \ + && mkdir geos \ && cd geos \ - && git checkout ${GEOS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_REPOSITORY +ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} +ARG PGIS_V1_GDAL_CHECKOUT +ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} + RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/gdal.git \ + && mkdir gdal \ && cd gdal \ - && git checkout ${GDAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -196,7 +238,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -252,25 +294,34 @@ RUN set -ex \ # ------------------------------------------- # STAGE final # ------------------------------------------- -FROM postgres:15-bullseye +FROM ${PGIS_V1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 16-recentstack spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ARG PGIS_V1_BASE_IMAGE +ARG PGIS_V1_BOOST_VERSION + +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ + PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic1.74.0 \ - libboost-chrono1.74.0 \ - libboost-date-time1.74.0 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-serialization1.74.0 \ - libboost-system1.74.0 \ - libboost-test1.74.0 \ - libboost-thread1.74.0 \ - libboost-timer1.74.0 \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -279,12 +330,12 @@ RUN set -ex \ libmpfr6 \ libpcre3 \ libprotobuf-c1 \ - libtiff5 \ + libtiff6 \ libxml2 \ sqlite3 \ # gdal+ libblosc1 \ - libcfitsio9 \ + libcfitsio10 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -299,13 +350,23 @@ RUN set -ex \ COPY --from=builder /_pgis*.* / COPY --from=builder /usr/local /usr/local -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5 -ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec -ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853 -ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4 +ARG PGIS_V1_GDAL_CHECKOUT +ARG PGIS_V1_GDAL_REPOSITORY +ARG PGIS_V1_GEOS_CHECKOUT +ARG PGIS_V1_GEOS_REPOSITORY +ARG PGIS_V1_PROJ_CHECKOUT +ARG PGIS_V1_PROJ_REPOSITORY +ARG PGIS_V1_SFCGAL_CHECKOUT +ARG PGIS_V1_SFCGAL_REPOSITORY + +ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ + PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ + PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ + PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ + PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ + PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ + PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ + PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +385,11 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_REPOSITORY + +ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ + PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} RUN set -ex \ && apt-get update \ @@ -336,6 +401,8 @@ RUN set -ex \ build-essential \ ca-certificates \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -350,6 +417,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ @@ -357,10 +425,13 @@ RUN set -ex \ xsltproc \ && cd \ # postgis - && cd /usr/src/ \ - && git clone https://github.com/postgis/postgis.git \ + && cd /usr/src \ + && mkdir postgis \ && cd postgis \ - && git checkout ${POSTGIS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: @@ -409,6 +480,8 @@ RUN set -ex \ bison \ build-essential \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -422,6 +495,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ diff --git a/16-recentstack/bookworm/initdb-postgis.sh b/16-recentstack/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-recentstack/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-recentstack/bookworm/tags b/16-recentstack/bookworm/tags new file mode 100644 index 000000000..ee11770cb --- /dev/null +++ b/16-recentstack/bookworm/tags @@ -0,0 +1 @@ +16-recentstack-bookworm 16-recentstack diff --git a/16-recentstack/bookworm/update-postgis.sh b/16-recentstack/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-recentstack/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16beta3-3.4/Dockerfile b/16beta3-3.4/Dockerfile deleted file mode 100644 index 57b647c42..000000000 --- a/16beta3-3.4/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM postgres:16beta3-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16beta3 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 - -RUN apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - diff --git a/16beta3-3.4/alpine/Dockerfile b/16beta3-3.4/alpine/Dockerfile deleted file mode 100644 index 524562453..000000000 --- a/16beta3-3.4/alpine/Dockerfile +++ /dev/null @@ -1,124 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. -# -ARG BASE_IMAGE=postgres:16beta3-alpine3.18 -FROM ${BASE_IMAGE} - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16beta3 Alpine" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - -RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ - \ - && apk add --no-cache --virtual .build-deps \ - \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - make \ - pcre2-dev \ - perl \ - protobuf-c-dev \ - \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre2 \ - protobuf-c \ - \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/16beta3-3.4/alpine/initdb-postgis.sh b/16beta3-3.4/alpine/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/16beta3-3.4/alpine/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/16beta3-3.4/initdb-postgis.sh b/16beta3-3.4/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/16beta3-3.4/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/16beta3-master/initdb-postgis.sh b/16beta3-master/initdb-postgis.sh deleted file mode 100644 index e38ad7d66..000000000 --- a/16beta3-master/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 8ed94dd79..7a6e8a0c7 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -1,34 +1,41 @@ -# -# %%TXT_AUTOGENERATED%% -# -ARG BASE_IMAGE=postgres:%%PG_MAJOR%%-alpine3.18 -FROM ${BASE_IMAGE} + +ARG PGIS_V1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} + +FROM ${PGIS_V1_BASE_IMAGE} + +ARG PGIS_V1_POSTGIS_REPOSITORY +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS %%POSTGIS_VERSION%% spatial database extension with PostgreSQL %%PG_MAJOR%% Alpine" \ + org.opencontainers.image.description="PostGIS {{ .[env.variant].POSTGIS_VERSION }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION %%POSTGIS_VERSION%% -ENV POSTGIS_SHA256 %%POSTGIS_SHA256%% +ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} +ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }} RUN set -eux \ - && apk add --no-cache --virtual .fetch-deps \ - ca-certificates \ - openssl \ - tar \ - \ - && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ - && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ - && mkdir -p /usr/src/postgis \ - && tar \ - --extract \ - --file postgis.tar.gz \ - --directory /usr/src/postgis \ - --strip-components 1 \ - && rm postgis.tar.gz \ +# && apk add --no-cache --virtual .fetch-deps \ +# ca-certificates \ +# openssl \ +# tar \ +# \ +# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ +# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ +# && mkdir -p /usr/src/postgis \ +# && tar \ +# --extract \ +# --file postgis.tar.gz \ +# --directory /usr/src/postgis \ +# --strip-components 1 \ +# && rm postgis.tar.gz \ \ && apk add --no-cache --virtual .build-deps \ \ + ca-certificates \ gdal-dev \ geos-dev \ proj-dev \ @@ -43,6 +50,8 @@ RUN set -eux \ autoconf \ automake \ cunit-dev \ + docbook-xml \ + docbook5-xml \ file \ g++ \ gcc \ @@ -51,11 +60,23 @@ RUN set -eux \ json-c-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pcre2-dev \ perl \ protobuf-c-dev \ \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ diff --git a/Dockerfile.bundle.template b/Dockerfile.bundle.template new file mode 100644 index 000000000..4a2cc2c20 --- /dev/null +++ b/Dockerfile.bundle.template @@ -0,0 +1,348 @@ + + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY={{ env.REGISTRY }} +ARG REPO_NAME={{ env.REPO_NAME }} +ARG IMAGE_NAME={{ env.IMAGE_NAME }} + +ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} + +ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS_V1_MOBILITYDB_CHECKOUT={{ .[env.variant].MOBILITYDB_CHECKOUT }} +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1={{ .[env.variant].MOBILITYDB_CHECKOUT_SHA1 }} + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT={{ .[env.variant].PGSQL_HTTP_CHECKOUT }} +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_HTTP_CHECKOUT_SHA1 }} + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT={{ .[env.variant].PGSQL_GZIP_CHECKOUT }} +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_GZIP_CHECKOUT_SHA1 }} + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS_V1_TIMESCALEDB_CHECKOUT={{ .[env.variant].TIMESCALEDB_CHECKOUT }} +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1={{ .[env.variant].TIMESCALEDB_CHECKOUT_SHA1 }} + +FROM ${PGIS_V1_BASE_IMAGE} AS builder + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # MobilityDB + libgeos++-dev \ + libgsl-dev \ + libjson-c-dev \ + libproj-dev \ + # TimescaleDB + libkrb5-dev \ + # pgsql-http + libcurl4-gnutls-dev \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS_V1_MOBILITYDB_REPOSITORY +ARG PGIS_V1_MOBILITYDB_CHECKOUT +ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_HTTP_REPOSITORY +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT +ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 + +ARG PGIS_V1_PGSQL_GZIP_REPOSITORY +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT +ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 + +ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY +ARG PGIS_V1_TIMESCALEDB_REPOSITORY +ARG PGIS_V1_TIMESCALEDB_CHECKOUT +ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 + +RUN set -ex \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + +RUN set -ex \ + && mkdir -p /pgsql-http \ + && cd pgsql-http \ + && git init \ + && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_http_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +{{ if env.version | startswith("16") then ( -}} +# Timescaledb not supported on pg16 yet +{{ ) else ( -}} +# Install TimescaleDB; no Arm64 apt support, so build from source +RUN set -ex \ + && mkdir -p /timescaledb \ + && cd timescaledb \ + && git init \ + && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_timescaledb_last_commit.txt \ + && ./bootstrap \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + \ + -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DREGRESS_CHECKS=OFF \ + -DSEND_TELEMETRY_DEFAULT=NO \ + -DTAP_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ + -DENABLE_DEBUG_UTILS=OFF \ + && cd build \ + && make -j$(nproc) \ + && make install + +{{ ) end -}} + + +# Install MobilityDB +RUN set -ex \ + && mkdir -p /MobilityDB \ + && cd MobilityDB \ + && git init \ + && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_MobilityDB_last_commit.txt \ + && mkdir build \ + && cd build \ + && cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + .. \ + && make -j$(nproc) \ + && make install + +RUN pgxn install ddlx +RUN pgxn install h3 # https://github.com/zachasme/h3-pg +RUN pgxn install json_accessors +RUN pgxn install lostgis +RUN pgxn install parray_gin +RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install pg_roaringbitmap +RUN pgxn install pg_rowalesce +RUN pgxn install pg_uuidv7 +RUN pgxn install pg_xenophile +RUN pgxn install pg_xxhash +RUN pgxn install pgsql_tweaks + +{{ if env.version | startswith("16") then ( -}} +# sqlite_fdw not supported on pg16 yet +# RUN USE_PGXS=1 pgxn install sqlite_fdw +{{ ) else ( -}} +RUN USE_PGXS=1 pgxn install sqlite_fdw +{{ ) end -}} + +RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + + +#TODO: add https://github.com/hydradatabase/hydra +# https://github.com/powa-team/pg_qualstats +# https://github.com/darold/pgtt +# https://github.com/apache/arrow-flight-sql-postgresql +# https://github.com/neondatabase/pg_embedding/ +# pgrust ; "pg-graphql +# https://github.com/kelvich/pg_tiktoken +# +# -------------------------------------------------------------- + + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS Bundle - {{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} " \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +#TODO - uncomment +RUN set -ex \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -ex \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + \ +{{ if env.version | startswith("16") then ( -}} +# +# not yet available for 16 +# postgresql-$PG_MAJOR-partman \ +# postgresql-$PG_MAJOR-pg-fact-loader \ +# postgresql-$PG_MAJOR-pglogical \ +# postgresql-$PG_MAJOR-plpgsql-check \ +# postgresql-$PG_MAJOR-pointcloud \ +# postgresql-$PG_MAJOR-squeeze \ +# +{{ ) else ( -}} + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-pg-fact-loader \ + postgresql-$PG_MAJOR-pglogical \ + postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-squeeze \ +{{ ) end -}} + # + # add MobilityDb missing dependency from libgsl-dev + libgsl27 \ + \ + # && pip3 install --upgrade pip \ + \ +# && pipx install geopy \ +# && pipx install plpygis \ +# && pipx install pygml \ +# && pipx install shapely \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +# Install MobilityDB,Timescaledb,h3,etc from builder +COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder /postgres_dba /postgres_dba + +# check any missing dependencies +RUN set -ex \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not allowed. +RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + dpkg -l | grep llvm ; \ + exit 1; \ + fi + +# add MobilityDB requirements +RUN set -eux; \ + cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ +{{ if env.version | startswith("16") then ( -}} + # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) + echo "shared_preload_libraries = 'postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ +{{ ) else ( -}} + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ +{{ ) end -}} + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc \ No newline at end of file diff --git a/Dockerfile.debian.template b/Dockerfile.debian.template new file mode 100644 index 000000000..ef8a47bc8 --- /dev/null +++ b/Dockerfile.debian.template @@ -0,0 +1,23 @@ +FROM postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS {{ .[env.variant].POSTGIS_VERSION }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR {{ .[env.variant].POSTGIS_MAJOR }} +ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} + +RUN apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 04dd33d57..d19f95a9e 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -1,35 +1,48 @@ -# -# %%TXT_AUTOGENERATED%% -# - # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG DOCKER_CMAKE_BUILD_TYPE=Release -ARG CGAL_GIT_BRANCH=5.6.x-branch -FROM postgres:%%PG_MAJOR%%-%%DEBIAN_VERSION%% as builder +ARG PGIS_V1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL %%PG_MAJOR%% %%DEBIAN_VERSION%%" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +ARG PGIS_V1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} +ARG PGIS_V1_GEOS_CHECKOUT={{ .[env.variant].GEOS_CHECKOUT }} +ARG PGIS_V1_GDAL_CHECKOUT={{ .[env.variant].GDAL_CHECKOUT }} +ARG PGIS_V1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} +ARG PGIS_V1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} +ARG PGIS_V1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} + +ARG PGIS_V1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} + +ARG PGIS_V1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS_V1_BASE_IMAGE} as builder WORKDIR / +ARG PGIS_V1_BOOST_VERSION +ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} + # apt-get install RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic%%BOOST_VERSION%% \ - libboost-chrono%%BOOST_VERSION%% \ - libboost-date-time%%BOOST_VERSION%% \ - libboost-filesystem%%BOOST_VERSION%% \ - libboost-program-options%%BOOST_VERSION%% \ - libboost-serialization%%BOOST_VERSION%% \ - libboost-system%%BOOST_VERSION%% \ - libboost-test%%BOOST_VERSION%% \ - libboost-thread%%BOOST_VERSION%% \ - libboost-timer%%BOOST_VERSION%% \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -37,7 +50,11 @@ RUN set -ex \ libjson-c5 \ libmpfr6 \ libprotobuf-c1 \ +{{ if env.variant != "bullseye" then ( -}} + libtiff6 \ +{{ ) else ( -}} libtiff5 \ +{{ ) end -}} libxml2 \ sqlite3 \ # build dependency @@ -80,54 +97,65 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} # cgal & sfcgal -# By utilizing the latest commit of the CGAL 5.x.x-branch and implementing a header-only build for SFCGAL, -# one can benefit from the latest CGAL patches while avoiding compatibility issues. -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH %%CGAL5X_GIT_HASH%% -ENV SFCGAL_GIT_HASH %%SFCGAL_GIT_HASH%% +ARG PGIS_V1_SFCGAL_REPOSITORY +ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} +ARG PGIS_V1_SFCGAL_CHECKOUT +ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} + +ARG PGIS_V1_CGAL_REPOSITORY +ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} +ARG PGIS_V1_CGAL_CHECKOUT +ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} + RUN set -ex \ - && mkdir -p /usr/src \ && cd /usr/src \ - && git clone --branch ${CGAL_GIT_BRANCH} https://github.com/CGAL/cgal \ + && mkdir cgal \ && cd cgal \ - && git checkout ${CGAL5X_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ - && git clone https://gitlab.com/Oslandia/SFCGAL.git \ + && mkdir SFCGAL \ && cd SFCGAL \ - && git checkout ${SFCGAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ -DSFCGAL_WITH_OSG=OFF \ && make -j$(nproc) \ && make install \ - # - ## testing with -DSFCGAL_BUILD_TESTS=ON - # && CTEST_OUTPUT_ON_FAILURE=TRUE ctest \ - # # clean && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%% +ARG PGIS_V1_PROJ_REPOSITORY +ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} +ARG PGIS_V1_PROJ_CHECKOUT +ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/PROJ.git \ + && mkdir PROJ \ && cd PROJ \ - && git checkout ${PROJ_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -143,7 +171,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -152,28 +180,41 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%% +ARG PGIS_V1_GEOS_REPOSITORY +ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} +ARG PGIS_V1_GEOS_CHECKOUT +ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/libgeos/geos.git \ + && mkdir geos \ && cd geos \ - && git checkout ${GEOS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH %%GDAL_GIT_HASH%% +ARG PGIS_V1_GDAL_REPOSITORY +ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} +ARG PGIS_V1_GDAL_CHECKOUT +ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} + RUN set -ex \ && cd /usr/src \ - && git clone https://github.com/OSGeo/gdal.git \ + && mkdir gdal \ && cd gdal \ - && git checkout ${GDAL_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -196,7 +237,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -252,25 +293,34 @@ RUN set -ex \ # ------------------------------------------- # STAGE final # ------------------------------------------- -FROM postgres:%%PG_MAJOR%%-%%DEBIAN_VERSION%% +FROM ${PGIS_V1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - {{ env.version }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG DOCKER_CMAKE_BUILD_TYPE -ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ARG PGIS_V1_CMAKE_BUILD_TYPE +ARG PGIS_V1_BASE_IMAGE +ARG PGIS_V1_BOOST_VERSION + +ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ + PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} RUN set -ex \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic%%BOOST_VERSION%% \ - libboost-chrono%%BOOST_VERSION%% \ - libboost-date-time%%BOOST_VERSION%% \ - libboost-filesystem%%BOOST_VERSION%% \ - libboost-program-options%%BOOST_VERSION%% \ - libboost-serialization%%BOOST_VERSION%% \ - libboost-system%%BOOST_VERSION%% \ - libboost-test%%BOOST_VERSION%% \ - libboost-thread%%BOOST_VERSION%% \ - libboost-timer%%BOOST_VERSION%% \ + libboost-atomic${PGIS_V1_BOOST_VERSION} \ + libboost-chrono${PGIS_V1_BOOST_VERSION} \ + libboost-date-time${PGIS_V1_BOOST_VERSION} \ + libboost-filesystem${PGIS_V1_BOOST_VERSION} \ + libboost-program-options${PGIS_V1_BOOST_VERSION} \ + libboost-serialization${PGIS_V1_BOOST_VERSION} \ + libboost-system${PGIS_V1_BOOST_VERSION} \ + libboost-test${PGIS_V1_BOOST_VERSION} \ + libboost-thread${PGIS_V1_BOOST_VERSION} \ + libboost-timer${PGIS_V1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -279,12 +329,20 @@ RUN set -ex \ libmpfr6 \ libpcre3 \ libprotobuf-c1 \ +{{ if env.variant != "bullseye" then ( -}} + libtiff6 \ +{{ ) else ( -}} libtiff5 \ +{{ ) end -}} libxml2 \ sqlite3 \ # gdal+ libblosc1 \ +{{ if env.variant != "bullseye" then ( -}} + libcfitsio10 \ +{{ ) else ( -}} libcfitsio9 \ +{{ ) end -}} libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -299,13 +357,23 @@ RUN set -ex \ COPY --from=builder /_pgis*.* / COPY --from=builder /usr/local /usr/local -ARG CGAL_GIT_BRANCH -ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH %%CGAL5X_GIT_HASH%% -ENV SFCGAL_GIT_HASH %%SFCGAL_GIT_HASH%% -ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%% -ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%% -ENV GDAL_GIT_HASH %%GDAL_GIT_HASH%% +ARG PGIS_V1_GDAL_CHECKOUT +ARG PGIS_V1_GDAL_REPOSITORY +ARG PGIS_V1_GEOS_CHECKOUT +ARG PGIS_V1_GEOS_REPOSITORY +ARG PGIS_V1_PROJ_CHECKOUT +ARG PGIS_V1_PROJ_REPOSITORY +ARG PGIS_V1_SFCGAL_CHECKOUT +ARG PGIS_V1_SFCGAL_REPOSITORY + +ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ + PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ + PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ + PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ + PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ + PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ + PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ + PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +392,11 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH %%POSTGIS_GIT_HASH%% +ARG PGIS_V1_POSTGIS_CHECKOUT +ARG PGIS_V1_POSTGIS_REPOSITORY + +ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ + PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} RUN set -ex \ && apt-get update \ @@ -336,6 +408,8 @@ RUN set -ex \ build-essential \ ca-certificates \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -350,6 +424,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ @@ -357,10 +432,13 @@ RUN set -ex \ xsltproc \ && cd \ # postgis - && cd /usr/src/ \ - && git clone https://github.com/postgis/postgis.git \ + && cd /usr/src \ + && mkdir postgis \ && cd postgis \ - && git checkout ${POSTGIS_GIT_HASH} \ + && git init \ + && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: @@ -409,6 +487,8 @@ RUN set -ex \ bison \ build-essential \ cmake \ + docbook-xml \ + docbook5-xml \ g++ \ git \ libboost-all-dev \ @@ -422,6 +502,7 @@ RUN set -ex \ libtiff-dev \ libtool \ libxml2-dev \ + libxml2-utils \ make \ pkg-config \ postgresql-server-dev-$PG_MAJOR \ diff --git a/Dockerfile.template b/Dockerfile.template deleted file mode 100644 index cc3cd2772..000000000 --- a/Dockerfile.template +++ /dev/null @@ -1,28 +0,0 @@ -# -# %%TXT_AUTOGENERATED%% -# - -FROM postgres:%%PG_MAJOR%%-%%DEBIAN_VERSION%% - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS %%POSTGIS_VERSION%% spatial database extension with PostgreSQL %%PG_MAJOR%% %%DEBIAN_VERSION%%" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR %%POSTGIS_MAJOR%% -ENV POSTGIS_VERSION %%POSTGIS_VERSION%% - -RUN apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - diff --git a/Makefile b/Makefile index eccf40a8f..5f97d0264 100644 --- a/Makefile +++ b/Makefile @@ -1,151 +1,344 @@ +# The registry, repository and image names default to the official but can be overriden +# via environment variables. +# For testing, You can start a local registry with: +# docker run -d -p 5000:5000 --restart=always --name registry registry:2 +# with REGISTRY ?= localhost:5000 -# When processing the rules for tagging and pushing container images with the -# "latest" tag, the following variable will be the version that is considered -# to be the latest. -LATEST_VERSION=15-3.4 - -# The following flags are set based on VERSION and VARIANT environment variables -# that may have been specified, and are used by rules to determine which -# versions/variants are to be processed. If no VERSION or VARIANT environment -# variables were specified, process everything (the default). -do_default=true -do_alpine=true - -# The following logic evaluates VERSION and VARIANT variables that may have -# been previously specified, and modifies the "do" flags depending on the values. -# The VERSIONS variable is also set to contain the version(s) to be processed. -ifdef VERSION - VERSIONS=$(VERSION) # If a version was specified, VERSIONS only contains the specified version - ifdef VARIANT # If a variant is specified, unset all do flags and allow subsequent logic to set them again where appropriate - do_default=false - do_alpine=false - ifeq ($(VARIANT),default) - do_default=true - endif - ifeq ($(VARIANT),alpine) - do_alpine=true - endif - endif - ifeq ("$(wildcard $(VERSION)/alpine)","") # If no alpine subdirectory exists, don't process the alpine version - do_alpine=false - endif -else # If no version was specified, VERSIONS should contain all versions - VERSIONS = $(foreach df,$(wildcard */Dockerfile),$(df:%/Dockerfile=%)) -endif - -# The "latest" tag will only be provided for default images (no variant) so -# only define the dependencies when the default image will be built. -ifeq ($(do_default),true) - BUILD_LATEST_DEP=build-$(LATEST_VERSION) - PUSH_LATEST_DEP=push-$(LATEST_VERSION) - PUSH_DEP=push-latest $(PUSH_LATEST_DEP) - # The "latest" tag shouldn't be processed if a VERSION was explicitly - # specified but does not correspond to the latest version. - ifdef VERSION - ifneq ($(VERSION),$(LATEST_VERSION)) - PUSH_LATEST_DEP= - BUILD_LATEST_DEP= - PUSH_DEP= - endif - endif +ENVFILE = .env +ifeq ($(TEST),true) + ENVFILE = .env.test endif +-include $(ENVFILE) +export -# The repository and image names default to the official but can be overriden -# via environment variables. +REGISTRY ?= docker.io REPO_NAME ?= postgis IMAGE_NAME ?= postgis -DOCKER=docker -DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:latest +ifeq ($(shell uname -m),x86_64) + IMAGE_ARCH=amd64 +else ifeq ($(shell uname -m),aarch64) + IMAGE_ARCH=arm64 +else + $(error Architecture not supported) +endif -GIT=git -OFFIMG_LOCAL_CLONE=$(HOME)/official-images -OFFIMG_REPO_URL=https://github.com/docker-library/official-images.git +PUBLIC_IMAGE_NAME:=$(IMAGE_NAME) +ifeq ($(ENABLE_IMAGE_ARCH),true) + IMAGE_NAME:=$(IMAGE_NAME)-$(IMAGE_ARCH) +endif +IMAGE_VERSION_ID :="" +ifeq ($(ENABLE_IMAGE_VERSION_ID),true) + # Note: Make sure to keep this synchronized with the corresponding section in ./tools/environment_init.sh + COMMIT_DATE=$(shell git log -1 --format=%cd --date=format:%Y%m%d) + COMMIT_HASH=$(shell git log -1 --pretty=format:%h) + BUILD_WEEK=$(shell date '+%Yw%U') + IMAGE_VERSION_ID=-ver$(COMMIT_DATE)-$(COMMIT_HASH)-$(BUILD_WEEK) +endif -build: $(foreach version,$(VERSIONS),build-$(version)) +PUSH_FULL_IMAGENAME = ;$(DOCKER) image push $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME): +FULL_IMAGENAME_WITH_T = -t $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME): -all: update build test +DOCKER ?=docker +DOCKERHUB_DESC_IMG=peterevans/dockerhub-description:latest +DOCKER_BUILDOPT ?= --network=host --progress=plain -update: - $(DOCKER) run --rm -v $$(pwd):/work -w /work buildpack-deps ./update.sh +GIT ?=git +OFFIMG_LOCAL_CLONE ?=$(HOME)/official-images +OFFIMG_REPO_URL ?=https://github.com/docker-library/official-images.git +# Default target: help +.DEFAULT_GOAL := help -### RULES FOR BUILDING ### +# Dynamically determine versions and variants based on +# the existence of Dockerfile at the depth of two directories +# where the first directory names starting with a number. +DOCKERFILE_DIRS := $(shell find . -mindepth 2 -maxdepth 2 -type d -exec test -e '{}/Dockerfile' \; -print | sed 's|./||' | awk '/^[0-9]/ {print}') +VERSIONS := $(sort $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | cut -d'/' -f1)) +VARIANTS := $(sort $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | cut -d'/' -f2)) -define build-version -build-$1: -ifeq ($(do_default),true) - $(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) $1 - $(DOCKER) images $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1) -endif -ifeq ($(do_alpine),true) -ifneq ("$(wildcard $1/alpine)","") - $(DOCKER) build --pull -t $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine $1/alpine - $(DOCKER) images $(REPO_NAME)/$(IMAGE_NAME):$(shell echo $1)-alpine +check_variant: +ifeq ($(VARIANT),default) + $(error VARIANT is set to 'default', which is not allowed!) endif +ifeq ($(VARIANT),alpine) + $(error VARIANT is set to 'alpine', which is not allowed!) endif + +# Build targets for each version-variant combination +define build-target +build-$(1)-$(2): check_variant \ + $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),build-$(shell echo $(1) | cut -d- -f1,2)-$(2)) + @echo '::Building $(FULL_IMAGENAME_WITH_T)$(1)-$(2) $(IMAGE_VERSION_ID)' + @echo ':::::: dependency: $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),build-$(shell echo $(1) | cut -d- -f1,2)-$(2)) ' + $(DOCKER) build $(DOCKER_BUILDOPT) \ + --build-arg="REGISTRY=$(REGISTRY)" \ + --build-arg="REPO_NAME=$(REPO_NAME)" \ + --build-arg="IMAGE_NAME=$(IMAGE_NAME)" \ + $(if $(filter 1,$(shell echo $(1) | grep -o '-' | wc -l)), --pull ) \ + $(shell cat $(1)/$(2)/tags | sed 's#\([a-zA-Z0-9.-]*\)#$(subst $,,$(FULL_IMAGENAME_WITH_T))\1#g' ) \ + $(if $(IMAGE_VERSION_ID),$(shell cat $(1)/$(2)/tags | sed 's#\([a-zA-Z0-9.-]*\)#$(subst $,,$(FULL_IMAGENAME_WITH_T))\1$(IMAGE_VERSION_ID)#g' ),) \ + $(1)/$(2) + $(DOCKER) image ls $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) + $(DOCKER) image ls $(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) + $(DOCKER) image inspect $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call build-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) + +# Build targets for each version +define build-version-target +build-$(1): $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | grep ^$(1)/ | sed 's|$(1)/|build-$(1)-|') endef -$(foreach version,$(VERSIONS),$(eval $(call build-version,$(version)))) +$(foreach version,$(VERSIONS),$(eval $(call build-version-target,$(version)))) +# General build target +build: $(foreach dir,$(DOCKERFILE_DIRS),build-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))) -## RULES FOR TESTING ### +# -------------------------------------------------- test-prepare: ifeq ("$(wildcard $(OFFIMG_LOCAL_CLONE))","") + @echo '::Cloning official-images $(OFFIMG_LOCAL_CLONE)' $(GIT) clone $(OFFIMG_REPO_URL) $(OFFIMG_LOCAL_CLONE) +else + @echo '::Updating official-images : $(OFFIMG_LOCAL_CLONE)' + cd $(OFFIMG_LOCAL_CLONE) && $(GIT) pull origin master endif -test: $(foreach version,$(VERSIONS),test-$(version)) +# Test targets for each version-variant combination +define test-target +test-$(1)-$(2): test-prepare \ + build-$1-$(2) \ + $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),test-$(shell echo $(1) | cut -d- -f1,2)-$(2)) + @echo ':Testing $(1)/$(2)' - $(shell cat $(1)/$(2)/tags | cut -d' ' -f1) + @echo ':::::: dependency: $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),test-$(shell echo $(1) | cut -d- -f1,2)-$(2)) ' + $(OFFIMG_LOCAL_CLONE)/test/run.sh \ + -c $(OFFIMG_LOCAL_CLONE)/test/config.sh \ + -c test/postgis-config.sh \ + $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) -define test-version -test-$1: test-prepare build-$1 -ifeq ($(do_default),true) - $(OFFIMG_LOCAL_CLONE)/test/run.sh -c $(OFFIMG_LOCAL_CLONE)/test/config.sh -c test/postgis-config.sh $(REPO_NAME)/$(IMAGE_NAME):$(version) -endif -ifeq ($(do_alpine),true) -ifneq ("$(wildcard $1/alpine)","") - $(OFFIMG_LOCAL_CLONE)/test/run.sh -c $(OFFIMG_LOCAL_CLONE)/test/config.sh -c test/postgis-config.sh $(REPO_NAME)/$(IMAGE_NAME):$(version)-alpine -endif -endif endef -$(foreach version,$(VERSIONS),$(eval $(call test-version,$(version)))) +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call test-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# Build targets for each version +define test-version-target +test-$(1): $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | grep ^$(1)/ | sed 's|$(1)/|test-$(1)-|') +endef +$(foreach version,$(VERSIONS),$(eval $(call test-version-target,$(version)))) +# General test target +test: $(foreach dir,$(DOCKERFILE_DIRS),test-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))) -### RULES FOR TAGGING ### +# -------------------------------------------------- +# Push targets for each version-variant combination +define push-target +push-$(1)-$(2): $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),push-$(shell echo $(1) | cut -d- -f1,2)-$(2)) + @echo '::push $(1)/$(2)' + # push all image tags + $(foreach tag,$(shell cat $(1)/$(2)/tags), \ + echo " --> push1: $(tag) " && \ + $(DOCKER) image push $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(tag) ; \ + ) -tag-latest: $(BUILD_LATEST_DEP) - $(DOCKER) image tag $(REPO_NAME)/$(IMAGE_NAME):$(LATEST_VERSION) $(REPO_NAME)/$(IMAGE_NAME):latest + $(if $(IMAGE_VERSION_ID), \ + # push all image tags - with version id ( -verYYYYMMDD-XXXXXX-YYYYwW W) + $(foreach tag,$(shell cat $(1)/$(2)/tags), \ + echo " --> push2: $(tag)$(IMAGE_VERSION_ID) " && \ + $(DOCKER) image push $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(tag)$(IMAGE_VERSION_ID) ; \ + ),) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call push-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# Build targets for each version +define push-version-target +push-$(1): $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | grep ^$(1)/ | sed 's|$(1)/|push-$(1)-|') +endef +$(foreach version,$(VERSIONS),$(eval $(call push-version-target,$(version)))) +# General push target +push: $(foreach dir,$(DOCKERFILE_DIRS),push-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))) -### RULES FOR PUSHING ### -push: $(foreach version,$(VERSIONS),push-$(version)) $(PUSH_DEP) +# -------------------------------------------------- +# Manifest targets for each version-variant combination +define manifest-target +manifest-$(1)-$(2): $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),manifest-$(shell echo $(1) | cut -d- -f1,2)-$(2)) + @echo '::Manifest $(1)/$(2)' + $(foreach tag,$(shell cat $(1)/$(2)/tags), \ + echo " --> manifest: $(1)/$(2):$(tag) " && \ + manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template $(REGISTRY)/$(REPO_NAME)/$(PUBLIC_IMAGE_NAME)-ARCHVARIANT:$(tag) \ + --target $(REGISTRY)/$(REPO_NAME)/$(PUBLIC_IMAGE_NAME):$(tag) || true; \ + ) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call manifest-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) -define push-version -push-$1: test-$1 -ifeq ($(do_default),true) - $(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):$(version) -endif -ifeq ($(do_alpine),true) -ifneq ("$(wildcard $1/alpine)","") - $(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):$(version)-alpine -endif -endif +# Manifest targets for each version +define manifest-version-target +manifest-$(1): $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | grep ^$(1)/ | sed 's|$(1)/|manifest-$(1)-|') +endef +$(foreach version,$(VERSIONS),$(eval $(call manifest-version-target,$(version)))) +# General manifest target +manifest: $(foreach dir,$(DOCKERFILE_DIRS),manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))) + + + +# -------------------------------------------------- +push-readme: + @echo 'Docker pull $(DOCKERHUB_DESC_IMG)' + $(DOCKER) pull $(DOCKERHUB_DESC_IMG); + @echo 'Docker push README $(DOCKERHUB_DESC_IMG)' + @echo 'DOCKERHUB_REPOSITORY="$(DOCKERHUB_README_REPOSITORY)"' + $(DOCKER) run -v "$(PWD)":/workspace \ + -e DOCKERHUB_USERNAME="$(DOCKERHUB_USERNAME)" \ + -e DOCKERHUB_PASSWORD="$(DOCKERHUB_ACCESS_TOKEN)" \ + -e DOCKERHUB_REPOSITORY="$(DOCKERHUB_README_REPOSITORY)" \ + -e README_FILEPATH="/workspace/README.md" $(DOCKERHUB_DESC_IMG); + + + +# -------------------------------------------------- +# password: f62ba0 == echo -n "postgis" | md5sum | cut -c 1-6 +define start-target +start-$(1)-$(2): + $(DOCKER) run \ + --name postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) \ + -e POSTGRES_PASSWORD="pwf62ba0-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1)" \ + -v postgisdataf62ba0-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1):/var/lib/postgresql/data \ + -d $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call start-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# -------------------------------------------------- +define stop-target +stop-$(1)-$(2): + $(DOCKER) stop postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call stop-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# -------------------------------------------------- +define psql-target +psql-$(1)-$(2): + $(DOCKER) exec -ti postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) psql -U postgres +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call psql-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# -------------------------------------------------- +define clean-target +clean-$(1)-$(2): + @if [ "$$(docker ps -a -q -f name=postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1))" ]; then \ + $(DOCKER) rm $$(docker ps -a -q -f name=postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1)); \ + else \ + echo "No such container to remove : postgis-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1)"; \ + fi + @if [ "$$(docker volume ls -q -f name=postgisdataf62ba0-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1))" ]; then \ + docker volume rm postgisdataf62ba0-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1); \ + else \ + echo "No such volume to remove : postgisdataf62ba0-$(shell cat $(1)/$(2)/tags | cut -d' ' -f1)"; \ + fi endef -$(foreach version,$(VERSIONS),$(eval $(call push-version,$(version)))) +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call clean-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) + +# docker rm $(docker ps -a -f name=changedetection.io -q) +# -------------------------------------------------- +all: check_variant update build test + +dockerlist: + docker images | grep "${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}" || true + +update: + @echo '::Updating Dockerfiles' + $(DOCKER) pull buildpack-deps + $(DOCKER) run --rm -v $$(pwd):/work -w /work buildpack-deps ./update.sh + +check-gh-rate: + @echo 'Checking github ratelimit ...' + @curl -sI https://api.github.com/users/octocat | grep x-ratelimit + +check_version: + @echo "ENABLE_IMAGE_ARCH=$(ENABLE_IMAGE_ARCH)" + @echo "ENABLE_IMAGE_VERSION_ID=$(ENABLE_IMAGE_VERSION_ID)" + @echo "IMAGE_ARCH=$(IMAGE_ARCH)" + @echo "IMAGE_VERSION_ID=$(IMAGE_VERSION_ID)" + +# Rule to run shellcheck on all .sh files in the current directory, subdirectories, and sub-subdirectories. +lint: + shellcheck *.sh ./*/*.sh ./*/*/*.sh ./*/*/*/*.sh -x + +shfmt: + shfmt -i 4 -w *.sh + shfmt -i 4 -w ./tools/*.sh + shfmt -i 4 -w ./test/*.sh + shfmt -i 4 -w ./test/tests/*/*.sh + +lregistryinfo: + echo " ---- Registry info ---- " + curl --location --silent --request GET "http://localhost:5000/v2/_catalog?page=1" | jq '.' + curl --location --silent --request GET "http://localhost:5000/v2/${REPO_NAME}/${IMAGE_NAME}/tags/list?page=1" | jq '.' + +# Remove all local images with the name localhost:5000/ and librarytest +# In a Makefile, the $ character has a special meaning, so you indeed need to escape it by using $$ instead of a single $. +imageclean: + docker image ls | grep "^librarytest" | awk '{print $$3}' | sort -u | xargs -rt docker rmi -f + docker image ls | grep "^localhost:5000/" | awk '{print $$3}' | sort -u | xargs -rt docker rmi -f -push-latest: tag-latest $(PUSH_LATEST_DEP) - $(DOCKER) image push $(REPO_NAME)/$(IMAGE_NAME):latest - @$(DOCKER) run -v "$(PWD)":/workspace \ - -e DOCKERHUB_USERNAME='$(DOCKERHUB_USERNAME)' \ - -e DOCKERHUB_PASSWORD='$(DOCKERHUB_ACCESS_TOKEN)' \ - -e DOCKERHUB_REPOSITORY='$(REPO_NAME)/$(IMAGE_NAME)' \ - -e README_FILEPATH='/workspace/README.md' $(DOCKERHUB_DESC_IMG) +imageclean_${REPO_NAME}_${IMAGE_NAME}: + docker image ls | grep "^${REPO_NAME}/${IMAGE_NAME}" | awk '{print $$3}' | sort -u | xargs -rt docker rmi -f +# Help target +help: check_variant + @echo ' Available make targets:' + @echo '------------------------------------ ' + @echo 'build : Build the docker image versions and variants' + @echo $(foreach version,$(VERSIONS),' build-$(version)') + @echo $(foreach dir,$(DOCKERFILE_DIRS),' build-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' ' + @echo 'test : Test the docker image versions and variants' + @echo $(foreach version,$(VERSIONS),' test-$(version)') + @echo $(foreach dir,$(DOCKERFILE_DIRS),' test-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' ' + @echo 'push : Push to the registry the docker image versions and variants' + @echo $(foreach version,$(VERSIONS),' push-$(version)') + @echo $(foreach dir,$(DOCKERFILE_DIRS),' push-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' ' + @echo 'manifest : Manifest registry the docker image versions and variants' + @echo $(foreach version,$(VERSIONS),' manifest-$(version)') + @echo $(foreach dir,$(DOCKERFILE_DIRS),' manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' ' + @echo ' [[ Start the docker image ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' start-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' [[ Stop the docker image ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' stop-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' [[ psql exec the docker image ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' psql-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' [[ clean docker image and volume ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' clean-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' ' + @echo 'all : Local run: "update" "build" "test" (without push)' + @echo 'check_version: Check the architecture and version id' + @echo 'check-gh-rate: Check the github ratelimit' + @echo 'dockerlist : List the docker images' + @echo 'help : This help file' + @echo 'imageclean : Remove all local images with the name localhost:5000/ and librarytest' + @echo 'imageclean_${REPO_NAME}_${IMAGE_NAME} : Remove all local images with the name ${REPO_NAME}/${IMAGE_NAME}' + @echo 'lint : Run shellcheck on all .sh files' + @echo 'push-readme : Push README.md to Dockerhub' + @echo 'shfmt : Format the shell scripts' + @echo 'test-prepare : Clone official-images repository' + @echo 'update : Generate/Update all Dockerfiles' + @echo '------------------------------------ ' + @echo 'You can check the the command without executing: make -n ' + @echo ' ' -.PHONY: build all update test-prepare test tag-latest push push-latest \ - $(foreach version,$(VERSIONS),build-$(version)) \ - $(foreach version,$(VERSIONS),test-$(version)) \ - $(foreach version,$(VERSIONS),push-$(version)) +.PHONY: help build all update test-prepare test push push-readme manifest \ + check-gh-rate check_version dockerlist lint imageclean imageclean_${REPO_NAME}_${IMAGE_NAME} \ + $(foreach version,$(VERSIONS),' build-$(version)') \ + $(foreach dir,$(DOCKERFILE_DIRS),' build-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach version,$(VERSIONS),' test-$(version)') \ + $(foreach dir,$(DOCKERFILE_DIRS),' test-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach version,$(VERSIONS),' push-$(version)') \ + $(foreach dir,$(DOCKERFILE_DIRS),' push-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach version,$(VERSIONS),' manifest-$(version)') \ + $(foreach dir,$(DOCKERFILE_DIRS),' manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' start-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' stop-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' psql-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' clean-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') diff --git a/README.md b/README.md index f655818f6..b3878464f 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,20 @@ -# postgis/postgis +# 🚧🔧💡🧹 WIP: Experimental development: -[![Build Status](https://github.com/postgis/docker-postgis/workflows/Docker%20PostGIS%20CI/badge.svg)](https://github.com/postgis/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +* 🧪🐳 test images (amd64 + arm64) for the users: https://hub.docker.com/r/imresamu/postgis + * 🧪 internal amd64 only repo: https://hub.docker.com/r/imresamu/postgis-amd64/tags + * 🧪 internal arm64 only repo: https://hub.docker.com/r/imresamu/postgis-arm64/tags +* 🧪 code: https://github.com/ImreSamu/docker-postgis +* Status: Experimental, under active development -The `postgis/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16beta3. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (14, 15) with versions of PostGIS and its dependencies built from their respective master branches. +------------------------ +# 🐳🐘🌍 postgis/postgis +[![Build Status](https://github.com/imresamu/docker-postgis/workflows/Docker%20PostGIS%20CI/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16beta3. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: -| installed extensions | [initialized](https://github.com/postgis/docker-postgis/blob/master/initdb-postgis.sh)| +| installed extensions | [initialized](https://github.com/imresamu/docker-postgis/blob/master/initdb-postgis.sh)| |---------------------|-----| | `postgis` | yes | | `postgis_topology` | yes | @@ -18,65 +26,126 @@ 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-08-17) - -Supported architecture: `amd64` (also known as X86-64)" - -Recommended version for new users: `postgis/postgis:15-3.4` - -### Debian based (recommended) - -* This Docker-PostGIS version has a cautious release cycle to guarantee high stability. - * By "cautious", we mean it does not always have the latest versions of geos, proj, gdal, and sfcgal packages. -* We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. - * In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. -* This version is easy to extend and has matured over time. -* PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. - - -| DockerHub image | Dockerfile | OS | Postgres | PostGIS | -| --------------- | ---------- | -- | -------- | ------- | -| [postgis/postgis:11-3.3](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/Dockerfile) | debian:bullseye | 11 | 3.3.4 | -| [postgis/postgis:12-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/Dockerfile) | debian:bullseye | 12 | 3.4.0 | -| [postgis/postgis:13-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/Dockerfile) | debian:bullseye | 13 | 3.4.0 | -| [postgis/postgis:14-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/Dockerfile) | debian:bullseye | 14 | 3.4.0 | -| [postgis/postgis:15-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/Dockerfile) | debian:bullseye | 15 | 3.4.0 | - -### Alpine based - -* The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -* In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4. -* PostGIS is compiled from source, making it a bit more challenging to extend. -* PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. - - -| DockerHub image | Dockerfile | OS | Postgres | PostGIS | -| --------------- | ---------- | -- | -------- | ------- | -| [postgis/postgis:11-3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/alpine/Dockerfile) | alpine:3.18 | 11 | 3.3.4 | -| [postgis/postgis:12-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/alpine/Dockerfile) | alpine:3.18 | 12 | 3.4.0 | -| [postgis/postgis:13-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/alpine/Dockerfile) | alpine:3.18 | 13 | 3.4.0 | -| [postgis/postgis:14-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/alpine/Dockerfile) | alpine:3.18 | 14 | 3.4.0 | -| [postgis/postgis:15-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/alpine/Dockerfile) | alpine:3.18 | 15 | 3.4.0 | - -### Test images - -* We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. -* The template for the `*-master` images is updated manually, which might lead to a delay of a few weeks sometimes. -* The ~master SFCGAL version is 1.4 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). - -| DockerHub image | Dockerfile | OS | Postgres | PostGIS | -| --------------- | ---------- | -- | -------- | ------- | -| [postgis/postgis:14-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-master/Dockerfile) | debian:bullseye | 14 | development: postgis, geos, proj, gdal | -| [postgis/postgis:15-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/Dockerfile) | debian:bullseye | 15 | development: postgis, geos, proj, gdal | -| [postgis/postgis:16beta3-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-3.4/Dockerfile) | debian:bullseye | 16beta3 | 3.4.0 | -| [postgis/postgis:16beta3-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-3.4/alpine/Dockerfile) | alpine:3.18 | 16beta3 | 3.4.0 | -| [postgis/postgis:16beta3-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-master/Dockerfile) | debian:bullseye | 16beta3 | development: postgis, geos, proj, gdal | - -## Usage +## Versions (2023-10-07) + +We provide multi-platform image support for the following architectures: + +- `amd64`: Also known as x86-64. + - Use `--platform=linux/amd64` when specifying the platform. +- `arm64`: Also known as AArch64. + - Use `--platform=linux/arm64` when specifying the platform. + +Notes: + +- The `arm64` architecture support is still experimental. Please refer to the 'arch' column in the version information to determine whether an `arm64` version is available for a specific release. +- We currently do not support 32-bit architectures. Our images are only available for 64-bit architectures. + +### 🌟Recommended Versions for New Users + +For those new to PostGIS, we recommend the following image versions: + +- `imresamu/postgis:15-3.4`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. +- `imresamu/postgis:15-3.4-bundle`: This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. + +### 🥇Debian - bookworm (recommended) + +- This Docker-PostGIS version has a cautious release cycle to guarantee high stability. + - By "cautious", we mean it does not always have the latest versions of geos, proj, gdal, and sfcgal packages. +- We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. + - In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. +- This version is easy to extend and has matured over time. +- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | + + +### 📘Debian - bullseye + +- We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. + - In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. +- This version is easy to extend and has matured over time. +- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | + + + +### 🧪Recentstack ( experimental ) + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`15-recentstack-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recentstack-bookworm), [`15-recentstack`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recentstack) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recentstack/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recentstack: latest tagged postgis, geos, proj, gdal | +| [`16-recentstack-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recentstack-bookworm), [`16-recentstack`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recentstack) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recentstack/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recentstack: latest tagged postgis, geos, proj, gdal | + + +### 🧪Debian Geo Bundle ( experimental ) + +This repository provides Debian-based PostGIS Docker images enriched with additional geospatial packages such as [pgRouting](https://pgrouting.org/), [h3-pg]( https://github.com/zachasme/h3-pg), [pgsql-ogr-fdw](https://github.com/pramsey/pgsql-ogr-fdw), [MobilityDB](https://mobilitydb.com/), [PL/Python3](https://www.postgresql.org/docs/current/plpython.html), [pgPointcloud](https://pgpointcloud.github.io/pointcloud/), [pgVector](https://github.com/pgvector/pgvector), [TimeScaleDB](https://www.timescale.com/) and others. +These images serve as a comprehensive solution for various server side geospatial needs. +Please note that the included package list is subject to change as we continue to refine the bundle. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`13-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bundle-bookworm), [`13-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bundle-bookworm), [`13-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | +| [`14-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle-bookworm), [`14-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle-bookworm), [`14-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle-bookworm), [`15-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle-bookworm), [`15-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle), [`bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle-bookworm), [`16-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle-bookworm), [`16-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | + + +### ⛰️Alpine based + +- The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). +- In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4. +- PostGIS is compiled from source, making it a bit more challenging to extend. +- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | + + +### 📋Test images + +- We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. +- The template for the `*-master` images is updated manually, which might lead to a delay of a few weeks sometimes. +- The ~master SFCGAL version is 1.4 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | +| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | + + +## 🚀Usage In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows: - docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d postgis/postgis + docker run --name some-postgis -e POSTGRES_PASSWORD=mysecretpassword -d imresamu/postgis For more detailed instructions about how to start and control your Postgres container, see the documentation for the `postgres` image [here](https://registry.hub.docker.com/_/postgres/). @@ -89,26 +158,26 @@ Once you have started a database container, you can then connect to the database docker network create some-network # Server container - docker run --name some-postgis --network some-network -e POSTGRES_PASSWORD=mysecretpassword -d postgis/postgis + docker run --name some-postgis --network some-network -e POSTGRES_PASSWORD=mysecretpassword -d imresamu/postgis # Client container - docker run -it --rm --network some-network postgis/postgis psql -h some-postgis -U postgres + docker run -it --rm --network some-network imresamu/postgis psql -h some-postgis -U postgres Check the documentation on the [`postgres` image](https://registry.hub.docker.com/_/postgres/) and [Docker networking](https://docs.docker.com/network/) for more details and alternatives on connecting different containers. See [the PostGIS documentation](http://postgis.net/docs/postgis_installation.html#create_new_db_extensions) for more details on your options for creating and using a spatially-enabled database. -## Supported Environment Variables: +## 🔧Supported Environment Variables: Since the docker-postgis repository is an extension of the official Docker PostgreSQL repository, all environment variables supported there are also supported here: -* `POSTGRES_PASSWORD` -* `POSTGRES_USER` -* `POSTGRES_DB` -* `POSTGRES_INITDB_ARGS` -* `POSTGRES_INITDB_WALDIR` -* `POSTGRES_HOST_AUTH_METHOD` -* `PGDATA` +- `POSTGRES_PASSWORD` +- `POSTGRES_USER` +- `POSTGRES_DB` +- `POSTGRES_INITDB_ARGS` +- `POSTGRES_INITDB_WALDIR` +- `POSTGRES_HOST_AUTH_METHOD` +- `PGDATA` Read more: https://github.com/docker-library/docs/blob/master/postgres/README.md @@ -117,37 +186,39 @@ Warning: **the Docker specific variables will only have an effect if you start t It's important to note that the environment variables for the Docker image are different from those of the [libpq — C Library](https://www.postgresql.org/docs/current/libpq-envars.html) (`PGDATABASE`,`PGUSER`,`PGPASSWORD` ) -## Troubleshooting tips: +## ⚠️ Troubleshooting tips: Troubleshooting can often be challenging. It's important to know that the docker-postgis repository is an extension of the official Docker PostgreSQL repository. Therefore, if you encounter any issues, it's worth testing whether the problem can be reproduced with the [official PostgreSQL Docker images](https://hub.docker.com/_/postgres). If so, it's recommended to search for solutions based on this. The following websites are suggested: -* Upstream docker postgres repo: https://github.com/docker-library/postgres - * search for the open or closed issues ! -* Docker Community Forums: https://forums.docker.com -* Docker Community Slack: https://dockr.ly/slack -* Stack Overflow: https://stackoverflow.com/questions/tagged/docker+postgresql +- Upstream docker postgres repo: https://github.com/docker-library/postgres + - search for the open or closed issues ! +- Docker Community Forums: https://forums.docker.com +- Docker Community Slack: https://dockr.ly/slack +- Stack Overflow: https://stackoverflow.com/questions/tagged/docker+postgresql If your problem is Postgis related: -* Stack Overflow : docker + postgis https://stackoverflow.com/questions/tagged/docker+postgis -* Postgis issue tracker: https://trac.osgeo.org/postgis/report +- Stack Overflow : docker + postgis https://stackoverflow.com/questions/tagged/docker+postgis +- Postgis issue tracker: https://trac.osgeo.org/postgis/report And if you don't have a postgres docker experience - read this blog post: -* https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/ +- https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/ -## Security +## 🔒Security It's crucial to be aware that in a cloud environment, with default settings, these images are vulnerable, and there's a high risk of cryptominer infection if the ports are left open. ( [Read More](https://github.com/docker-library/postgres/issues/770#issuecomment-704460980) ) -* Note that ports which are not bound to the host (i.e., `-p 5432:5432` instead of `-p 127.0.0.1:5432:5432`) will be accessible from the outside. This also applies if you configured UFW to block this specific port, as Docker manages its own iptables rules. ( [Read More](https://docs.docker.com/network/iptables/) ) + +- Note that ports which are not bound to the host (i.e., `-p 5432:5432` instead of `-p 127.0.0.1:5432:5432`) will be accessible from the outside. This also applies if you configured UFW to block this specific port, as Docker manages its own iptables rules. ( [Read More](https://docs.docker.com/network/iptables/) ) Recomendations: -* You can add options for using SSL ( [see postgres example](https://github.com/docker-library/postgres/issues/989#issuecomment-1222648067) ) + +- You can add options for using SSL ( [see postgres example](https://github.com/docker-library/postgres/issues/989#issuecomment-1222648067) ) - `-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key` -* Or you can use [SSH Tunnels](https://www.postgresql.org/docs/15/ssh-tunnels.html) with `-p 127.0.0.1:5432:5432` +- Or you can use [SSH Tunnels](https://www.postgresql.org/docs/15/ssh-tunnels.html) with `-p 127.0.0.1:5432:5432` -## Known Issues / Errors +## ❗Known Issues / Errors When You encouter errors due to PostGIS update `OperationalError: could not access file "$libdir/postgis-X.X`, run: diff --git a/_migrate.sh b/_migrate.sh new file mode 100755 index 000000000..2857e15af --- /dev/null +++ b/_migrate.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +# temporary files, only for the migration. +# will be removed... + +debian_move() { + mkdir -p "$1/bullseye" + mkdir -p "$1/bookworm" + + git mv "$1/Dockerfile" "$1/bullseye/Dockerfile" + git mv "$1/initdb-postgis.sh" "$1/bullseye/initdb-postgis.sh" + git mv "$1/update-postgis.sh" "$1/bullseye/update-postgis.sh" + + cp "$1/bullseye/Dockerfile" "$1/bookworm/Dockerfile" + cp "$1/bullseye/initdb-postgis.sh" "$1/bookworm/initdb-postgis.sh" + cp "$1/bullseye/update-postgis.sh" "$1/bookworm/update-postgis.sh" + + git add "$1/bookworm/Dockerfile" + git add "$1/bookworm/initdb-postgis.sh" + git add "$1/bookworm/update-postgis.sh" +} + +bookworm_move() { + mkdir -p "$1/bookworm" + git mv "$1/Dockerfile" "$1/bookworm/Dockerfile" + git mv "$1/initdb-postgis.sh" "$1/bookworm/initdb-postgis.sh" + git mv "$1/update-postgis.sh" "$1/bookworm/update-postgis.sh" +} + +alpine_move() { + git mv "$1/alpine" "$1/alpine3.18" +} + +debian_move 11-3.3 +debian_move 12-3.4 +debian_move 13-3.4 +debian_move 14-3.4 +debian_move 15-3.4 +debian_move 16beta3-3.4 + +bookworm_move 14-master +bookworm_move 15-master +bookworm_move 16beta3-master + +alpine_move 11-3.3 +alpine_move 12-3.4 +alpine_move 13-3.4 +alpine_move 14-3.4 +alpine_move 15-3.4 +alpine_move 16beta3-3.4 + +git mv 16beta3-3.4 16-3.4 +git mv 16beta3-master 16-master + +git mv Dockerfile.template Dockerfile.debian.template + +mkdir -p 12-3.4-bundle +mkdir -p 13-3.4-bundle +mkdir -p 14-3.4-bundle +mkdir -p 15-3.4-bundle + +mkdir -p 12-3.4-bundle/bookworm +mkdir -p 13-3.4-bundle/bookworm +mkdir -p 14-3.4-bundle/bookworm +mkdir -p 15-3.4-bundle/bookworm + +touch 12-3.4-bundle/bookworm/Dockerfile +touch 13-3.4-bundle/bookworm/Dockerfile +touch 14-3.4-bundle/bookworm/Dockerfile +touch 15-3.4-bundle/bookworm/Dockerfile diff --git a/apply-ci.sh b/apply-ci.sh new file mode 100755 index 000000000..0902c2300 --- /dev/null +++ b/apply-ci.sh @@ -0,0 +1,97 @@ +#!/bin/bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +[ -f ./versions.json ] +input_file="versions.json" + +# cleaning the workfile +rm -f _matrix.yml +rm -f _circleci_arm64.yml + +## Load .env files config. +#set -a +#if [[ "${TEST:-}" == "true" ]]; then +# # shellcheck disable=SC1091 +# source .env.test +#else +# # shellcheck disable=SC1091 +# source .env +#fi +#set +a + +versions=$(jq 'keys[]' "$input_file") + +# the bundle version and the source - should be generated in the same workflow. +# so we need all bundle base list - for removing the matrix. +function generate_versions_bundle_base() { + versions_bundle_base='' + for version in $versions; do + version=$(echo "$version" | tr -d '"') + variants=$(jq ".\"$version\" | keys[]" "$input_file") + for variant in $variants; do + variant=$(echo "$variant" | tr -d '"') + if [[ $(echo "$version" | grep -o '-' | wc -l) -eq 2 ]]; then + echo "bundle detected: ${version}-${variant} ( The version variable contains two '-' ) " + versions_bundle_base+=$(echo "${version}" | cut -d'-' -f1-2)-${variant} + fi + done + done + echo "## versions_bundle_base=$versions_bundle_base" +} +generate_versions_bundle_base + +#TODO: arch based filter for amd64 and arm64 +for version in $versions; do + # Remove quotes around version + version=$(echo "$version" | tr -d '"') + variants=$(jq ".\"$version\" | keys[]" "$input_file") + for variant in $variants; do + + # Remove quotes around variant + variant=$(echo "$variant" | tr -d '"') + pg_docker=$(jq -r ".\"$version\".\"$variant\".PG_DOCKER" "$input_file") + postgis=$(jq -r ".\"$version\".\"$variant\".postgis" "$input_file") + tags=$(jq -r ".\"$version\".\"$variant\".tags" "$input_file") + arch=$(jq -r ".\"$version\".\"$variant\".arch" "$input_file") + readme_group=$(jq -r ".\"$version\".\"$variant\".readme_group" "$input_file") + + if [[ $arch == *"amd64"* ]]; then + if [[ $versions_bundle_base =~ ${version}-${variant} ]]; then + echo "# --skip-- - { version: \"$version\", variant: \"$variant\", postgres: \"$pg_docker\", postgis: \"$postgis\", arch: \"$arch\", tags: \"$tags\", readme_group: \"$readme_group\" }" >>_matrix.yml + else + echo " - { version: \"$version\", variant: \"$variant\", postgres: \"$pg_docker\", postgis: \"$postgis\", arch: \"$arch\", tags: \"$tags\", readme_group: \"$readme_group\" }" >>_matrix.yml + fi + fi + + if [[ $arch == *"arm64"* ]]; then + if [[ $versions_bundle_base =~ ${version}-${variant} ]]; then + echo "# --skip-- \"${version}-${variant}\", --> generated with the related bundle job!" >>_circleci_arm64.yml + else + echo " \"${version}-${variant}\"," >>_circleci_arm64.yml + fi + fi + + done +done + +# ------------- Update .github/workflows/main.yml ------------------ +echo "## update .github/workflows/main.yml ##" +awk -v content="$(<_matrix.yml)" ' +$0 ~ "#matrix-include-start" {print; print content; f=1; next} +$0 ~ "#matrix-include-end" {f=0} +!f' .github/workflows/main.yml >.github/workflows/main.tmp && mv .github/workflows/main.tmp .github/workflows/main.yml + +echo "## _matrix.yml ## " +cat _matrix.yml + +# ------------- Update .circleci/config.yml ------------------ +echo "## update .circleci/config.yml ##" +awk -v content="$(<_circleci_arm64.yml)" ' +$0 ~ "#circleci-targets-start" {print; print content; f=1; next} +$0 ~ "#circleci-targets-end" {f=0} +!f' .circleci/config.yml >.circleci/config.tmp && mv .circleci/config.tmp .circleci/config.yml + +echo "## _circleci_arm64.yml ##" +cat _circleci_arm64.yml diff --git a/apply-manifest.sh b/apply-manifest.sh new file mode 100755 index 000000000..f2dda9475 --- /dev/null +++ b/apply-manifest.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +[ -f ./versions.json ] +input_file="versions.json" +rm -f manifest.sh + +cat <<'EOF' >manifest.sh +#!/usr/bin/env bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +# +# Updating the docker manifest for the postgis image. +# This script uses the version.json metadata file as input to create the updated manifest. +# manifest-tool doc : https://github.com/estesp/manifest-tool +# +# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +EOF + +create_manifest() { + local tags="$1" + local arch="$2" + + # Split tags and arch into arrays + IFS=' ' read -ra tag_array <<<"$tags" + IFS=' ' read -ra arch_array <<<"$arch" + + # Check the arch parameter + if [[ ${#arch_array[@]} -lt 1 || ${#arch_array[@]} -gt 2 ]]; then + echo "Error: The arch parameter must have 1 or 2 elements." + return 1 + fi + + local platform_arch="" + for element in "${arch_array[@]}"; do + if [ -z "$platform_arch" ]; then + platform_arch="linux/$element" + else + platform_arch="$platform_arch,linux/$element" + fi + done + + # Create and push manifest for each tag. + # comment: Sometimes some images is missing ( ~ synchronisation issues with CircleCI ) + # .. and we have to continue the script, so we use the || true + for tag in "${tag_array[@]}"; do + echo "" + echo "echo \"manifest: \${dockername}:${tag}\"" + echo "manifest-tool push from-args \\" + echo " --platforms $platform_arch \\" + echo " --template \${dockername}-ARCHVARIANT:${tag} \\" + echo " --target \${dockername}:${tag} || true" + done +} + +versions=$(jq 'keys[]' "$input_file") +for version in $versions; do + # Remove quotes around version + version=$(echo "$version" | tr -d '"') + variants=$(jq ".\"$version\" | keys[]" "$input_file") + for variant in $variants; do + # Remove quotes around variant + variant=$(echo "$variant" | tr -d '"') + tags=$(jq -r ".\"$version\".\"$variant\".tags" "$input_file") + arch=$(jq -r ".\"$version\".\"$variant\".arch" "$input_file") + + ( + echo "" + echo "# ----- ${version}-${variant} -----" + create_manifest "$tags" "$arch" + ) >>manifest.sh + + done +done + +echo "Done! a new ./manifest.sh has been created!" +chmod +x ./manifest.sh +head -n 50 <./manifest.sh diff --git a/apply-readme.sh b/apply-readme.sh new file mode 100755 index 000000000..887f13e39 --- /dev/null +++ b/apply-readme.sh @@ -0,0 +1,91 @@ +#!/bin/bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +[ -f ./versions.json ] + +input_file="versions.json" +versions=$(jq 'keys[]' "$input_file") +distinct_variants=$(jq -r 'to_entries[] | .value | keys[]' "$input_file" | sort -u) + +rm -f _dockerlists_*.md +for readme_group in $distinct_variants recentstack bundle test; do + echo "init _dockerlists_${readme_group}.md" + echo "| \`$dockername:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md + echo "| ---- | :-: | :-: | :-: | :-: | :-: |" >>_dockerlists_"${readme_group}".md +done + +for version in $versions; do + # Remove quotes around version + version=$(echo "$version" | tr -d '"') + variants=$(jq ".\"$version\" | keys[]" "$input_file") + for variant in $variants; do + + variant=$(echo "$variant" | tr -d '"') + readme_group=$(jq -r ".\"$version\".\"$variant\".readme_group" "$input_file") + PG_DOCKER=$(jq -r ".\"$version\".\"$variant\".PG_DOCKER" "$input_file") + POSTGIS_VERSION=$(jq -r ".\"$version\".\"$variant\".POSTGIS_VERSION" "$input_file") + postgis=$(jq -r ".\"$version\".\"$variant\".postgis" "$input_file") + arch=$(jq -r ".\"$version\".\"$variant\".arch" "$input_file") + + if [[ "$postgis" == "master" ]]; then + POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal" + elif [[ "$postgis" == "recentstack" ]]; then + POSTGIS_DOC_VERSION="..recentstack: latest tagged postgis, geos, proj, gdal" + else + POSTGIS_DOC_VERSION=$(echo "$POSTGIS_VERSION" | awk -F'[+-]' '{print $1}') + fi + + tags=$(jq -r ".\"$version\".\"$variant\".tags" "$input_file") + tagslinks="" + for tag in $tags; do + tagslinks+="[\`${tag}\`](${dockerhublink}${tag}), " + done + # Remove trailing comma and space + tagslinks=$(echo -n "$tagslinks" | sed 's/, *$//') + + echo "| ${tagslinks} | [Dockerfile](${githubrepolink}/${version}/${variant}/Dockerfile) | ${arch} | ${variant} | ${PG_DOCKER} | ${POSTGIS_DOC_VERSION} |" >>_dockerlists_"${readme_group}".md + + done +done + +echo "|-------------------------|" +echo "|- Generated images -|" +echo "|-------------------------|" + +for readme_group in $distinct_variants recentstack bundle test; do + echo " " + echo "---- ${readme_group} ----" + cat _dockerlists_"${readme_group}".md +done + +# ------------- Update README.md ------------------ +# Get current date and Replace date in README.md +TODAY=$(date +%Y-%m-%d) +sed -i -r "s/(## Versions) \([0-9]{4}-[0-9]{2}-[0-9]{2}\)/\1 ($TODAY)/g" README.md +# Replace content between the special comments in README.md for each readme_group +for readme_group in $distinct_variants recentstack bundle test; do + echo "## ${readme_group} ##" + awk -v readme_group="$readme_group" -v content="$(<_dockerlists_"${readme_group}".md)" ' + $0 ~ "" {print; print content; f=1; next} + $0 ~ "" {f=0} + !f' README.md >tmp.md && mv tmp.md README.md +done + +# Check README.md size; for safe uploading to the docker hub; +# https://github.com/peter-evans/dockerhub-description/issues/69 +README_SIZE_LIMIT=25000 +file_size=$(stat --format=%s "README.md") +echo " " +echo "README.md size is $file_size bytes ( max limit $README_SIZE_LIMIT bytes )" +if [[ $file_size -ge $README_SIZE_LIMIT ]]; then + echo "Error: README.md is too large ($file_size bytes). " + echo " Must be less than $README_SIZE_LIMIT bytes!" + echo " The github API automatically truncates README.md files to $README_SIZE_LIMIT bytes." + exit 1 +fi + +echo " " +echo "README.md updated " +echo " " diff --git a/apply-templates.sh b/apply-templates.sh new file mode 100755 index 000000000..6c5943ba3 --- /dev/null +++ b/apply-templates.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +# This code derived from: +# - URL: https://github.com/docker-library/postgres/blob/master/apply-templates.sh +# - Copyright: (c) Docker PostgreSQL Authors +# - MIT License, https://github.com/docker-library/postgres/blob/master/LICENSE + +# Check dependencies +[ -f ./versions.json ] + +cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +jqt='.jq-template.awk' +if [ -n "${BASHBREW_SCRIPTS:-}" ]; then + jqt="$BASHBREW_SCRIPTS/jq-template.awk" +elif [ "${BASH_SOURCE[0]}" -nt "$jqt" ]; then + # https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk + wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk' +fi + +if [ "$#" -eq 0 ]; then + versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + eval "set -- $versions" +fi + +echo "versions = $versions" + +generated_warning() { + cat <<-EOH + # + # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" + # source: "$1" + # PLEASE DO NOT EDIT IT DIRECTLY. + # + EOH +} + +for version; do + export version + + bundleType="$(echo "$version" | cut -d '-' -f 3)" + variants="$(jq -r '.[env.version]| keys | map(@sh) | join(" ")' versions.json)" + eval "variants=( $variants )" + + for variant in "${variants[@]}"; do + export variant + + dir="$version/$variant" + echo "processing $dir ..." + + template="$(jq -r '.[env.version][env.variant].template' versions.json)" + echo " template=$template" + tags="$(jq -r '.[env.version][env.variant].tags' versions.json)" + echo " tags=$tags" + + if [ -z "$bundleType" ]; then + cp -a initdb-postgis.sh update-postgis.sh "$dir/" + fi + + echo "$tags" >"$dir/tags" + + { + generated_warning "$template" + gawk -f "$jqt" "$template" + } >"$dir/Dockerfile" + + done +done + +echo " " +echo " apply-template : done" +echo " " diff --git a/doc/developers.md b/doc/developers.md new file mode 100644 index 000000000..8ee1bacd2 --- /dev/null +++ b/doc/developers.md @@ -0,0 +1,34 @@ + +# Developer Documentation + +* 🧪 test images: https://hub.docker.com/r/imresamu/postgis +* 🧪 test github: https://github.com/ImreSamu/docker-postgis + +## Development Goals Prior to Public Discussion: + +- [x] Use Dockerfile templates and version.json, and follow best practices from the official PostgreSQL Dockerfiles as closely as possible. +- [x] Support for multiple Debian and Alpine releases (e.g., Buster, Bullseye, Alpine 3.18) +- [x] Release new Geo bundle version with pgRouting,MobilityDB,H3,... + - [ ] need more test, refactoring +- [x] Support multi tags + - `15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine` + - `15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle` + - `15-master-bookworm 15-master` +- [x] Special tags for the latest versions `alpine`,`bundle`,`latest` +- [x] Automatically update continuous integration (CI) scripts, and maintain `README.md` based on `./version.json` +- [x] Support development repositories with easier setup ( `.env` ) +- [ ] Implement multi-architecture multi-cloud support + - [x] Support amd64 via GitHub Actions `.github/workflows/main.yml` + - [x] Support arm64 via CircleCI (using native arm, not emulated) `.circleci/config.yml` + - [ ] Synchronize CI Tasks + - [ ] Handle manifest creation (complex task) +- [x] Shellcheck verify +- [x] Minimal test flow with local registy ( `./localtest.sh` ) +- [x] New Makefile; with `make help` +- [ ] Refactoring README.md ( Github API 25000 char limit ) +- [ ] Refactoring & Testing +- [ ] Provide developer documentation + + + +https://github.com/dvershinin/lastversion diff --git a/initdb-postgis.sh b/initdb-postgis.sh index e38ad7d66..21f8c373d 100644 --- a/initdb-postgis.sh +++ b/initdb-postgis.sh @@ -1,19 +1,19 @@ #!/bin/bash - +# shellcheck disable=SC2154 set -e # Perform all actions as $POSTGRES_USER export PGUSER="$POSTGRES_USER" # Create the 'template_postgis' template db -"${psql[@]}" <<- 'EOSQL' +"${psql[@]}" <<-'EOSQL' CREATE DATABASE template_postgis IS_TEMPLATE true; EOSQL # Load PostGIS into both template_database and $POSTGRES_DB for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' CREATE EXTENSION IF NOT EXISTS postgis; CREATE EXTENSION IF NOT EXISTS postgis_topology; -- Reconnect to update pg_setting.resetval diff --git a/localtest.sh b/localtest.sh new file mode 100755 index 000000000..89d54ee93 --- /dev/null +++ b/localtest.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# Check if the container with name "registry" is already running +# https://docs.docker.com/registry/deploying/ + +docker ps -a + +testregistry="postgistestregistry" +testregistry_cid=$(docker ps -q -f name="$testregistry") +echo "testregistry_cid=$testregistry_cid" + +if [ -z "$testregistry_cid" ]; then + # Not running - start registry + docker pull registry:2 + docker run -d -p 5000:5000 --restart=always --name "$testregistry" registry:2 + # -v /mnt/registry:/var/lib/registry \ +else + # If running, output a message + echo "Container with name: $testregistry is already running" +fi + +# Enable TEST mode and use the local registry at localhost:5000 (as specified in the .env.test file). +export TEST=true +set -a +# shellcheck disable=SC1091 +source .env.test +set +a + +echo " " +echo "Test mode = $TEST ; Reading from the .env.test file !" +echo " ------- .env.test -------- " +cat .env.test +echo " -------------------------- " + +# generate,update +# versions.json, Dockerfiles, README.md, .github/workflows/main.yml .circleci/config.yml + +./update.sh + +# check commands +make -n test-15-3.4-bundle-bookworm +make -n push-15-3.4-bundle-bookworm +make -n manifest-15-3.4-bundle-bookworm + +# run commands +make test-15-3.4-bundle-bookworm +make push-15-3.4-bundle-bookworm +make manifest-15-3.4-bundle-bookworm + +# check images +echo " " +echo " ---- generated images ---- " +make dockerlist + +# check registy +echo " " +make lregistryinfo + +echo " " +echo "WARNING: Be carefull and not push the .localtest.sh script generated Dockerfiles," +echo " because contains reference to the test REGISTRY, REPO_NAME and IMAGE_NAME!" +echo " " +echo "done." + +# manual tests cheetsheets: +# ---------------------------- +# REGISTRY=localhost:5000 make push-15-3.4-bundle +# REGISTRY=localhost:5000 make push-15-3.4-bundle-bookworm +# TEST=true make push-15-3.4-bundle-bookworm +# diff --git a/manifest.sh b/manifest.sh new file mode 100755 index 000000000..7f9037713 --- /dev/null +++ b/manifest.sh @@ -0,0 +1,491 @@ +#!/usr/bin/env bash +set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh + +# +# Updating the docker manifest for the postgis image. +# This script uses the version.json metadata file as input to create the updated manifest. +# manifest-tool doc : https://github.com/estesp/manifest-tool +# +# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# ----- 11-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:11-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3-alpine3.18 \ + --target ${dockername}:11-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:11-3.3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3.4-alpine3.18 \ + --target ${dockername}:11-3.3.4-alpine3.18 || true + +echo "manifest: ${dockername}:11-3.3-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3-alpine \ + --target ${dockername}:11-3.3-alpine || true + +# ----- 11-3.3-bookworm ----- + +echo "manifest: ${dockername}:11-3.3-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3-bookworm \ + --target ${dockername}:11-3.3-bookworm || true + +echo "manifest: ${dockername}:11-3.3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3.4-bookworm \ + --target ${dockername}:11-3.3.4-bookworm || true + +echo "manifest: ${dockername}:11-3.3" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3 \ + --target ${dockername}:11-3.3 || true + +# ----- 11-3.3-bullseye ----- + +echo "manifest: ${dockername}:11-3.3-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3-bullseye \ + --target ${dockername}:11-3.3-bullseye || true + +echo "manifest: ${dockername}:11-3.3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:11-3.3.4-bullseye \ + --target ${dockername}:11-3.3.4-bullseye || true + +# ----- 12-3.4-alpine3.18 ----- + +echo "manifest: ${dockername}:12-3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.18 \ + --target ${dockername}:12-3.4-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.4.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.0-alpine3.18 \ + --target ${dockername}:12-3.4.0-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ + --target ${dockername}:12-3.4-alpine || true + +# ----- 12-3.4-bookworm ----- + +echo "manifest: ${dockername}:12-3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ + --target ${dockername}:12-3.4-bookworm || true + +echo "manifest: ${dockername}:12-3.4.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.0-bookworm \ + --target ${dockername}:12-3.4.0-bookworm || true + +echo "manifest: ${dockername}:12-3.4" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4 \ + --target ${dockername}:12-3.4 || true + +# ----- 12-3.4-bullseye ----- + +echo "manifest: ${dockername}:12-3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ + --target ${dockername}:12-3.4-bullseye || true + +echo "manifest: ${dockername}:12-3.4.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.0-bullseye \ + --target ${dockername}:12-3.4.0-bullseye || true + +# ----- 13-3.4-alpine3.18 ----- + +echo "manifest: ${dockername}:13-3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.18 \ + --target ${dockername}:13-3.4-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.4.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.0-alpine3.18 \ + --target ${dockername}:13-3.4.0-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ + --target ${dockername}:13-3.4-alpine || true + +# ----- 13-3.4-bookworm ----- + +echo "manifest: ${dockername}:13-3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ + --target ${dockername}:13-3.4-bookworm || true + +echo "manifest: ${dockername}:13-3.4.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.0-bookworm \ + --target ${dockername}:13-3.4.0-bookworm || true + +echo "manifest: ${dockername}:13-3.4" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4 \ + --target ${dockername}:13-3.4 || true + +# ----- 13-3.4-bullseye ----- + +echo "manifest: ${dockername}:13-3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ + --target ${dockername}:13-3.4-bullseye || true + +echo "manifest: ${dockername}:13-3.4.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.0-bullseye \ + --target ${dockername}:13-3.4.0-bullseye || true + +# ----- 13-3.4-bundle-bookworm ----- + +echo "manifest: ${dockername}:13-3.4-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-bundle-bookworm \ + --target ${dockername}:13-3.4-bundle-bookworm || true + +echo "manifest: ${dockername}:13-3.4.0-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.0-bundle-bookworm \ + --target ${dockername}:13-3.4.0-bundle-bookworm || true + +echo "manifest: ${dockername}:13-3.4-bundle" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-bundle \ + --target ${dockername}:13-3.4-bundle || true + +# ----- 14-3.4-alpine3.18 ----- + +echo "manifest: ${dockername}:14-3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.18 \ + --target ${dockername}:14-3.4-alpine3.18 || true + +echo "manifest: ${dockername}:14-3.4.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.0-alpine3.18 \ + --target ${dockername}:14-3.4.0-alpine3.18 || true + +echo "manifest: ${dockername}:14-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ + --target ${dockername}:14-3.4-alpine || true + +# ----- 14-3.4-bookworm ----- + +echo "manifest: ${dockername}:14-3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ + --target ${dockername}:14-3.4-bookworm || true + +echo "manifest: ${dockername}:14-3.4.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.0-bookworm \ + --target ${dockername}:14-3.4.0-bookworm || true + +echo "manifest: ${dockername}:14-3.4" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4 \ + --target ${dockername}:14-3.4 || true + +# ----- 14-3.4-bullseye ----- + +echo "manifest: ${dockername}:14-3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ + --target ${dockername}:14-3.4-bullseye || true + +echo "manifest: ${dockername}:14-3.4.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.0-bullseye \ + --target ${dockername}:14-3.4.0-bullseye || true + +# ----- 14-3.4-bundle-bookworm ----- + +echo "manifest: ${dockername}:14-3.4-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-bundle-bookworm \ + --target ${dockername}:14-3.4-bundle-bookworm || true + +echo "manifest: ${dockername}:14-3.4.0-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.0-bundle-bookworm \ + --target ${dockername}:14-3.4.0-bundle-bookworm || true + +echo "manifest: ${dockername}:14-3.4-bundle" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-bundle \ + --target ${dockername}:14-3.4-bundle || true + +# ----- 15-3.4-alpine3.18 ----- + +echo "manifest: ${dockername}:15-3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.18 \ + --target ${dockername}:15-3.4-alpine3.18 || true + +echo "manifest: ${dockername}:15-3.4.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.0-alpine3.18 \ + --target ${dockername}:15-3.4.0-alpine3.18 || true + +echo "manifest: ${dockername}:15-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ + --target ${dockername}:15-3.4-alpine || true + +echo "manifest: ${dockername}:alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:alpine \ + --target ${dockername}:alpine || true + +# ----- 15-3.4-bookworm ----- + +echo "manifest: ${dockername}:15-3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ + --target ${dockername}:15-3.4-bookworm || true + +echo "manifest: ${dockername}:15-3.4.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.0-bookworm \ + --target ${dockername}:15-3.4.0-bookworm || true + +echo "manifest: ${dockername}:15-3.4" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4 \ + --target ${dockername}:15-3.4 || true + +echo "manifest: ${dockername}:latest" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:latest \ + --target ${dockername}:latest || true + +# ----- 15-3.4-bullseye ----- + +echo "manifest: ${dockername}:15-3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ + --target ${dockername}:15-3.4-bullseye || true + +echo "manifest: ${dockername}:15-3.4.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.0-bullseye \ + --target ${dockername}:15-3.4.0-bullseye || true + +# ----- 15-3.4-bundle-bookworm ----- + +echo "manifest: ${dockername}:15-3.4-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-bundle-bookworm \ + --target ${dockername}:15-3.4-bundle-bookworm || true + +echo "manifest: ${dockername}:15-3.4.0-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.0-bundle-bookworm \ + --target ${dockername}:15-3.4.0-bundle-bookworm || true + +echo "manifest: ${dockername}:15-3.4-bundle" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-bundle \ + --target ${dockername}:15-3.4-bundle || true + +echo "manifest: ${dockername}:bundle" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:bundle \ + --target ${dockername}:bundle || true + +# ----- 15-master-bookworm ----- + +echo "manifest: ${dockername}:15-master-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-master-bookworm \ + --target ${dockername}:15-master-bookworm || true + +echo "manifest: ${dockername}:15-master" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-master \ + --target ${dockername}:15-master || true + +# ----- 15-recentstack-bookworm ----- + +echo "manifest: ${dockername}:15-recentstack-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-recentstack-bookworm \ + --target ${dockername}:15-recentstack-bookworm || true + +echo "manifest: ${dockername}:15-recentstack" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-recentstack \ + --target ${dockername}:15-recentstack || true + +# ----- 16-3.4-alpine3.18 ----- + +echo "manifest: ${dockername}:16-3.4-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.18 \ + --target ${dockername}:16-3.4-alpine3.18 || true + +echo "manifest: ${dockername}:16-3.4.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.0-alpine3.18 \ + --target ${dockername}:16-3.4.0-alpine3.18 || true + +echo "manifest: ${dockername}:16-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ + --target ${dockername}:16-3.4-alpine || true + +# ----- 16-3.4-bookworm ----- + +echo "manifest: ${dockername}:16-3.4-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ + --target ${dockername}:16-3.4-bookworm || true + +echo "manifest: ${dockername}:16-3.4.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.0-bookworm \ + --target ${dockername}:16-3.4.0-bookworm || true + +echo "manifest: ${dockername}:16-3.4" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4 \ + --target ${dockername}:16-3.4 || true + +# ----- 16-3.4-bullseye ----- + +echo "manifest: ${dockername}:16-3.4-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ + --target ${dockername}:16-3.4-bullseye || true + +echo "manifest: ${dockername}:16-3.4.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.0-bullseye \ + --target ${dockername}:16-3.4.0-bullseye || true + +# ----- 16-3.4-bundle-bookworm ----- + +echo "manifest: ${dockername}:16-3.4-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-bundle-bookworm \ + --target ${dockername}:16-3.4-bundle-bookworm || true + +echo "manifest: ${dockername}:16-3.4.0-bundle-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.0-bundle-bookworm \ + --target ${dockername}:16-3.4.0-bundle-bookworm || true + +echo "manifest: ${dockername}:16-3.4-bundle" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-bundle \ + --target ${dockername}:16-3.4-bundle || true + +# ----- 16-master-bookworm ----- + +echo "manifest: ${dockername}:16-master-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-master-bookworm \ + --target ${dockername}:16-master-bookworm || true + +echo "manifest: ${dockername}:16-master" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-master \ + --target ${dockername}:16-master || true + +# ----- 16-recentstack-bookworm ----- + +echo "manifest: ${dockername}:16-recentstack-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-recentstack-bookworm \ + --target ${dockername}:16-recentstack-bookworm || true + +echo "manifest: ${dockername}:16-recentstack" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-recentstack \ + --target ${dockername}:16-recentstack || true diff --git a/test/postgis-config.sh b/test/postgis-config.sh index 39027796a..d008867ee 100644 --- a/test/postgis-config.sh +++ b/test/postgis-config.sh @@ -1,5 +1,21 @@ -testAlias[postgis/postgis]=postgres +#!/usr/bin/env bash +# shellcheck disable=SC2034,SC2154 -imageTests[postgis/postgis]=' - postgis-basics -' +export REGISTRY="${REGISTRY:-docker.io}" +export REPO_NAME="${REPO_NAME:-postgis}" +export IMAGE_NAME="${IMAGE_NAME:-postgis}" + +echo "Running tests for ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}" + +testAlias["${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}"]=postgres +if [[ ${1} == *bundle* ]]; then + imageTests["${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}"]=' + postgis-basics + postgis-bundle + ' + echo " .. bundle detected ... " +else + imageTests["${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}"]=' + postgis-basics + ' +fi diff --git a/test/tests/postgis-basics/run.sh b/test/tests/postgis-basics/run.sh index d04be5ac1..44473ce1f 100755 --- a/test/tests/postgis-basics/run.sh +++ b/test/tests/postgis-basics/run.sh @@ -1,51 +1,55 @@ #!/bin/bash -set -e +# shellcheck disable=SC2119,SC2120 +set -eo pipefail image="$1" -export POSTGRES_USER='my cool postgres user' -export POSTGRES_PASSWORD='my cool postgres password' -export POSTGRES_DB='my cool postgres database' +export POSTGRES_USER='my cool postgis user' +export POSTGRES_PASSWORD='my cool postgis password' +export POSTGRES_DB='my cool postgis database' cname="postgis-container-$RANDOM-$RANDOM" cid="$(docker run -d -e POSTGRES_USER -e POSTGRES_PASSWORD -e POSTGRES_DB --name "$cname" "$image")" -trap "docker rm -vf $cid > /dev/null" EXIT +trap 'docker rm -vf "$cid" > /dev/null' EXIT psql() { - docker run --rm -i \ - --link "$cname":postgis \ - --entrypoint psql \ - -e PGPASSWORD="$POSTGRES_PASSWORD" \ - "$image" \ - --host postgis \ - --username "$POSTGRES_USER" \ - --dbname "$POSTGRES_DB" \ - --quiet --no-align --tuples-only \ - "$@" + docker run --rm -i \ + --link "$cname":postgis \ + --entrypoint psql \ + -e PGPASSWORD="$POSTGRES_PASSWORD" \ + "$image" \ + --host postgis \ + --username "$POSTGRES_USER" \ + --dbname "$POSTGRES_DB" \ + --quiet --no-align --tuples-only \ + "$@" } -tries=10 -while ! echo 'SELECT 1' | psql &> /dev/null; do - (( tries-- )) - if [ $tries -le 0 ]; then - echo >&2 'postgres failed to accept connections in a reasonable amount of time!' - echo 'SELECT 1' | psql # to hopefully get a useful error message - false - fi - sleep 2 +# Set default values for POSTGRES_TEST_TRIES and POSTGRES_TEST_SLEEP if they are not set. +# You can change the default value of POSTGRES_TEST_TRIES and the POSTGRES_TEST_SLEEP in the CI build settings. +# For special cases like Buildx/qemu tests, you may need to set POSTGRES_TEST_TRIES to 42. +: "${POSTGRES_TEST_TRIES:=15}" +: "${POSTGRES_TEST_SLEEP:=2}" +tries="$POSTGRES_TEST_TRIES" +while ! echo 'SELECT 1' | psql &>/dev/null; do + ((tries--)) + if [ $tries -le 0 ]; then + echo >&2 'postgres failed to accept connections in a reasonable amount of time!' + echo 'SELECT 1' | psql # to hopefully get a useful error message + false + fi + sleep "$POSTGRES_TEST_SLEEP" done echo 'SELECT PostGIS_Version()' | psql [ "$(echo 'SELECT ST_X(ST_Point(0,0))' | psql)" = 0 ] - ## test address_standardizer extension echo 'CREATE EXTENSION address_standardizer;' | psql response=$(echo $'SELECT zip FROM parse_address(\'1 Devonshire Place, Boston, MA 02109-1234\') AS a;' | psql) -if [ $response = 02109 ]; then - echo "address_standardizer extension installed and works!" -else - echo "address_standardizer extension test failed, returned response is $response" - exit 1 +if [ "$response" = "02109" ]; then + echo "address_standardizer extension installed and works!" +else + echo "address_standardizer extension test failed, returned response is $response" + exit 1 fi - diff --git a/test/tests/postgis-bundle/run.sh b/test/tests/postgis-bundle/run.sh new file mode 100755 index 000000000..f39653433 --- /dev/null +++ b/test/tests/postgis-bundle/run.sh @@ -0,0 +1,72 @@ +#!/bin/bash +# shellcheck disable=SC2119,SC2120 +set -eo pipefail + +#for debug: +#set -x + +image="$1" + +export POSTGRES_USER='my cool postgis user' +export POSTGRES_PASSWORD='my cool postgis password' +export POSTGRES_DB='my cool postgis database' + +cname="postgis-container-$RANDOM-$RANDOM" +cid="$(docker run -d -e POSTGRES_USER -e POSTGRES_PASSWORD -e POSTGRES_DB --name "$cname" "$image")" +trap 'docker rm -vf "$cid" > /dev/null' EXIT + +psql() { + docker run --rm -i \ + --link "$cname":postgis \ + --entrypoint psql \ + -e PGPASSWORD="$POSTGRES_PASSWORD" \ + "$image" \ + --host postgis \ + --username "$POSTGRES_USER" \ + --dbname "$POSTGRES_DB" \ + --quiet --no-align --tuples-only \ + "$@" +} + +# Set default values for POSTGRES_TEST_TRIES and POSTGRES_TEST_SLEEP if they are not set. +# You can change the default value of POSTGRES_TEST_TRIES and the POSTGRES_TEST_SLEEP in the CI build settings. +# For special cases like Buildx/qemu tests, you may need to set POSTGRES_TEST_TRIES to 42. +: "${POSTGRES_TEST_TRIES:=15}" +: "${POSTGRES_TEST_SLEEP:=2}" +tries="$POSTGRES_TEST_TRIES" +while ! echo 'SELECT 1' | psql &>/dev/null; do + ((tries--)) + if [ $tries -le 0 ]; then + echo >&2 'postgres failed to accept connections in a reasonable amount of time!' + echo 'SELECT 1' | psql # to hopefully get a useful error message + false + fi + sleep "$POSTGRES_TEST_SLEEP" +done + +## Minimal create extension test +echo " +create extension if not exists asn1oid cascade; +create extension if not exists ddlx cascade; +create extension if not exists gzip cascade; +create extension if not exists h3 cascade; +create extension if not exists h3_postgis cascade; +create extension if not exists hstore_plpython3u cascade; +create extension if not exists http cascade; +create extension if not exists mobilitydb cascade; +create extension if not exists ogr_fdw cascade; +create extension if not exists pg_curl cascade; +create extension if not exists pg_uuidv7 cascade; +create extension if not exists pgrouting cascade; +create extension if not exists pgtap cascade; +create extension if not exists plpython3u cascade; +create extension if not exists prioritize cascade; +create extension if not exists q3c cascade; +create extension if not exists vector cascade; +" | psql + +echo " +SELECT h3_get_extension_version(); +SELECT mobilitydb_full_version(); +SELECT pgr_full_version(); +" | psql diff --git a/tools/environment_init.sh b/tools/environment_init.sh new file mode 100644 index 000000000..a4da29d53 --- /dev/null +++ b/tools/environment_init.sh @@ -0,0 +1,133 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# Check if IMAGE_VERSION_ID is already set +if [ -n "${IMAGE_VERSION_ID:-}" ]; then + # note: Script already ran, exiting early. + return 0 +fi + +# Load .env files config. +set -a +if [[ "${TEST:-}" == "true" ]]; then + # shellcheck disable=SC1091 + source .env.test + echo "TEST MODE!" +else + # shellcheck disable=SC1091 + source .env +fi +set +a + +if [ -z "$REGISTRY" ] || [ -z "$REPO_NAME" ] || [ -z "$IMAGE_NAME" ]; then + echo "Error: REGISTRY,REPO_NAME and IMAGE_NAME must be set" >&2 + exit 1 +fi + +# Determine IMAGE_ARCH based on the machine architecture +if [[ "$(uname -m)" == "x86_64" ]]; then + IMAGE_ARCH=amd64 +elif [[ "$(uname -m)" == "aarch64" ]]; then + IMAGE_ARCH=arm64 +else + echo "Architecture not supported: $(uname -m)" + exit 1 +fi +export IMAGE_ARCH + +# Modify IMAGE_NAME if ENABLE_IMAGE_ARCH is set to true +if [[ "${ENABLE_IMAGE_ARCH:-}" == "true" ]]; then + IMAGE_NAME="${IMAGE_NAME}-${IMAGE_ARCH}" +fi +export IMAGE_NAME + +# Override the default values of variables +# by setting the corresponding environment variables, if needed. +if [[ "$REGISTRY" == "docker.io" ]]; then + dockername="${REPO_NAME}/${IMAGE_NAME}" +else + dockername="${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}" + +fi +export dockername + +# Initialize IMAGE_VERSION_ID as an empty string +IMAGE_VERSION_ID="" +# Generate IMAGE_VERSION_ID if ENABLE_IMAGE_VERSION_ID is set to true +if [[ "${ENABLE_IMAGE_VERSION_ID:-}" == "true" ]]; then + # Note: Make sure to keep this synchronized with the corresponding section in Makefile + COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y%m%d) + COMMIT_HASH=$(git log -1 --pretty=format:%h) + BUILD_WEEK=$(date '+%Yw%U') + IMAGE_VERSION_ID="-ver${COMMIT_DATE}-${COMMIT_HASH}-${BUILD_WEEK}" +fi +export IMAGE_VERSION_ID + +echo " ---- .env file loaded ----" +echo " - REGISTRY : $REGISTRY" +echo " - REPO_NAME : $REPO_NAME" +echo " - IMAGE_NAME : $IMAGE_NAME" +echo " - IMAGE_ARCH : $IMAGE_ARCH" +echo " - dockername : ${dockername}" +echo " - IMAGE_VERSION_ID: ${IMAGE_VERSION_ID}" +echo " " + +# Verify that the required command-line tools (jq, gawk, python3, .. ) are available in the system's PATH. +# Exit with an error message if any of them are missing. +for cmd in docker jq gawk curl python3 manifest-tool lastversion; do + if ! command -v "$cmd" &>/dev/null; then + echo "Error: $cmd is not installed." + exit 1 + fi +done + +# Ensure that the necessary Python modules (yaml, json) are installed and can be imported. +# Exit with an error message if any of them are missing. +if ! python3 -c 'import yaml, json' &>/dev/null; then + echo "Error: Required python3 modules (yaml or json) are not installed." + echo " Please install them using 'pip3 install yaml json'." + exit 1 +fi + +# check_image_exists +# +# Checks if a specific Docker image tag exists in a repository. +# +# Arguments: +# TAG_NAME: The name of the Docker image tag to check. +# +# Globals: +# REPO_NAME: Name of the Docker repository. +# IMAGE_NAME: Name of the Docker image. +# +# Outputs: +# Prints metadata and whether the image exists. +# +# Returns: +# 0: If the Docker image tag exists. +# 1: If the Docker image tag does not exist. +# +# Example: +# if check_image_exists "15-3.4-bundle-bookworm-x2"; then +# echo "Proceeding with next steps..." +# else +# echo "Taking alternative actions..." +# fi +# +function check_image_exists() { + local TAG_NAME="$1" + # Assuming REPO_NAME and IMAGE_NAME are either passed as global variables or defined elsewhere + local EXISTS_RAW + EXISTS_RAW=$(curl -s "https://hub.docker.com/v2/repositories/${REPO_NAME}/${IMAGE_NAME}/tags/${TAG_NAME}/" | jq .) + local EXISTS + EXISTS=$(echo "${EXISTS_RAW}" | jq -r 'select(.name=="'"${TAG_NAME}"'") | .name') + if [[ "$EXISTS" == "$TAG_NAME" ]]; then + echo "Image tag $1 exists." + return 0 # Return true (image exists) + else + echo "Image tag: $1 does not exist." + return 1 # Return false (image does not exist) + fi +} + +export -f check_image_exists diff --git a/update.sh b/update.sh index d7f8f48ee..f13d70456 100755 --- a/update.sh +++ b/update.sh @@ -1,199 +1,28 @@ -#!/bin/bash -# Derived from https://github.com/docker-library/postgres/blob/master/update.sh +#!/usr/bin/env bash set -Eeuo pipefail +# Source environment variables and necessary configurations +source tools/environment_init.sh -cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" +# This code derived from: +# - URL: https://github.com/docker-library/postgres/blob/master/versions.sh +# - Copyright: (c) Docker PostgreSQL Authors +# - MIT License, https://github.com/docker-library/postgres/blob/master/LICENSE -versions=( "$@" ) -if [ ${#versions[@]} -eq 0 ]; then - versions=( */Dockerfile ) -fi -versions=( "${versions[@]%/Dockerfile}" ) +cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -for optimized in debian alpine test; do - rm -f _dockerlists_${optimized}.md - echo " " > _dockerlists_${optimized}.md - echo "| DockerHub image | Dockerfile | OS | Postgres | PostGIS |" >> _dockerlists_${optimized}.md - echo "| --------------- | ---------- | -- | -------- | ------- |" >> _dockerlists_${optimized}.md -done - -autogenerated='NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.' - -dockerhublink="https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=" -githubrepolink="https://github.com/postgis/docker-postgis/blob/master" - -# sort version numbers with highest last (so it goes first in .travis.yml) -IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS - -defaultAlpinenSuite='3.18' -defaultDebianSuite='bullseye-slim' -declare -A debianSuite=( - # https://github.com/docker-library/postgres/issues/582 - [11]='bullseye-slim' - [12]='bullseye-slim' - [13]='bullseye-slim' - [14]='bullseye-slim' - [15]='bullseye-slim' - [16]='bullseye-slim' -) - -defaultPostgisDebPkgNameVersionSuffix='3' -declare -A postgisDebPkgNameVersionSuffixes=( - [3.0]='3' - [3.1]='3' - [3.2]='3' - [3.3]='3' - [3.4]='3' -) - -packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' - -cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" -sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')" -projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" -gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" -geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')" -postgisGitHash="$(git ls-remote https://github.com/postgis/postgis.git heads/master | awk '{ print $1}')" - -declare -A suitePackageList=() suiteArches=() -for version in "${versions[@]}"; do - IFS=- read postgresVersion postgisVersion <<< "$version" - - echo " " - echo "---- generate Dockerfile for $version ----" - echo "postgresVersion=$postgresVersion" - echo "postgisVersion=$postgisVersion" - - if [ "2.5" == "$postgisVersion" ]; then - # posgis 2.5 only in the stretch ; no bullseye version - tag='stretch-slim' - else - tag="${debianSuite[$postgresVersion]:-$defaultDebianSuite}" - fi - suite="${tag%%-slim}" - - if [ -z "${suitePackageList["$suite"]:+isset}" ]; then - suitePackageList["$suite"]="$(curl -fsSL "${packagesBase}/${suite}-pgdg/main/binary-amd64/Packages.bz2" | bunzip2)" - fi - if [ -z "${suiteArches["$suite"]:+isset}" ]; then - suiteArches["$suite"]="$(curl -fsSL "${packagesBase}/${suite}-pgdg/Release" | awk -F ':[[:space:]]+' '$1 == "Architectures" { gsub(/[[:space:]]+/, "|", $2); print $2 }')" - fi - - postgresVersionMain="$(echo "$postgresVersion" | awk -F 'alpha|beta|rc' '{print $1}')" - versionList="$(echo "${suitePackageList["$suite"]}"; curl -fsSL "${packagesBase}/${suite}-pgdg/${postgresVersionMain}/binary-amd64/Packages.bz2" | bunzip2)" - fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$postgresVersionMain"'" { print $2; exit }' || true)" - - if [ "$suite" = "bullseye" ]; then - boostVersion="1.74.0" - else - echo "Unknown debian version; stop" - exit 1 - fi - - - optimized="" - if [[ "$version" =~ "alpha" || "$version" =~ "beta" || "$version" =~ "rc" || "$version" =~ "master" ]]; - then - optimized="test" - else - optimized="debian" - fi - echo "optimized=$optimized" - - debianPostgisMajMin="" - if [ "master" == "$postgisVersion" ]; then - postgisPackageName="" - postgisFullVersion="$postgisVersion" - postgisMajor="" - postgisDocSrc="development: postgis, geos, proj, gdal" - else - postgisMajMin="$( echo "${postgisVersion}" | cut -d. -f1 ).$( echo "${postgisVersion}" | cut -d. -f2 )" - echo "postgisMajMin=${postgisMajMin}" - - postgisPackageName="postgresql-${postgresVersionMain}-postgis-${postgisDebPkgNameVersionSuffixes[${postgisMajMin}]}" - postgisFullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "'"$postgisPackageName"'" { print $2; exit }' || true)" - echo "postgisPackageName=${postgisPackageName}" - echo "postgisFullVersion=${postgisFullVersion}" - - debianPostgisMajMin="$( echo "${postgisFullVersion}" | cut -d. -f1 ).$( echo "${postgisFullVersion}" | cut -d. -f2 )" - - if [ "$debianPostgisMajMin" == "$postgisMajMin" ]; then - echo "debian postgis version is OK " - postgisMajor="${postgisDebPkgNameVersionSuffixes[${postgisMajMin}]}" - postgisDocSrc="${postgisFullVersion%%+*}" - else - echo "debian postgis is not updated, different .. " - postgisFullVersion="" - postgisMajor="" - postgisDocSrc="" - fi - fi - - if [ -z "$postgisFullVersion" ] - then - echo "SKIP debian version"; - # debain version not found; - echo " # placeholder Dockerfile" > "$version/Dockerfile" - echo " # Debian version of postgis $postgisFullVersion is not detected!">> "$version/Dockerfile" - echo " # This is an autogenerated message of ./update.sh " >> "$version/Dockerfile" - rm -f "$version/*.sh" - rm -f "$version/*.md" - # use the default for the alpine version - postgisFullVersion=$postgisVersion - postgisDocSrc=$postgisVersion - else - ( - set -x - cp -p initdb-postgis.sh update-postgis.sh "$version/" - if [ "master" == "$postgisVersion" ]; then - cat Dockerfile.master.template > "$version/Dockerfile" - else - cat Dockerfile.template > "$version/Dockerfile" - fi - sed -i 's/%%TXT_AUTOGENERATED%%/'"$autogenerated"'/g; s/%%PG_MAJOR%%/'$postgresVersion'/g; s/%%POSTGIS_MAJOR%%/'$postgisMajor'/g; s/%%POSTGIS_VERSION%%/'$postgisFullVersion'/g; s/%%POSTGIS_GIT_HASH%%/'$postgisGitHash'/g; s/%%CGAL5X_GIT_HASH%%/'$cgal5XGitHash'/g; s/%%SFCGAL_GIT_HASH%%/'$sfcgalGitHash'/g; s/%%PROJ_GIT_HASH%%/'$projGitHash'/g; s/%%GDAL_GIT_HASH%%/'$gdalGitHash'/g; s/%%GEOS_GIT_HASH%%/'$geosGitHash'/g; s/%%BOOST_VERSION%%/'"$boostVersion"'/g; s/%%DEBIAN_VERSION%%/'"$suite"'/g;' "$version/Dockerfile" - - echo "| [postgis/postgis:${version}](${dockerhublink}${version}) | [Dockerfile](${githubrepolink}/${version}/Dockerfile) | debian:${suite} | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md - ) - fi +echo " " - if [ "master" == "$postgisVersion" ]; then - srcVersion="" - srcSha256="" - else - srcVersion="${postgisFullVersion%%+*}" - srcSha256="$(curl -sSL "https://github.com/postgis/postgis/archive/$srcVersion.tar.gz" | sha256sum | awk '{ print $1 }')" - fi - for variant in alpine; do - if [ ! -d "$version/$variant" ]; then - continue - fi - ( - set -x - if [ "$optimized" != "test" ]; then - optimized="alpine" - fi - cp -p Dockerfile.alpine.template initdb-postgis.sh update-postgis.sh "$version/$variant/" - mv "$version/$variant/Dockerfile.alpine.template" "$version/$variant/Dockerfile" - sed -i 's/%%TXT_AUTOGENERATED%%/'"$autogenerated"'/g; s/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$srcVersion"'/g; s/%%POSTGIS_SHA256%%/'"$srcSha256"'/g' "$version/$variant/Dockerfile" +# Generate versions.json metadata file +./versions.sh "$@" - echo "| [postgis/postgis:${version}-${variant}](${dockerhublink}${version}-${variant}) | [Dockerfile](${githubrepolink}/${version}/${variant}/Dockerfile) | alpine:${defaultAlpinenSuite} | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md - ) - done -done +# apply version.json - generate Dockerfiles +./apply-templates.sh "$@" -echo "|-------------------------|" -echo "|- Generated images -|" -echo "|-------------------------|" +# apply version.json - generate .github/workflows/main.yml and .circleci/config.yml +./apply-ci.sh "$@" -for optimized in debian alpine test; do - echo " " - echo "---- ${optimized} ----" - cat _dockerlists_${optimized}.md -done +# apply version.json - generate manifest.sh +./apply-manifest.sh "$@" -echo " " -echo "Postprocessing todo:" -echo "- add the new versions to README.md ( manually )" -ls -la _dockerlists_*.md -echo " " -echo " - done - " +# apply version.json - generate README.md +./apply-readme.sh "$@" diff --git a/versions.json b/versions.json new file mode 100644 index 000000000..a3353f1dd --- /dev/null +++ b/versions.json @@ -0,0 +1,404 @@ +{ + "11-3.3": { + "bullseye": { + "tags": "11-3.3-bullseye 11-3.3.4-bullseye", + "postgis": "3.3", + "readme_group": "bullseye", + "PG_MAJOR": "11", + "PG_DOCKER": "11", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.3.4+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", + "postgis": "3.3", + "readme_group": "bookworm", + "PG_MAJOR": "11", + "PG_DOCKER": "11", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.3.4+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "11", + "PG_DOCKER": "11", + "POSTGIS_VERSION": "3.3.4", + "POSTGIS_SHA256": "68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e", + "POSTGIS_CHECKOUT": "tags/3.3.4", + "POSTGIS_CHECKOUT_SHA1": "846cce0c6420a3d0483d2a1a3baee182d2fc1217" + } + }, + "12-3.4": { + "bullseye": { + "tags": "12-3.4-bullseye 12-3.4.0-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", + "postgis": "3.4", + "readme_group": "bookworm", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine", + "readme_group": "alpine3.18", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.4.0", + "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + } + }, + "13-3.4": { + "bullseye": { + "tags": "13-3.4-bullseye 13-3.4.0-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", + "postgis": "3.4", + "readme_group": "bookworm", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine", + "readme_group": "alpine3.18", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.4.0", + "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + } + }, + "13-3.4-bundle": { + "bookworm": { + "tags": "13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle", + "postgis": "3.4", + "readme_group": "bundle", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", + "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", + "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.12.0", + "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + } + }, + "14-3.4": { + "bullseye": { + "tags": "14-3.4-bullseye 14-3.4.0-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", + "postgis": "3.4", + "readme_group": "bookworm", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", + "readme_group": "alpine3.18", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.4.0", + "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + } + }, + "14-3.4-bundle": { + "bookworm": { + "tags": "14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle", + "postgis": "3.4", + "readme_group": "bundle", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", + "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", + "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.12.0", + "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + } + }, + "15-3.4": { + "bullseye": { + "tags": "15-3.4-bullseye 15-3.4.0-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", + "postgis": "3.4", + "readme_group": "bookworm", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", + "readme_group": "alpine3.18", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.4.0", + "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + } + }, + "15-3.4-bundle": { + "bookworm": { + "tags": "15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle", + "postgis": "3.4", + "readme_group": "bundle", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", + "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", + "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.12.0", + "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + } + }, + "15-master": { + "bookworm": { + "tags": "15-master-bookworm 15-master", + "postgis": "master", + "readme_group": "test", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "POSTGIS_CHECKOUT": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "POSTGIS_CHECKOUT_SHA1": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", + "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", + "SFCGAL_CHECKOUT": "35f72d2f52b4253013201b170467757b0fc355e5", + "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", + "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", + "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", + "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", + "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", + "BOOST_VERSION": "1.74.0" + } + }, + "15-recentstack": { + "bookworm": { + "tags": "15-recentstack-bookworm 15-recentstack", + "postgis": "recentstack", + "readme_group": "recentstack", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", + "PROJ_CHECKOUT": "tags/9.3.0", + "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", + "GDAL_CHECKOUT": "tags/v3.7.2", + "GDAL_CHECKOUT_SHA1": "f74cd4144199fd7667e5c151a251cdbad1f44641", + "GEOS_CHECKOUT": "tags/3.12.0", + "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "SFCGAL_CHECKOUT": "tags/v1.4.1", + "SFCGAL_CHECKOUT_SHA1": "2d6a1a89552f14fe2926038b7237686bb9e5472e", + "CGAL_CHECKOUT": "tags/v5.6", + "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", + "BOOST_VERSION": "1.74.0" + } + }, + "16-3.4": { + "bullseye": { + "tags": "16-3.4-bullseye 16-3.4.0-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", + "postgis": "3.4", + "readme_group": "bookworm", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + }, + "alpine3.18": { + "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", + "readme_group": "alpine3.18", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "POSTGIS_VERSION": "3.4.0", + "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + } + }, + "16-3.4-bundle": { + "bookworm": { + "tags": "16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle", + "postgis": "3.4", + "readme_group": "bundle", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", + "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", + "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.12.0", + "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + } + }, + "16-master": { + "bookworm": { + "tags": "16-master-bookworm 16-master", + "postgis": "master", + "readme_group": "test", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "POSTGIS_CHECKOUT": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "POSTGIS_CHECKOUT_SHA1": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", + "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", + "SFCGAL_CHECKOUT": "35f72d2f52b4253013201b170467757b0fc355e5", + "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", + "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", + "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", + "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", + "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", + "BOOST_VERSION": "1.74.0" + } + }, + "16-recentstack": { + "bookworm": { + "tags": "16-recentstack-bookworm 16-recentstack", + "postgis": "recentstack", + "readme_group": "recentstack", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "POSTGIS_CHECKOUT": "tags/3.4.0", + "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", + "PROJ_CHECKOUT": "tags/9.3.0", + "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", + "GDAL_CHECKOUT": "tags/v3.7.2", + "GDAL_CHECKOUT_SHA1": "f74cd4144199fd7667e5c151a251cdbad1f44641", + "GEOS_CHECKOUT": "tags/3.12.0", + "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "SFCGAL_CHECKOUT": "tags/v1.4.1", + "SFCGAL_CHECKOUT_SHA1": "2d6a1a89552f14fe2926038b7237686bb9e5472e", + "CGAL_CHECKOUT": "tags/v5.6", + "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", + "BOOST_VERSION": "1.74.0" + } + } +} diff --git a/versions.sh b/versions.sh new file mode 100755 index 000000000..1f88cf6f0 --- /dev/null +++ b/versions.sh @@ -0,0 +1,613 @@ +#!/bin/bash +set -Eeuo pipefail + +# Source environment variables and necessary configurations +source tools/environment_init.sh + +# This code derived from: +# - URL: https://github.com/docker-library/postgres/blob/master/versions.sh +# - Copyright: (c) Docker PostgreSQL Authors +# - MIT License, https://github.com/docker-library/postgres/blob/master/LICENSE + +# --debug +# set -xv ; exec 1> >(tee "./update.log") 2>&1 + +# ---------- Setups --------- +api_preference="github" +#api_preference="osgeo" -- not working yet + +alpine_variants=" alpine3.18 " +debian_variants=" bullseye bookworm " + +debian_latest="bookworm" +alpine_latest="alpine3.18" +postgis_latest="3.4" +postgres_latest="15" +postgis_versions="3.0 3.1 3.2 3.3 3.4" +postgres_versions="11 12 13 14 15 16" + +declare -A postgisDebPkgNameVersionSuffixes=( + [3.0]='3' + [3.1]='3' + [3.2]='3' + [3.3]='3' + [3.4]='3' +) + +declare -A boostVersion=( + ["bullseye"]="1.74.0" + ["bookworm"]="1.74.0" # 1.81.0 is not yet optimal. The current bookworm packages mixed use of 1.74.0 and 1.81.0 + ["alpine3.17"]="1.80.0" + ["alpine3.18"]="1.82.0" +) + +# function get_tag_hash() { +# hash_value=$(get_tag_hash "https://github.com/postgis/postgis.git" "3.4.0") +# echo $hash_value +function get_tag_hash() { + local repo="$1" + local version="$2" + + git ls-remote --sort="v:refname" "$repo" refs/tags/"$version"* | + grep -E 'refs/tags/'"$version"'(\^\{\})?$' | + tail -n1 | + awk '{print $1}' +} + +# Convert YAML input to pretty-printed JSON format. +function yaml2json_pretty { + python3 -c 'import sys, yaml, json; print(json.dumps(yaml.safe_load(sys.stdin.read()), indent=2, sort_keys=False))' +} + +# Correct version sorting +function version_reverse_sort() { + # This function sorts version numbers in reverse order, + # ensuring that versions without pre-release tags (e.g., "3.4.0") + # are ranked higher than those with pre-release tags (e.g., "3.4.0rc4"). + # It adds a ".9991" suffix to versions without pre-release tags, + # sorts them with `sort -Vr`, and then removes the ".9991" suffix. + sed -r "s/([0-9]+\.[0-9]+\.[0-9]+$)/\1\.9991/" | sort -Vr | sed s/\.9991$// +} + +# fetch available postgres docker versions from the docker hub +function fetch_postgres_docker_versions() { + + echo " " + echo "Fetching available PostgreSQL Docker image versions from Docker Hub. ( https://registry.hub.docker.com )" + + local PAGE_SIZE=100 + local page=1 + postgres_all_docker_versions="" + while true; do + local response + response=$(curl --silent "https://registry.hub.docker.com/v2/repositories/library/postgres/tags?page=${page}&page_size=${PAGE_SIZE}") || { + echo "Failed to fetch from registry.hub.docker.com" + return 1 + } + + # Extract tag names from the JSON response + local tags + tags=$(echo "$response" | grep -Po '"name":\s*"\K[^"]+' || true) + local count + count=$(echo "$tags" | sed '/^$/d' | wc -l) + if ((count == 0)); then + break + fi + if ((page > 40)); then + echo "(docker api) Too many pages: ${page} - exiting; unexpected and something is wrong!" + exit 1 + fi + postgres_all_docker_versions+=$'\n'"$tags" + ((page++)) + done +} + +fetch_postgres_docker_versions || { + echo "Error fetching Docker postgres versions! Maybe network or server error!" + exit 1 +} + +# Postgres versions , keep only 1* versions; +postgres_all_docker_versions=$(echo "$postgres_all_docker_versions" | grep '^1' | cut -d'-' -f1 | sort -u | version_reverse_sort) +postgres_all_docker_versions_string=$(echo "$postgres_all_docker_versions" | tr '\n' ' ') +echo "postgres_all_docker_versions_string = ${postgres_all_docker_versions_string}" +echo " " + +declare -A postgresLastTags=() +declare -A postgresLastMainTags=() +for variant in ${postgres_versions}; do + postgresLastTags[$variant]=$(echo "$postgres_all_docker_versions" | grep "^${variant}" | version_reverse_sort | head -n 1 || true) + postgresLastMainTags[$variant]=$(echo "${postgresLastTags[$variant]}" | cut -d'.' -f1) + echo "postgresLastTags[$variant] = ${postgresLastTags[$variant]}" + echo "postgresLastMainTags[$variant] = ${postgresLastMainTags[$variant]}" +done +echo " " + +# Check if the github api is limited <= 8 requests; if so, do not continue +if [ "$api_preference" == "github" ]; then + rateLimitRemaining=$(curl -iks https://api.github.com/users/postgis 2>&1 | grep -im1 'X-Ratelimit-Remaining:' | grep -o '[[:digit:]]*') + echo "github rateLimitRemaining = ${rateLimitRemaining}" + echo " " + if [ "${rateLimitRemaining}" -le 8 ]; then + echo + echo " You do not have enough github requests available to continue!" + echo + echo " Without logging - the github api is limited to 60 requests per hour" + echo " see: https://developer.github.com/v3/#rate-limiting " + echo " You can check your remaining requests with :" + echo " curl -sI https://api.github.com/users/postgis | grep x-ratelimit " + echo + exit 1 + fi +fi + +packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' +cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" +sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')" +projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" +gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" +geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')" +postgisGitHash="$(git ls-remote https://github.com/postgis/postgis.git heads/master | awk '{ print $1}')" + +# Function to get the latest version tag and its SHA1 hash +get_latest_version_and_hash() { + # Argument 1: Repository URL + local repo_url=$1 + # Argument 2: Repository identifier + local repo_id=$2 + echo "[+] Checking lastversion : $repo_id - $repo_url" + # Fetch the latest version tag using the lastversion command + eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")" + + # Intermediary step to resolve the variable name + local var_name="lastversion_${repo_id}" + local last_version=${!var_name} + + # Fetch the SHA1 hash of the tag using the get_tag_hash function + eval "lastversion_${repo_id}_sha1=$(get_tag_hash "${repo_url}" "${last_version}")" + + #creating new variables for using later .. + echo " lastversion_${repo_id} = ${last_version}" + + local sha1_var_name="lastversion_${repo_id}_sha1" + local sha1_value=${!sha1_var_name} + echo " lastversion_${repo_id}_sha1 = ${sha1_value}" + echo " " +} + +get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" +get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" + +get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" +get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" +get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" +get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" +get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" +get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal" + +#------------------------------------------- + +function fetch_postgis_versions() { + # get all postgis versions from github + local REPO="postgis/postgis" + local PER_PAGE=100 # You can ask for up to 100 results per page + local page=1 + postgis_all_v3_versions="" + + while true; do + local response + if [ "$api_preference" == "github" ]; then + response=$(curl --silent "https://api.github.com/repos/$REPO/tags?per_page=$PER_PAGE&page=$page") || { + echo "Failed to fetch postgis_versions from api.github.com/repos/$REPO/tags" + return 1 + } + elif [ "$api_preference" == "osgeo" ]; then + response=$(curl --silent "https://git.osgeo.org/gitea/api/v1/repos/${REPO}/tags?page=$page&limit=$PER_PAGE") || { + echo "Failed to fetch postgis_versions from git.osgeo.org/gitea/api/v1/repos/${REPO}/tags" + return 1 + } + fi + + # Check for rate limit exceeded error - related to api.github.com + if echo "$response" | grep -q "API rate limit exceeded"; then + echo "Error: API rate limit exceeded!" + echo "$response" + exit 1 + fi + + # Extract tag names from the JSON response + local tags + tags=$(echo "$response" | grep -Po '"name":\s*"\K[^"]+' || true) + local count + count=$(echo "$tags" | sed '/^$/d' | wc -l) + + if ((count == 0)); then + break + fi + + if ((page > 12)); then + echo "Too many pages: ${page} - exiting; unexpected and something is wrong!" + exit 1 + fi + + postgis_all_v3_versions+=" $tags" + + ((page++)) + done +} + +fetch_postgis_versions || { + echo "Error fetching postgis versions! Maybe network or server error!" + exit 1 +} + +# Keep 3.* versions only +postgis_all_v3_versions=$(echo "$postgis_all_v3_versions" | sed '/^$/d' | grep '^3\.' | version_reverse_sort) +postgis_all_v3_versions_array_string=$(echo "$postgis_all_v3_versions" | tr '\n' ' ') +echo "postgis_all_v3_versions_array_string = ${postgis_all_v3_versions_array_string}" +echo " " + +declare -A postgisLastTags=() +declare -A postgisLastDockerTags=() +declare -A postgisSrcSha256=() +declare -A postgisSrcSha1=() +for variant in ${postgis_versions}; do + _postgisMinor=$(echo "$variant" | cut -d. -f2) + postgisLastTags[$variant]=$(echo "$postgis_all_v3_versions" | grep "^3\.${_postgisMinor}\." | version_reverse_sort | head -n 1 || true) + + if [[ ${postgisLastTags[$variant]} =~ [a-zA-Z] ]]; then + postgisLastDockerTags[$variant]=${postgisLastTags[$variant]} + else + postgisLastDockerTags[$variant]=$(echo "${postgisLastTags[$variant]}" | cut -d'.' -f1,2) + fi + echo "postgisLastDockerTags[$variant] = ${postgisLastDockerTags[$variant]}" + echo "postgisLastTags[$variant] = ${postgisLastTags[$variant]}" + + if [ "${postgisLastTags[$variant]}" == "" ]; then + postgisSrcSha256[$variant]="" + postgisSrcSha1[$variant]="" + else + if [ "$api_preference" == "github" ]; then + postgisSrcSha256[$variant]="$(curl -sSL "https://github.com/postgis/postgis/archive/${postgisLastTags[$variant]}.tar.gz" | sha256sum | awk '{ print $1 }')" + postgisSrcSha1[$variant]=$(get_tag_hash https://github.com/postgis/postgis.git "${postgisLastTags[$variant]}") + elif [ "$api_preference" == "osgeo" ]; then + postgisSrcSha256[$variant]="$(curl -sSL "https://git.osgeo.org/gitea/postgis/postgis/archive/${postgisLastTags[$variant]}.tar.gz" | sha256sum | awk '{ print $1 }')" + fi + fi + echo "postgisSrcSha256[$variant]=${postgisSrcSha256[$variant]}" + echo "postgisSrcSha1[$variant]=${postgisSrcSha1[$variant]}" +done + +cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +versions=("$@") +if [ ${#versions[@]} -eq 0 ]; then + versions=() + for variant in $alpine_variants $debian_variants; do + for path in */"${variant}"/Dockerfile; do + if [[ -f $path ]]; then + versions+=("$path") + fi + done + done + mapfile -t versions < <(printf '%s\n' "${versions[@]}" | cut -d'/' -f1 | sort -u -V) +fi + +echo " " +echo "versions= ${versions[*]}" + +declare -A suitePackageList=() +declare -A suiteArches=() +declare -A fullVersion=() +declare -A debianPostgisMajMin=() +declare -A postgisMajMin=() +declare -A postgisPackageName=() +declare -A postgisFullVersion=() +declare -A postgisMajor=() +declare -A postgisDocSrc=() + +rm -f _versions.yml + +for version in "${versions[@]}"; do + IFS=- read -r postgresVersion postgisVersion bundleType <<<"$version" + + echo " " + echo "---- generate Dockerfile for $version ----" + echo "postgresVersion=$postgresVersion" + echo "postgisVersion=$postgisVersion" + echo "bundleType=$bundleType" + if [ -z "$bundleType" ]; then + echo " ---> bundleType is empty" + else + echo " ---> bundleType is $bundleType" + fi + echo " " + + if [[ "master" == "$postgisVersion" || "recentstack" == "$postgisVersion" ]]; then + srcVersion="" + srcSha256="" + srcSha1="" + else + if [[ -v "postgisLastTags[${postgisVersion}]" ]]; then + echo ":: postgisLastTags[${postgisVersion}] exists in the array." + srcVersion="${postgisLastTags[${postgisVersion}]}" + srcSha256="${postgisSrcSha256[${postgisVersion}]}" + srcSha1="${postgisSrcSha1[${postgisVersion}]}" + elif [[ " $postgis_all_v3_versions_array_string " == *" $postgisVersion "* ]]; then + echo "!!!! ${postgisVersion} exists in postgis_all_v3_versions_array_string." + srcVersion=${postgisVersion} + srcSha256="$(curl -sSL "https://github.com/postgis/postgis/archive/${postgisVersion}.tar.gz" | sha256sum | awk '{ print $1 }')" + srcSha1=$(git ls-remote https://github.com/postgis/postgis.git refs/tags/"${postgisVersion}" | awk '{print $1}') + #srcSha256="$(curl -sSL "https://git.osgeo.org/gitea/postgis/postgis/archive/${postgisVersion}.tar.gz" | sha256sum | awk '{ print $1 }')" + else + echo "Unknown $postgisVersion version, please check the postgis_all_v3_versions array!" + exit 1 + fi + fi + echo srcVersion="$srcVersion" + echo srcSha256="$srcSha256" + echo srcSha1="$srcSha1" + + # Check current status of postgis debian packages + for suite in $debian_variants; do + if [ -z "${suitePackageList["$suite"]:+isset}" ]; then + suitePackageList["$suite"]="$(curl -fsSL "${packagesBase}/${suite}-pgdg/main/binary-amd64/Packages.bz2" | bunzip2)" + fi + if [ -z "${suiteArches["$suite"]:+isset}" ]; then + suiteArches["$suite"]="$(curl -fsSL "${packagesBase}/${suite}-pgdg/Release" | awk -F ':[[:space:]]+' '$1 == "Architectures" { gsub(/[[:space:]]+/, "|", $2); print $2 }')" + echo "suiteArches[$suite] = ${suiteArches[$suite]}" + fi + + postgresVersionMain="$(echo "$postgresVersion" | awk -F 'alpha|beta|rc' '{print $1}')" + versionList="$( + echo "${suitePackageList["$suite"]}" + curl -fsSL "${packagesBase}/${suite}-pgdg/${postgresVersionMain}/binary-amd64/Packages.bz2" | bunzip2 + )" + fullVersion["$suite"]="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$postgresVersionMain"'" { print $2; exit }' || true)" + echo "fullVersion[$suite] = ${fullVersion[$suite]}" + + debianPostgisMajMin["$suite"]="" + if [ "master" == "$postgisVersion" ]; then + debianPostgisMajMin["$suite"]="" + postgisPackageName["$suite"]="" + postgisFullVersion["$suite"]="$postgisVersion" + postgisMajor["$suite"]="" + postgisDocSrc["$suite"]="development: postgis, geos, proj, gdal" + elif [ "recentstack" == "$postgisVersion" ]; then + #TODO + debianPostgisMajMin["$suite"]="" + postgisPackageName["$suite"]="" + postgisFullVersion["$suite"]="$postgisVersion" + postgisMajor["$suite"]="" + postgisDocSrc["$suite"]="... recentstack ... " + else + postgisMajMin["$suite"]="$(echo "${postgisVersion}" | cut -d. -f1).$(echo "${postgisVersion}" | cut -d. -f2)" + echo "postgisMajMin[$suite]= ${postgisMajMin[${suite}]}" + + postgisPackageName["$suite"]="postgresql-${postgresVersionMain}-postgis-${postgisDebPkgNameVersionSuffixes[${postgisMajMin[${suite}]}]}" + postgisFullVersion["$suite"]="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "'"${postgisPackageName[${suite}]}"'" { print $2; exit }' || true)" + echo "postgisPackageName[$suite]= ${postgisPackageName[$suite]}" + echo "postgisFullVersion[$suite]= ${postgisFullVersion[$suite]}" + + debianPostgisMajMin["$suite"]="$(echo "${postgisFullVersion["$suite"]}" | cut -d. -f1).$(echo "${postgisFullVersion["$suite"]}" | cut -d. -f2)" + + if [ "${debianPostgisMajMin[${suite}]}" == "${postgisMajMin[${suite}]}" ]; then + echo "debian[$suite] : postgis version is OK !" + postgisMajor["$suite"]="${postgisDebPkgNameVersionSuffixes[${postgisMajMin[${suite}]}]}" + postgisDocSrc["$suite"]="${postgisFullVersion[${suite}]%%+*}" + else + echo "debian[$suite] : postgis is not updated, different ! " + postgisFullVersion["$suite"]="" + postgisMajor["$suite"]="" + postgisDocSrc["$suite"]="" + fi + fi + done + + printf "'%s':\n" "$version" >>_versions.yml + #generate debian versions + for variant in $debian_variants; do + if [ -d "$version/$variant" ] && [[ "${postgisDocSrc[$variant]}" == "" ]]; then + ( + echo " " + echo "$version/$variant - debian[$variant] : postgis is not updated/exists - skip and clean the directory! " + # remove all files in the directory ! + rm -rf "${version:?}/${variant:?}/*" + ) + elif [ -d "$version/$variant" ]; then + ( + echo " " + echo "---- $version/$variant --- " + + if [[ "master" == "$postgisVersion" ]]; then + postgisDockerTag="master" + elif [[ "recentstack" == "$postgisVersion" ]]; then + postgisDockerTag="recentstack" + else + postgisDockerTag="${postgisLastDockerTags[$postgisVersion]}" + fi + + bundleTypeTags="" + mainTags="${postgresLastMainTags[$postgresVersion]}-${postgisDockerTag}" + if [ -n "$bundleType" ]; then + readme_group="$bundleType" + bundleTypeTags="-${bundleType}" + elif [[ "recentstack" == "$postgisVersion" ]]; then + readme_group="recentstack" + elif [[ ${mainTags} =~ [a-zA-Z] ]]; then + readme_group="test" + else + readme_group=$variant + fi + + tags="${mainTags}${bundleTypeTags}-${variant}" + if [[ "master" != "$postgisVersion" && "recentstack" != "$postgisVersion" && "${postgisDocSrc[$variant]}" != "${postgisDockerTag}" ]]; then + tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisDocSrc[$variant]}${bundleTypeTags}-${variant}" + fi + if [[ "$variant" == "$debian_latest" ]]; then + tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisDockerTag}${bundleTypeTags}" + if [[ "${postgis_latest}" == "${postgisDockerTag}" && "${postgres_latest}" == "${postgresLastMainTags[$postgresVersion]}" ]]; then + + if [ -n "$bundleType" ]; then + tags+=" $bundleType" + else + tags+=" latest" + fi + + fi + fi + + { + printf " '%s':\n" "$variant" + printf " tags: '%s'\n" "$tags" + printf " postgis: '%s'\n" "${postgisDockerTag}" + printf " readme_group: '%s'\n" "$readme_group" + printf " PG_MAJOR: '%s'\n" "$postgresVersion" + printf " PG_DOCKER: '%s'\n" "${postgresLastMainTags[$postgresVersion]}" + } >>_versions.yml + + if [[ "master" == "$postgisVersion" ]]; then + { + printf " arch: '%s'\n" "amd64 arm64" + printf " template: '%s'\n" "Dockerfile.master.template" + + printf " POSTGIS_CHECKOUT: '%s'\n" "$postgisGitHash" + printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$postgisGitHash" + printf " CGAL_CHECKOUT: '%s'\n" "$cgal5XGitHash" + printf " CGAL_CHECKOUT_SHA1: '%s'\n" "$cgal5XGitHash" + printf " SFCGAL_CHECKOUT: '%s'\n" "$sfcgalGitHash" + printf " SFCGAL_CHECKOUT_SHA1: '%s'\n" "$sfcgalGitHash" + printf " PROJ_CHECKOUT: '%s'\n" "$projGitHash" + printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$projGitHash" + printf " GDAL_CHECKOUT: '%s'\n" "$gdalGitHash" + printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$gdalGitHash" + printf " GEOS_CHECKOUT: '%s'\n" "$geosGitHash" + printf " GEOS_CHECKOUT_SHA1: '%s'\n" "$geosGitHash" + + printf " BOOST_VERSION: '%s'\n" "${boostVersion[$variant]}" + } >>_versions.yml + + elif [[ "recentstack" == "$postgisVersion" ]]; then + { + printf " arch: '%s'\n" "amd64 arm64" + printf " template: '%s'\n" "Dockerfile.master.template" + + printf " POSTGIS_CHECKOUT: 'tags/%s'\n" "$lastversion_postgis" + printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$lastversion_postgis_sha1" + printf " PROJ_CHECKOUT: 'tags/%s'\n" "$lastversion_proj" + printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$lastversion_proj_sha1" + printf " GDAL_CHECKOUT: 'tags/%s'\n" "$lastversion_gdal" + printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$lastversion_gdal_sha1" + printf " GEOS_CHECKOUT: 'tags/%s'\n" "$lastversion_geos" + printf " GEOS_CHECKOUT_SHA1: '%s'\n" "$lastversion_geos_sha1" + printf " SFCGAL_CHECKOUT: 'tags/%s'\n" "$lastversion_sfcgal" + printf " SFCGAL_CHECKOUT_SHA1: '%s'\n" "$lastversion_sfcgal_sha1" + printf " CGAL_CHECKOUT: 'tags/%s'\n" "$lastversion_cgal" + printf " CGAL_CHECKOUT_SHA1: '%s'\n" "$lastversion_cgal_sha1" + + printf " BOOST_VERSION: '%s'\n" "${boostVersion[$variant]}" + } >>_versions.yml + + else + { + if [[ "$variant" == "$debian_latest" ]]; then + # generating amd64 and arm64 only for latest debian + printf " arch: '%s'\n" "amd64 arm64" + else + printf " arch: '%s'\n" "amd64 arm64" + fi + + if [ -z "$bundleType" ]; then + printf " template: '%s'\n" "Dockerfile.debian.template" + else + printf " template: '%s'\n" "Dockerfile.${bundleType}.template" + printf " MOBILITYDB_CHECKOUT: 'tags/%s'\n" "$lastversion_mobilitydb" + printf " MOBILITYDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_mobilitydb_sha1" + + printf " PGSQL_HTTP_CHECKOUT: 'tags/%s'\n" "$lastversion_pgsql_http" + printf " PGSQL_HTTP_CHECKOUT_SHA1: '%s'\n" "$lastversion_pgsql_http_sha1" + + printf " PGSQL_GZIP_CHECKOUT: 'tags/%s'\n" "$lastversion_pgsql_gzip" + printf " PGSQL_GZIP_CHECKOUT_SHA1: '%s'\n" "$lastversion_pgsql_gzip_sha1" + + printf " TIMESCALEDB_CHECKOUT: 'tags/%s'\n" "$lastversion_timescaledb" + printf " TIMESCALEDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_timescaledb_sha1" + fi + + printf " POSTGIS_MAJOR: '%s'\n" "${postgisMajor[$variant]}" + printf " POSTGIS_VERSION: '%s'\n" "${postgisFullVersion[$variant]}" + } >>_versions.yml + fi + ) + fi + done + + # generate alpine versions + for variant in $alpine_variants; do + if [ -d "$version/$variant" ] && [[ "master" == "$postgisVersion" ]]; then + ( + echo " " + echo "$version/$variant - debian[$variant] : master is allowed only for $debian_latest ; Skip and clean the directory! " + # remove all files in the directory ! + rm -rf "${version:?}/${variant:?}/*" + ) + elif [ -d "$version/$variant" ]; then + ( + if [[ "master" == "$postgisVersion" || "$postgisVersion" == "recentstack" ]]; then + echo "Alpine - $postgisVersion is not supported! STOP!" + exit 1 + fi + + postgisDockerTag="${postgisLastDockerTags[$postgisVersion]}" + + mainTags="${postgresLastMainTags[$postgresVersion]}-${postgisLastDockerTags[$postgisVersion]}" + if [[ ${mainTags} =~ [a-zA-Z] ]]; then + readme_group="test" + else + readme_group=$variant + fi + tags="${mainTags}-${variant}" + + if [[ "master" != "$postgisVersion" && "$postgisVersion" != "recentstack" && "$srcVersion" != "${postgisLastDockerTags[$postgisVersion]}" ]]; then + tags+=" ${postgresLastMainTags[$postgresVersion]}-${srcVersion}-${variant}" + fi + if [[ "$variant" == "$alpine_latest" ]]; then + tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisLastDockerTags[$postgisVersion]}-alpine" + if [[ "${postgis_latest}" == "${postgisLastDockerTags[$postgisVersion]}" && "${postgres_latest}" == "${postgresLastMainTags[$postgresVersion]}" ]]; then + tags+=" alpine" + fi + fi + + { + printf " '%s':\n" "$variant" + printf " tags: '%s'\n" "$tags" + printf " readme_group: '%s'\n" "$readme_group" + printf " postgis: '%s'\n" "${postgisDockerTag}" + printf " arch: '%s'\n" "amd64 arm64" + printf " template: '%s'\n" "Dockerfile.alpine.template" + printf " PG_MAJOR: '%s'\n" "$postgresVersion" + printf " PG_DOCKER: '%s'\n" "${postgresLastMainTags[$postgresVersion]}" + printf " POSTGIS_VERSION: '%s'\n" "$srcVersion" + printf " POSTGIS_SHA256: '%s'\n" "$srcSha256" + printf " POSTGIS_CHECKOUT: 'tags/%s'\n" "$srcVersion" + printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$srcSha1" + } >>_versions.yml + + ) + fi + done +done + +# convert yaml to json +yaml2json_pretty <./_versions.yml >./_versions.json + +# Remove any keys with null values from the JSON file. +# This is necessary when there are no variants for a specific version, resulting in a null key. +# Example: When the Debian PostGIS version is updated, and the this repo is not yet updated. +jq 'del(.[] | select(. == null))' ./_versions.json >./versions.json + +rm -f _versions.yml +rm -f _versions.json + +cat versions.json From 86e9bbb52befd8bd38d60f893d9af672d20ccb7f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 14 Oct 2023 13:47:03 +0200 Subject: [PATCH 002/167] refactoring, updates, ... --- .circleci/config.yml | 44 ++- .github/workflows/localtest.yml | 8 + .github/workflows/main.yml | 72 ++-- 11-3.3/alpine3.18/Dockerfile | 39 ++- 11-3.3/bookworm/Dockerfile | 3 +- 11-3.3/bullseye/Dockerfile | 3 +- 12-3.4/alpine3.18/Dockerfile | 39 ++- 12-3.4/bookworm/Dockerfile | 3 +- 12-3.4/bullseye/Dockerfile | 3 +- 13-3.4-bundle/bookworm/Dockerfile | 327 ------------------ 13-3.4-bundle/bookworm/tags | 1 - 13-3.4/alpine3.18/Dockerfile | 39 ++- 13-3.4/bookworm/Dockerfile | 3 +- 13-3.4/bullseye/Dockerfile | 3 +- 14-3.4-bundle/bookworm/tags | 1 - .../bookworm/Dockerfile | 214 +++++++----- 14-3.4-bundle0/bookworm/tags | 1 + 14-3.4/alpine3.18/Dockerfile | 39 ++- 14-3.4/bookworm/Dockerfile | 3 +- 14-3.4/bullseye/Dockerfile | 3 +- 15-3.4-bundle/bookworm/tags | 1 - .../bookworm/Dockerfile | 214 +++++++----- 15-3.4-bundle0/bookworm/tags | 1 + 15-3.4/alpine3.18/Dockerfile | 39 ++- 15-3.4/bookworm/Dockerfile | 3 +- 15-3.4/bullseye/Dockerfile | 3 +- 15-master/bookworm/Dockerfile | 265 +++++++------- .../bookworm/Dockerfile | 267 +++++++------- .../bookworm/initdb-postgis.sh | 0 15-recent/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 15-recentstack/bookworm/tags | 1 - 16-3.4-bundle/bookworm/tags | 1 - .../bookworm/Dockerfile | 197 ++++++----- 16-3.4-bundle0/bookworm/tags | 1 + 16-3.4/alpine3.18/Dockerfile | 39 ++- 16-3.4/bookworm/Dockerfile | 3 +- 16-3.4/bullseye/Dockerfile | 3 +- 16-master/bookworm/Dockerfile | 265 +++++++------- .../bookworm/Dockerfile | 267 +++++++------- .../bookworm/initdb-postgis.sh | 0 16-recent/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 16-recentstack/bookworm/tags | 1 - Dockerfile.alpine.template | 39 ++- ...le.template => Dockerfile.bundle0.template | 218 +++++++----- Dockerfile.debian.template | 3 +- Dockerfile.master.template | 265 +++++++------- Makefile | 2 +- README.md | 26 +- apply-readme.sh | 10 +- localtest.sh | 21 +- manifest.sh | 114 +++--- versions.json | 123 +++---- versions.sh | 90 +++-- 55 files changed, 1675 insertions(+), 1657 deletions(-) delete mode 100644 13-3.4-bundle/bookworm/Dockerfile delete mode 100644 13-3.4-bundle/bookworm/tags delete mode 100644 14-3.4-bundle/bookworm/tags rename {14-3.4-bundle => 14-3.4-bundle0}/bookworm/Dockerfile (53%) create mode 100644 14-3.4-bundle0/bookworm/tags delete mode 100644 15-3.4-bundle/bookworm/tags rename {15-3.4-bundle => 15-3.4-bundle0}/bookworm/Dockerfile (53%) create mode 100644 15-3.4-bundle0/bookworm/tags rename {16-recentstack => 15-recent}/bookworm/Dockerfile (65%) rename {15-recentstack => 15-recent}/bookworm/initdb-postgis.sh (100%) create mode 100644 15-recent/bookworm/tags rename {15-recentstack => 15-recent}/bookworm/update-postgis.sh (100%) delete mode 100644 15-recentstack/bookworm/tags delete mode 100644 16-3.4-bundle/bookworm/tags rename {16-3.4-bundle => 16-3.4-bundle0}/bookworm/Dockerfile (53%) create mode 100644 16-3.4-bundle0/bookworm/tags rename {15-recentstack => 16-recent}/bookworm/Dockerfile (65%) rename {16-recentstack => 16-recent}/bookworm/initdb-postgis.sh (100%) create mode 100644 16-recent/bookworm/tags rename {16-recentstack => 16-recent}/bookworm/update-postgis.sh (100%) delete mode 100644 16-recentstack/bookworm/tags rename Dockerfile.bundle.template => Dockerfile.bundle0.template (55%) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee052c284..b30ab291e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,11 @@ version: 2.1 orbs: # https://circleci.com/developer/orbs/orb/circleci/docker - docker: circleci/docker@2.2.0 + docker: circleci/docker@2.4.0 + # https://circleci.com/developer/orbs/orb/circleci/python + python: circleci/python@2.1.1 + # https://circleci.com/developer/orbs/orb/circleci/shellcheck + shellcheck: circleci/shellcheck@3.2.0 jobs: build-arm64: @@ -24,6 +28,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: pip3 install lastversion - run: source tools/environment_init.sh - run: make check_version - docker/check: @@ -32,11 +45,14 @@ jobs: docker-password: DOCKERHUB_ACCESS_TOKEN - run: - name: Conditional Docker Check - Halt if not on master branch or if it's a PR + name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists command: | # Check if the current branch is 'master' and the weekly image is not extis # If weekly image exists, skip docker build and push - if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then + source tools/environment_init.sh + echo "check: << parameters.target-version-variant >>${IMAGE_VERSION_ID}" + check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}" || true + if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}"; then circleci-agent step halt fi @@ -53,15 +69,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: | @@ -93,24 +100,23 @@ workflows: "12-3.4-bookworm", "12-3.4-bullseye", "13-3.4-alpine3.18", -# --skip-- "13-3.4-bookworm", --> generated with the related bundle job! + "13-3.4-bookworm", "13-3.4-bullseye", - "13-3.4-bundle-bookworm", "14-3.4-alpine3.18", # --skip-- "14-3.4-bookworm", --> generated with the related bundle job! "14-3.4-bullseye", - "14-3.4-bundle-bookworm", + "14-3.4-bundle0-bookworm", "15-3.4-alpine3.18", # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! "15-3.4-bullseye", - "15-3.4-bundle-bookworm", + "15-3.4-bundle0-bookworm", "15-master-bookworm", - "15-recentstack-bookworm", + "15-recent-bookworm", "16-3.4-alpine3.18", # --skip-- "16-3.4-bookworm", --> generated with the related bundle job! "16-3.4-bullseye", - "16-3.4-bundle-bookworm", + "16-3.4-bundle0-bookworm", "16-master-bookworm", - "16-recentstack-bookworm", + "16-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index 79a0dfe31..1a46d84fa 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -13,5 +13,13 @@ jobs: steps: - uses: actions/checkout@v4 - run: docker ps -a + - name: Install manifest-tool + run: | + 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-amd64 /usr/local/bin/manifest-tool + manifest-tool -v + - run: pip install lastversion - run: ./localtest.sh - run: docker images diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed1d08e01..859c4416c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,25 +31,24 @@ jobs: - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.0-bullseye", readme_group: "bullseye" } - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } + - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "13-3.4-bundle", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle", readme_group: "bundle" } - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } # --skip-- - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "14-3.4-bundle", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle", readme_group: "bundle" } + - { version: "14-3.4-bundle0", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", readme_group: "bundle0" } - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", readme_group: "alpine3.18" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "15-3.4-bundle", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle", readme_group: "bundle" } + - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recentstack", variant: "bookworm", postgres: "15", postgis: "recentstack", arch: "amd64 arm64", tags: "15-recentstack-bookworm 15-recentstack", readme_group: "recentstack" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", readme_group: "alpine3.18" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "16-3.4-bundle", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle", readme_group: "bundle" } + - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recentstack", variant: "bookworm", postgres: "16", postgis: "recentstack", arch: "amd64 arm64", tags: "16-recentstack-bookworm 16-recentstack", readme_group: "recentstack" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" @@ -64,6 +63,16 @@ jobs: - name: Checkout source uses: actions/checkout@v4 + - name: Install manifest-tool + run: | + 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-amd64 /usr/local/bin/manifest-tool + manifest-tool -v + + - run: pip install lastversion + - name: Environment init run: source tools/environment_init.sh @@ -105,6 +114,13 @@ jobs: echo "weekly build exists; no need to re-build. STOP" exit 0 + - name: Login to dockerhub + uses: docker/login-action@v2 + if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: "verify: make -n test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" if: env.IMAGE_EXISTS == 'false' run: make -n test-${{ matrix.version }}-${{ matrix.variant }} @@ -115,22 +131,6 @@ jobs: - run: make dockerlist - - name: Login to dockerhub - uses: docker/login-action@v2 - if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - - - name: Install manifest-tool - if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} - run: | - 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-amd64 /usr/local/bin/manifest-tool - manifest-tool -v - - name: Push docker image to dockerhub if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} env: @@ -155,12 +155,21 @@ jobs: - name: Checkout source uses: actions/checkout@v4 + - name: Install manifest-tool + run: | + 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-amd64 /usr/local/bin/manifest-tool + manifest-tool -v + + - run: pip install lastversion + - name: Environment init run: source tools/environment_init.sh - run: make check_version -#TODO: fix waiting for CircleCI - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds - name: Login to dockerhub @@ -170,18 +179,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - - name: Install manifest-tool - run: | - 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-amd64 /usr/local/bin/manifest-tool - manifest-tool -v - - - name: Update docker manifest - if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} - run: ./manifest.sh - - name: push readme to docker hub api if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} env: @@ -189,4 +186,7 @@ jobs: DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} run: make push-readme + - name: Update docker manifest + if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + run: ./manifest.sh diff --git a/11-3.3/alpine3.18/Dockerfile b/11-3.3/alpine3.18/Dockerfile index 69c39d2eb..c7689bfa3 100644 --- a/11-3.3/alpine3.18/Dockerfile +++ b/11-3.3/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:11-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.3.4 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=846cce0c6420a3d0483d2a1a3baee182d2fc1217 +ARG PGIS1_BASE_IMAGE=postgres:11-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=846cce0c6420a3d0483d2a1a3baee182d2fc1217 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 11 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 11 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.3.4 -ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e +# ENV POSTGIS_VERSION 3.3.4 +# ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/11-3.3/bookworm/Dockerfile b/11-3.3/bookworm/Dockerfile index 8128b8566..735ef6917 100644 --- a/11-3.3/bookworm/Dockerfile +++ b/11-3.3/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/11-3.3/bullseye/Dockerfile b/11-3.3/bullseye/Dockerfile index b8724f19c..d6a537d60 100644 --- a/11-3.3/bullseye/Dockerfile +++ b/11-3.3/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index 2e59d2934..834d6adc0 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:12-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 +# ENV POSTGIS_VERSION 3.4.0 +# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile index c2d8c7faa..a4e7df64a 100644 --- a/12-3.4/bookworm/Dockerfile +++ b/12-3.4/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile index b0c0d36ec..b421824c2 100644 --- a/12-3.4/bullseye/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/13-3.4-bundle/bookworm/Dockerfile b/13-3.4-bundle/bookworm/Dockerfile deleted file mode 100644 index f5286ca36..000000000 --- a/13-3.4-bundle/bookworm/Dockerfile +++ /dev/null @@ -1,327 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - - -# Experimental Geo Bundle package. -# This is a work in progress and not yet ready for production. -# Some packages will be removed from this bundle and others will be added. -# The goal is to have a bundle that includes all the most popular extensions with PostGIS - -# set the base image , make build-* is overwriting with the actual value ! - -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 - -ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:13-3.4-bookworm - -ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be - -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 - -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 - -FROM ${PGIS_V1_BASE_IMAGE} AS builder - -RUN set -ex \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - g++ \ - git \ - make \ - pgxnclient \ - postgresql-server-dev-$PG_MAJOR \ - unzip \ - wget \ - # MobilityDB - libgeos++-dev \ - libgsl-dev \ - libjson-c-dev \ - libproj-dev \ - # TimescaleDB - libkrb5-dev \ - # pgsql-http - libcurl4-gnutls-dev \ - # pgsql-gzip - zlib1g-dev \ - # sqlite_fdw - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -ARG PGIS_V1_MOBILITYDB_REPOSITORY -ARG PGIS_V1_MOBILITYDB_CHECKOUT -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 - -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY -ARG PGIS_V1_TIMESCALEDB_REPOSITORY -ARG PGIS_V1_TIMESCALEDB_CHECKOUT -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 - -RUN set -ex \ - && mkdir -p /pgsql-gzip \ - && cd pgsql-gzip \ - && git init \ - && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_gzip_last_commit.txt \ - && make -j$(nproc) \ - && make install - -RUN set -ex \ - && mkdir -p /pgsql-http \ - && cd pgsql-http \ - && git init \ - && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_http_last_commit.txt \ - && make -j$(nproc) \ - && make install - - -# Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -ex \ - && mkdir -p /timescaledb \ - && cd timescaledb \ - && git init \ - && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_timescaledb_last_commit.txt \ - && ./bootstrap \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - \ - -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ - -DREGRESS_CHECKS=OFF \ - -DSEND_TELEMETRY_DEFAULT=NO \ - -DTAP_CHECKS=OFF \ - -DWARNINGS_AS_ERRORS=OFF \ - -DENABLE_DEBUG_UTILS=OFF \ - && cd build \ - && make -j$(nproc) \ - && make install - - - -# Install MobilityDB -RUN set -ex \ - && mkdir -p /MobilityDB \ - && cd MobilityDB \ - && git init \ - && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_MobilityDB_last_commit.txt \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - .. \ - && make -j$(nproc) \ - && make install - -RUN pgxn install ddlx -RUN pgxn install h3 # https://github.com/zachasme/h3-pg -RUN pgxn install json_accessors -RUN pgxn install lostgis -RUN pgxn install parray_gin -RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install pg_roaringbitmap -RUN pgxn install pg_rowalesce -RUN pgxn install pg_uuidv7 -RUN pgxn install pg_xenophile -RUN pgxn install pg_xxhash -RUN pgxn install pgsql_tweaks - -RUN USE_PGXS=1 pgxn install sqlite_fdw - -RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git - - -#TODO: add https://github.com/hydradatabase/hydra -# https://github.com/powa-team/pg_qualstats -# https://github.com/darold/pgtt -# https://github.com/apache/arrow-flight-sql-postgresql -# https://github.com/neondatabase/pg_embedding/ -# pgrust ; "pg-graphql -# https://github.com/kelvich/pg_tiktoken -# -# -------------------------------------------------------------- - - -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:13-3.4-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 13-3.4-bookworm " \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -# install all utf8 locales; -# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -#TODO - uncomment -RUN set -ex \ - && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ - && locale-gen - -RUN set -ex \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - \ - bzip2 \ - curl \ - jq \ - unzip \ - wget \ - \ - gdal-bin \ - proj-bin \ - sqlite3 \ - \ - pipx \ - python-is-python3 \ - python3 \ - python3-geoalchemy2 \ - python3-pglast \ - python3-pip \ - python3-psycopg2 \ - python3-setuptools \ - python3-sqlalchemy \ - \ - postgis \ - postgresql \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgvector \ - postgresql-client-common \ - postgresql-common \ - postgresql-contrib \ - postgresql-plpython3-$PG_MAJOR \ - postgresql-postgis \ - postgresql-postgis-scripts \ - \ - pgbackrest \ - pgbadger \ - pgtap \ - pgtop \ - pspg \ - \ - postgresql-$PG_MAJOR-asn1oid \ - postgresql-$PG_MAJOR-cron \ - postgresql-$PG_MAJOR-decoderbufs \ - postgresql-$PG_MAJOR-extra-window-functions \ - postgresql-$PG_MAJOR-first-last-agg \ - postgresql-$PG_MAJOR-hll \ - postgresql-$PG_MAJOR-hypopg \ - postgresql-$PG_MAJOR-icu-ext \ - postgresql-$PG_MAJOR-jsquery \ - postgresql-$PG_MAJOR-numeral \ - postgresql-$PG_MAJOR-pg-failover-slots \ - postgresql-$PG_MAJOR-pg-stat-kcache \ - postgresql-$PG_MAJOR-pgaudit \ - postgresql-$PG_MAJOR-pgmp \ - postgresql-$PG_MAJOR-pgpcre \ - postgresql-$PG_MAJOR-pgq3 \ - postgresql-$PG_MAJOR-pgsphere \ - postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-prefix \ - postgresql-$PG_MAJOR-prefix \ - postgresql-$PG_MAJOR-prioritize \ - postgresql-$PG_MAJOR-q3c \ - postgresql-$PG_MAJOR-repack \ - postgresql-$PG_MAJOR-rum \ - \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-plpgsql-check \ - postgresql-$PG_MAJOR-pointcloud \ - postgresql-$PG_MAJOR-squeeze \ - # - # add MobilityDb missing dependency from libgsl-dev - libgsl27 \ - \ - # && pip3 install --upgrade pip \ - \ -# && pipx install geopy \ -# && pipx install plpygis \ -# && pipx install pygml \ -# && pipx install shapely \ - \ - && rm -Rf /root/.cache/pip \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -# Install MobilityDB,Timescaledb,h3,etc from builder -COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder /postgres_dba /postgres_dba - -# check any missing dependencies -RUN set -ex \ - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true - -# multiple LLVM existance is not allowed. -RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - dpkg -l | grep llvm ; \ - exit 1; \ - fi - -# add MobilityDB requirements -RUN set -eux; \ - cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ - # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ - # MobilityDB recomendation - echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ - echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample - -# for postgres_dba Use ":dba" to see menu -RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/13-3.4-bundle/bookworm/tags b/13-3.4-bundle/bookworm/tags deleted file mode 100644 index fb82f1994..000000000 --- a/13-3.4-bundle/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index 814beaf9c..5a0a52abc 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:13-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 +# ENV POSTGIS_VERSION 3.4.0 +# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile index d2c5f4bb6..bb6191ba8 100644 --- a/13-3.4/bookworm/Dockerfile +++ b/13-3.4/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile index d3621705a..46ea47c6b 100644 --- a/13-3.4/bullseye/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/14-3.4-bundle/bookworm/tags b/14-3.4-bundle/bookworm/tags deleted file mode 100644 index 7980ed508..000000000 --- a/14-3.4-bundle/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle diff --git a/14-3.4-bundle/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile similarity index 53% rename from 14-3.4-bundle/bookworm/Dockerfile rename to 14-3.4-bundle0/bookworm/Dockerfile index 5cde84a53..8d514cc61 100644 --- a/14-3.4-bundle/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -1,6 +1,6 @@ # # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle.template" +# source: "Dockerfile.bundle0.template" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -16,28 +16,32 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm -ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec +ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be +ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 +ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 +ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 -FROM ${PGIS_V1_BASE_IMAGE} AS builder +ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=81e4f0f37966081bc1909db9796bfc1b1b5d2349 -RUN set -ex \ +FROM ${PGIS1_BASE_IMAGE} AS builder + +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -62,6 +66,8 @@ RUN set -ex \ libkrb5-dev \ # pgsql-http libcurl4-gnutls-dev \ + # hydra (columnar) + liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw @@ -70,67 +76,67 @@ RUN set -ex \ && rm -rf /var/lib/apt/lists/* -ARG PGIS_V1_MOBILITYDB_REPOSITORY -ARG PGIS_V1_MOBILITYDB_CHECKOUT -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-http-gzip -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_HTTP_REPOSITORY +ARG PGIS1_PGSQL_HTTP_CHECKOUT +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY -ARG PGIS_V1_TIMESCALEDB_REPOSITORY -ARG PGIS_V1_TIMESCALEDB_CHECKOUT -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_GZIP_REPOSITORY +ARG PGIS1_PGSQL_GZIP_CHECKOUT +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-gzip \ && cd pgsql-gzip \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_gzip_last_commit.txt \ && make -j$(nproc) \ && make install -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-http \ && cd pgsql-http \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_http_last_commit.txt \ && make -j$(nproc) \ && make install +FROM builder as builder-timescaledb + +ARG PGIS1_TIMESCALEDB_APACHE_ONLY +ARG PGIS1_TIMESCALEDB_REPOSITORY +ARG PGIS1_TIMESCALEDB_CHECKOUT +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 + # Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -ex \ +RUN set -eux \ && mkdir -p /timescaledb \ && cd timescaledb \ && git init \ - && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_timescaledb_last_commit.txt \ && ./bootstrap \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ \ - -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ -DREGRESS_CHECKS=OFF \ -DSEND_TELEMETRY_DEFAULT=NO \ -DTAP_CHECKS=OFF \ @@ -142,16 +148,22 @@ RUN set -ex \ +FROM builder as builder-mobilitydb + +ARG PGIS1_MOBILITYDB_REPOSITORY +ARG PGIS1_MOBILITYDB_CHECKOUT +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 + # Install MobilityDB -RUN set -ex \ +RUN set -eux \ && mkdir -p /MobilityDB \ && cd MobilityDB \ && git init \ - && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_MobilityDB_last_commit.txt \ && mkdir build \ && cd build \ @@ -162,35 +174,57 @@ RUN set -ex \ && make -j$(nproc) \ && make install -RUN pgxn install ddlx -RUN pgxn install h3 # https://github.com/zachasme/h3-pg -RUN pgxn install json_accessors -RUN pgxn install lostgis -RUN pgxn install parray_gin -RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install pg_roaringbitmap -RUN pgxn install pg_rowalesce -RUN pgxn install pg_uuidv7 -RUN pgxn install pg_xenophile -RUN pgxn install pg_xxhash -RUN pgxn install pgsql_tweaks + +FROM builder as builder-pgxn + +RUN pgxn install --verbose ddlx +RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +RUN pgxn install --verbose json_accessors +RUN pgxn install --verbose lostgis +RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install --verbose pg_roaringbitmap +RUN pgxn install --verbose pg_rowalesce +RUN pgxn install --verbose pg_uuidv7 +RUN pgxn install --verbose pg_xenophile +RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw -RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git +FROM builder as builder-other -#TODO: add https://github.com/hydradatabase/hydra -# https://github.com/powa-team/pg_qualstats -# https://github.com/darold/pgtt -# https://github.com/apache/arrow-flight-sql-postgresql -# https://github.com/neondatabase/pg_embedding/ -# pgrust ; "pg-graphql -# https://github.com/kelvich/pg_tiktoken -# -# -------------------------------------------------------------- +ARG PGIS1_PG_HINT_PLAN_REPOSITORY +ARG PGIS1_PG_HINT_PLAN_CHECKOUT +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + +# add add https://github.com/hydradatabase/hydra +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && cd hydra/columnar \ + && git checkout main \ + && ./configure \ + && make -j$(nproc) \ + && make install + +# install pg_hint_plan +RUN set -eux \ + && mkdir pg_hint_plan \ + && cd pg_hint_plan \ + && git init \ + && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ + && make -j$(nproc) \ + && make install + +RUN set -eux \ + && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm @@ -201,12 +235,11 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -#TODO - uncomment -RUN set -ex \ +RUN set -eux \ && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ \ @@ -296,18 +329,31 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +# Install from stages +COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -# Install MobilityDB,Timescaledb,h3,etc from builder -COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba # check any missing dependencies -RUN set -ex \ +RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true # multiple LLVM existance is not allowed. -RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ +RUN set -eux \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ echo "More than one llvm package or none at all found. Stopping."; \ dpkg -l | grep llvm ; \ @@ -315,10 +361,10 @@ RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ fi # add MobilityDB requirements -RUN set -eux; \ - cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ +RUN set -eux \ + && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/14-3.4-bundle0/bookworm/tags b/14-3.4-bundle0/bookworm/tags new file mode 100644 index 000000000..f97bd34a3 --- /dev/null +++ b/14-3.4-bundle0/bookworm/tags @@ -0,0 +1 @@ +14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 1809db54f..84b212d5c 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:14-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 +# ENV POSTGIS_VERSION 3.4.0 +# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile index 1ce16c73c..007cc600a 100644 --- a/14-3.4/bookworm/Dockerfile +++ b/14-3.4/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile index d2ee3dd0b..1896d3972 100644 --- a/14-3.4/bullseye/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/15-3.4-bundle/bookworm/tags b/15-3.4-bundle/bookworm/tags deleted file mode 100644 index 3fcf4b6c0..000000000 --- a/15-3.4-bundle/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle diff --git a/15-3.4-bundle/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile similarity index 53% rename from 15-3.4-bundle/bookworm/Dockerfile rename to 15-3.4-bundle0/bookworm/Dockerfile index 698a68bae..a9c6b6b5d 100644 --- a/15-3.4-bundle/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -1,6 +1,6 @@ # # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle.template" +# source: "Dockerfile.bundle0.template" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -16,28 +16,32 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm -ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec +ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be +ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 +ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 +ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 -FROM ${PGIS_V1_BASE_IMAGE} AS builder +ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -RUN set -ex \ +FROM ${PGIS1_BASE_IMAGE} AS builder + +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -62,6 +66,8 @@ RUN set -ex \ libkrb5-dev \ # pgsql-http libcurl4-gnutls-dev \ + # hydra (columnar) + liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw @@ -70,67 +76,67 @@ RUN set -ex \ && rm -rf /var/lib/apt/lists/* -ARG PGIS_V1_MOBILITYDB_REPOSITORY -ARG PGIS_V1_MOBILITYDB_CHECKOUT -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-http-gzip -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_HTTP_REPOSITORY +ARG PGIS1_PGSQL_HTTP_CHECKOUT +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY -ARG PGIS_V1_TIMESCALEDB_REPOSITORY -ARG PGIS_V1_TIMESCALEDB_CHECKOUT -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_GZIP_REPOSITORY +ARG PGIS1_PGSQL_GZIP_CHECKOUT +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-gzip \ && cd pgsql-gzip \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_gzip_last_commit.txt \ && make -j$(nproc) \ && make install -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-http \ && cd pgsql-http \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_http_last_commit.txt \ && make -j$(nproc) \ && make install +FROM builder as builder-timescaledb + +ARG PGIS1_TIMESCALEDB_APACHE_ONLY +ARG PGIS1_TIMESCALEDB_REPOSITORY +ARG PGIS1_TIMESCALEDB_CHECKOUT +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 + # Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -ex \ +RUN set -eux \ && mkdir -p /timescaledb \ && cd timescaledb \ && git init \ - && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_timescaledb_last_commit.txt \ && ./bootstrap \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ \ - -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ -DREGRESS_CHECKS=OFF \ -DSEND_TELEMETRY_DEFAULT=NO \ -DTAP_CHECKS=OFF \ @@ -142,16 +148,22 @@ RUN set -ex \ +FROM builder as builder-mobilitydb + +ARG PGIS1_MOBILITYDB_REPOSITORY +ARG PGIS1_MOBILITYDB_CHECKOUT +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 + # Install MobilityDB -RUN set -ex \ +RUN set -eux \ && mkdir -p /MobilityDB \ && cd MobilityDB \ && git init \ - && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_MobilityDB_last_commit.txt \ && mkdir build \ && cd build \ @@ -162,35 +174,57 @@ RUN set -ex \ && make -j$(nproc) \ && make install -RUN pgxn install ddlx -RUN pgxn install h3 # https://github.com/zachasme/h3-pg -RUN pgxn install json_accessors -RUN pgxn install lostgis -RUN pgxn install parray_gin -RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install pg_roaringbitmap -RUN pgxn install pg_rowalesce -RUN pgxn install pg_uuidv7 -RUN pgxn install pg_xenophile -RUN pgxn install pg_xxhash -RUN pgxn install pgsql_tweaks + +FROM builder as builder-pgxn + +RUN pgxn install --verbose ddlx +RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +RUN pgxn install --verbose json_accessors +RUN pgxn install --verbose lostgis +RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install --verbose pg_roaringbitmap +RUN pgxn install --verbose pg_rowalesce +RUN pgxn install --verbose pg_uuidv7 +RUN pgxn install --verbose pg_xenophile +RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw -RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git +FROM builder as builder-other -#TODO: add https://github.com/hydradatabase/hydra -# https://github.com/powa-team/pg_qualstats -# https://github.com/darold/pgtt -# https://github.com/apache/arrow-flight-sql-postgresql -# https://github.com/neondatabase/pg_embedding/ -# pgrust ; "pg-graphql -# https://github.com/kelvich/pg_tiktoken -# -# -------------------------------------------------------------- +ARG PGIS1_PG_HINT_PLAN_REPOSITORY +ARG PGIS1_PG_HINT_PLAN_CHECKOUT +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + +# add add https://github.com/hydradatabase/hydra +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && cd hydra/columnar \ + && git checkout main \ + && ./configure \ + && make -j$(nproc) \ + && make install + +# install pg_hint_plan +RUN set -eux \ + && mkdir pg_hint_plan \ + && cd pg_hint_plan \ + && git init \ + && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ + && make -j$(nproc) \ + && make install + +RUN set -eux \ + && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm @@ -201,12 +235,11 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -#TODO - uncomment -RUN set -ex \ +RUN set -eux \ && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ \ @@ -296,18 +329,31 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +# Install from stages +COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -# Install MobilityDB,Timescaledb,h3,etc from builder -COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba # check any missing dependencies -RUN set -ex \ +RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true # multiple LLVM existance is not allowed. -RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ +RUN set -eux \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ echo "More than one llvm package or none at all found. Stopping."; \ dpkg -l | grep llvm ; \ @@ -315,10 +361,10 @@ RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ fi # add MobilityDB requirements -RUN set -eux; \ - cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ +RUN set -eux \ + && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags new file mode 100644 index 000000000..c3e2f82c2 --- /dev/null +++ b/15-3.4-bundle0/bookworm/tags @@ -0,0 +1 @@ +15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 0eb9d05bb..53e2d2b66 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:15-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 15 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 +# ENV POSTGIS_VERSION 3.4.0 +# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile index 04d8b5929..87fb0189c 100644 --- a/15-3.4/bookworm/Dockerfile +++ b/15-3.4/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile index a951b6966..260921b9c 100644 --- a/15-3.4/bullseye/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 128426680..2879f9d0b 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -6,48 +6,48 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS_V1_BASE_IMAGE=postgres:15-bookworm +ARG PGIS1_BASE_IMAGE=postgres:15-bookworm -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git -ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_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_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f -ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 -ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c +ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a +ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 +ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e +ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4 +ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa +ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c -ARG PGIS_V1_BOOST_VERSION=1.74.0 +ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS_V1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_CMAKE_BUILD_TYPE=Release -FROM ${PGIS_V1_BASE_IMAGE} as builder +FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / -ARG PGIS_V1_BOOST_VERSION -ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -98,42 +98,44 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG PGIS_V1_CMAKE_BUILD_TYPE -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder # cgal & sfcgal -ARG PGIS_V1_SFCGAL_REPOSITORY -ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} -ARG PGIS_V1_SFCGAL_CHECKOUT -ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS_V1_CGAL_REPOSITORY -ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} -ARG PGIS_V1_CGAL_CHECKOUT -ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir cgal \ && cd cgal \ && git init \ - && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ && cd SFCGAL \ && git init \ - && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ @@ -144,18 +146,21 @@ RUN set -ex \ && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal + +FROM builder as proj-builder + # proj -ARG PGIS_V1_PROJ_REPOSITORY -ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} -ARG PGIS_V1_PROJ_CHECKOUT -ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} -RUN set -ex \ +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ && cd PROJ \ && git init \ - && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 @@ -172,7 +177,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -180,41 +185,55 @@ RUN set -ex \ \ && rm -fr /usr/src/PROJ + +FROM builder as geos-builder + # geos -ARG PGIS_V1_GEOS_REPOSITORY -ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} -ARG PGIS_V1_GEOS_CHECKOUT -ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} -RUN set -ex \ +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir geos \ && cd geos \ && git init \ - && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local # gdal -ARG PGIS_V1_GDAL_REPOSITORY -ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} -ARG PGIS_V1_GDAL_CHECKOUT -ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ && git init \ - && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ @@ -238,7 +257,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -280,7 +299,7 @@ RUN set -ex \ && rm -fr /usr/src/gdal # Minimal command line test. -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -292,36 +311,36 @@ RUN set -ex \ && pcre-config --version # ------------------------------------------- -# STAGE final +# final stage # ------------------------------------------- -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS - 15-master spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG PGIS_V1_CMAKE_BUILD_TYPE -ARG PGIS_V1_BASE_IMAGE -ARG PGIS_V1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ - PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ - PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -347,29 +366,37 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /_pgis*.* / -COPY --from=builder /usr/local /usr/local - -ARG PGIS_V1_GDAL_CHECKOUT -ARG PGIS_V1_GDAL_REPOSITORY -ARG PGIS_V1_GEOS_CHECKOUT -ARG PGIS_V1_GEOS_REPOSITORY -ARG PGIS_V1_PROJ_CHECKOUT -ARG PGIS_V1_PROJ_REPOSITORY -ARG PGIS_V1_SFCGAL_CHECKOUT -ARG PGIS_V1_SFCGAL_REPOSITORY - -ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ - PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ - PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ - PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ - PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ - PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ - PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ - PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} # Minimal command line test ( fail fast ) -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -384,14 +411,12 @@ RUN set -ex \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# install postgis -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_REPOSITORY - -ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ - PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -429,8 +454,8 @@ RUN set -ex \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ @@ -509,7 +534,7 @@ COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin # last final test -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ diff --git a/16-recentstack/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile similarity index 65% rename from 16-recentstack/bookworm/Dockerfile rename to 15-recent/bookworm/Dockerfile index 802e85480..a35c55ccc 100644 --- a/16-recentstack/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -6,48 +6,48 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS_V1_BASE_IMAGE=postgres:16-bookworm +ARG PGIS1_BASE_IMAGE=postgres:15-bookworm -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git -ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS_V1_GDAL_CHECKOUT=tags/v3.7.2 -ARG PGIS_V1_PROJ_CHECKOUT=tags/9.3.0 -ARG PGIS_V1_SFCGAL_CHECKOUT=tags/v1.4.1 -ARG PGIS_V1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS_V1_BOOST_VERSION=1.74.0 +ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS_V1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_CMAKE_BUILD_TYPE=Release -FROM ${PGIS_V1_BASE_IMAGE} as builder +FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / -ARG PGIS_V1_BOOST_VERSION -ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -98,42 +98,44 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG PGIS_V1_CMAKE_BUILD_TYPE -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder # cgal & sfcgal -ARG PGIS_V1_SFCGAL_REPOSITORY -ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} -ARG PGIS_V1_SFCGAL_CHECKOUT -ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS_V1_CGAL_REPOSITORY -ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} -ARG PGIS_V1_CGAL_CHECKOUT -ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir cgal \ && cd cgal \ && git init \ - && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ && cd SFCGAL \ && git init \ - && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ @@ -144,18 +146,21 @@ RUN set -ex \ && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal + +FROM builder as proj-builder + # proj -ARG PGIS_V1_PROJ_REPOSITORY -ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} -ARG PGIS_V1_PROJ_CHECKOUT -ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} -RUN set -ex \ +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ && cd PROJ \ && git init \ - && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 @@ -172,7 +177,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -180,41 +185,55 @@ RUN set -ex \ \ && rm -fr /usr/src/PROJ + +FROM builder as geos-builder + # geos -ARG PGIS_V1_GEOS_REPOSITORY -ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} -ARG PGIS_V1_GEOS_CHECKOUT -ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} -RUN set -ex \ +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir geos \ && cd geos \ && git init \ - && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local # gdal -ARG PGIS_V1_GDAL_REPOSITORY -ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} -ARG PGIS_V1_GDAL_CHECKOUT -ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ && git init \ - && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ @@ -238,7 +257,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -280,7 +299,7 @@ RUN set -ex \ && rm -fr /usr/src/gdal # Minimal command line test. -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -292,36 +311,36 @@ RUN set -ex \ && pcre-config --version # ------------------------------------------- -# STAGE final +# final stage # ------------------------------------------- -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 16-recentstack spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS - 15-recent spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG PGIS_V1_CMAKE_BUILD_TYPE -ARG PGIS_V1_BASE_IMAGE -ARG PGIS_V1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ - PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ - PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -347,29 +366,37 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /_pgis*.* / -COPY --from=builder /usr/local /usr/local - -ARG PGIS_V1_GDAL_CHECKOUT -ARG PGIS_V1_GDAL_REPOSITORY -ARG PGIS_V1_GEOS_CHECKOUT -ARG PGIS_V1_GEOS_REPOSITORY -ARG PGIS_V1_PROJ_CHECKOUT -ARG PGIS_V1_PROJ_REPOSITORY -ARG PGIS_V1_SFCGAL_CHECKOUT -ARG PGIS_V1_SFCGAL_REPOSITORY - -ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ - PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ - PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ - PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ - PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ - PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ - PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ - PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} # Minimal command line test ( fail fast ) -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -384,14 +411,12 @@ RUN set -ex \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# install postgis -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_REPOSITORY - -ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ - PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -429,8 +454,8 @@ RUN set -ex \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ @@ -509,7 +534,7 @@ COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin # last final test -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ diff --git a/15-recentstack/bookworm/initdb-postgis.sh b/15-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 15-recentstack/bookworm/initdb-postgis.sh rename to 15-recent/bookworm/initdb-postgis.sh diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags new file mode 100644 index 000000000..34c548669 --- /dev/null +++ b/15-recent/bookworm/tags @@ -0,0 +1 @@ +15-recent-bookworm 15-recent diff --git a/15-recentstack/bookworm/update-postgis.sh b/15-recent/bookworm/update-postgis.sh similarity index 100% rename from 15-recentstack/bookworm/update-postgis.sh rename to 15-recent/bookworm/update-postgis.sh diff --git a/15-recentstack/bookworm/tags b/15-recentstack/bookworm/tags deleted file mode 100644 index faa7a1924..000000000 --- a/15-recentstack/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-recentstack-bookworm 15-recentstack diff --git a/16-3.4-bundle/bookworm/tags b/16-3.4-bundle/bookworm/tags deleted file mode 100644 index 83e4de338..000000000 --- a/16-3.4-bundle/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle diff --git a/16-3.4-bundle/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile similarity index 53% rename from 16-3.4-bundle/bookworm/Dockerfile rename to 16-3.4-bundle0/bookworm/Dockerfile index 383cc568d..2e7f55f55 100644 --- a/16-3.4-bundle/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -1,6 +1,6 @@ # # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle.template" +# source: "Dockerfile.bundle0.template" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -16,28 +16,32 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm -ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS_V1_MOBILITYDB_CHECKOUT=tags/v1.1.0-alpha -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1=ae74a3f12757a768942c6a38ed774323bcd446ec +ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be +ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 +ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS_V1_TIMESCALEDB_CHECKOUT=tags/2.12.0 -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1=ec99b00f18a6cc636fc7ff6e4bcff870d4201c90 +ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 -FROM ${PGIS_V1_BASE_IMAGE} AS builder +ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -RUN set -ex \ +FROM ${PGIS1_BASE_IMAGE} AS builder + +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -62,6 +66,8 @@ RUN set -ex \ libkrb5-dev \ # pgsql-http libcurl4-gnutls-dev \ + # hydra (columnar) + liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw @@ -70,63 +76,69 @@ RUN set -ex \ && rm -rf /var/lib/apt/lists/* -ARG PGIS_V1_MOBILITYDB_REPOSITORY -ARG PGIS_V1_MOBILITYDB_CHECKOUT -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-http-gzip -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_HTTP_REPOSITORY +ARG PGIS1_PGSQL_HTTP_CHECKOUT +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY -ARG PGIS_V1_TIMESCALEDB_REPOSITORY -ARG PGIS_V1_TIMESCALEDB_CHECKOUT -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_GZIP_REPOSITORY +ARG PGIS1_PGSQL_GZIP_CHECKOUT +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-gzip \ && cd pgsql-gzip \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_gzip_last_commit.txt \ && make -j$(nproc) \ && make install -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-http \ && cd pgsql-http \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_http_last_commit.txt \ && make -j$(nproc) \ && make install +FROM builder as builder-timescaledb + +ARG PGIS1_TIMESCALEDB_APACHE_ONLY +ARG PGIS1_TIMESCALEDB_REPOSITORY +ARG PGIS1_TIMESCALEDB_CHECKOUT +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 + # Timescaledb not supported on pg16 yet +FROM builder as builder-mobilitydb + +ARG PGIS1_MOBILITYDB_REPOSITORY +ARG PGIS1_MOBILITYDB_CHECKOUT +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 + # Install MobilityDB -RUN set -ex \ +RUN set -eux \ && mkdir -p /MobilityDB \ && cd MobilityDB \ && git init \ - && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_MobilityDB_last_commit.txt \ && mkdir build \ && cd build \ @@ -137,36 +149,51 @@ RUN set -ex \ && make -j$(nproc) \ && make install -RUN pgxn install ddlx -RUN pgxn install h3 # https://github.com/zachasme/h3-pg -RUN pgxn install json_accessors -RUN pgxn install lostgis -RUN pgxn install parray_gin -RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install pg_roaringbitmap -RUN pgxn install pg_rowalesce -RUN pgxn install pg_uuidv7 -RUN pgxn install pg_xenophile -RUN pgxn install pg_xxhash -RUN pgxn install pgsql_tweaks + +FROM builder as builder-pgxn + +RUN pgxn install --verbose ddlx +RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +RUN pgxn install --verbose json_accessors +RUN pgxn install --verbose lostgis +RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install --verbose pg_roaringbitmap +RUN pgxn install --verbose pg_rowalesce +RUN pgxn install --verbose pg_uuidv7 +RUN pgxn install --verbose pg_xenophile +RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsql_tweaks # sqlite_fdw not supported on pg16 yet # RUN USE_PGXS=1 pgxn install sqlite_fdw -RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git +FROM builder as builder-other -#TODO: add https://github.com/hydradatabase/hydra -# https://github.com/powa-team/pg_qualstats -# https://github.com/darold/pgtt -# https://github.com/apache/arrow-flight-sql-postgresql -# https://github.com/neondatabase/pg_embedding/ -# pgrust ; "pg-graphql -# https://github.com/kelvich/pg_tiktoken -# -# -------------------------------------------------------------- +ARG PGIS1_PG_HINT_PLAN_REPOSITORY +ARG PGIS1_PG_HINT_PLAN_CHECKOUT +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + +# PG16 + hydra not supperted https://github.com/hydradatabase/hydra + +# install pg_hint_plan +RUN set -eux \ + && mkdir pg_hint_plan \ + && cd pg_hint_plan \ + && git init \ + && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ + && make -j$(nproc) \ + && make install + +RUN set -eux \ + && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm @@ -177,12 +204,11 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -#TODO - uncomment -RUN set -ex \ +RUN set -eux \ && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ \ @@ -275,18 +301,31 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +# Install from stages +COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -# Install MobilityDB,Timescaledb,h3,etc from builder -COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba # check any missing dependencies -RUN set -ex \ +RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true # multiple LLVM existance is not allowed. -RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ +RUN set -eux \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ echo "More than one llvm package or none at all found. Stopping."; \ dpkg -l | grep llvm ; \ @@ -294,10 +333,10 @@ RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ fi # add MobilityDB requirements -RUN set -eux; \ - cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ +RUN set -eux \ + && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) - echo "shared_preload_libraries = 'postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags new file mode 100644 index 000000000..451463d9f --- /dev/null +++ b/16-3.4-bundle0/bookworm/tags @@ -0,0 +1 @@ +16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index fbaef91ef..589a5ee85 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -4,23 +4,23 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS_V1_BASE_IMAGE=postgres:16-alpine3.18 -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0 -ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 +# ENV POSTGIS_VERSION 3.4.0 +# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -54,9 +54,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -76,11 +75,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -140,8 +139,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile index 4d4ac31a2..8231a9b1c 100644 --- a/16-3.4/bookworm/Dockerfile +++ b/16-3.4/bookworm/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile index d32955361..0e262ba45 100644 --- a/16-3.4/bullseye/Dockerfile +++ b/16-3.4/bullseye/Dockerfile @@ -12,7 +12,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR 3 ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index f02080ec2..a0adaeffd 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -6,48 +6,48 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS_V1_BASE_IMAGE=postgres:16-bookworm +ARG PGIS1_BASE_IMAGE=postgres:16-bookworm -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git -ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_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_PROJ_CHECKOUT=2040e685f5ab9c2958b7b611f5aaafee21fed82f -ARG PGIS_V1_SFCGAL_CHECKOUT=35f72d2f52b4253013201b170467757b0fc355e5 -ARG PGIS_V1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c +ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a +ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 +ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e +ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4 +ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa +ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c -ARG PGIS_V1_BOOST_VERSION=1.74.0 +ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS_V1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_CMAKE_BUILD_TYPE=Release -FROM ${PGIS_V1_BASE_IMAGE} as builder +FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / -ARG PGIS_V1_BOOST_VERSION -ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -98,42 +98,44 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG PGIS_V1_CMAKE_BUILD_TYPE -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder # cgal & sfcgal -ARG PGIS_V1_SFCGAL_REPOSITORY -ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} -ARG PGIS_V1_SFCGAL_CHECKOUT -ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS_V1_CGAL_REPOSITORY -ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} -ARG PGIS_V1_CGAL_CHECKOUT -ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir cgal \ && cd cgal \ && git init \ - && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ && cd SFCGAL \ && git init \ - && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ @@ -144,18 +146,21 @@ RUN set -ex \ && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal + +FROM builder as proj-builder + # proj -ARG PGIS_V1_PROJ_REPOSITORY -ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} -ARG PGIS_V1_PROJ_CHECKOUT -ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} -RUN set -ex \ +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ && cd PROJ \ && git init \ - && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 @@ -172,7 +177,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -180,41 +185,55 @@ RUN set -ex \ \ && rm -fr /usr/src/PROJ + +FROM builder as geos-builder + # geos -ARG PGIS_V1_GEOS_REPOSITORY -ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} -ARG PGIS_V1_GEOS_CHECKOUT -ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} -RUN set -ex \ +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir geos \ && cd geos \ && git init \ - && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local # gdal -ARG PGIS_V1_GDAL_REPOSITORY -ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} -ARG PGIS_V1_GDAL_CHECKOUT -ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ && git init \ - && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ @@ -238,7 +257,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -280,7 +299,7 @@ RUN set -ex \ && rm -fr /usr/src/gdal # Minimal command line test. -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -292,36 +311,36 @@ RUN set -ex \ && pcre-config --version # ------------------------------------------- -# STAGE final +# final stage # ------------------------------------------- -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS - 16-master spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG PGIS_V1_CMAKE_BUILD_TYPE -ARG PGIS_V1_BASE_IMAGE -ARG PGIS_V1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ - PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ - PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -347,29 +366,37 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /_pgis*.* / -COPY --from=builder /usr/local /usr/local - -ARG PGIS_V1_GDAL_CHECKOUT -ARG PGIS_V1_GDAL_REPOSITORY -ARG PGIS_V1_GEOS_CHECKOUT -ARG PGIS_V1_GEOS_REPOSITORY -ARG PGIS_V1_PROJ_CHECKOUT -ARG PGIS_V1_PROJ_REPOSITORY -ARG PGIS_V1_SFCGAL_CHECKOUT -ARG PGIS_V1_SFCGAL_REPOSITORY - -ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ - PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ - PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ - PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ - PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ - PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ - PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ - PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} # Minimal command line test ( fail fast ) -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -384,14 +411,12 @@ RUN set -ex \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# install postgis -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_REPOSITORY - -ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ - PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -429,8 +454,8 @@ RUN set -ex \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ @@ -509,7 +534,7 @@ COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin # last final test -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ diff --git a/15-recentstack/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile similarity index 65% rename from 15-recentstack/bookworm/Dockerfile rename to 16-recent/bookworm/Dockerfile index ca7c41481..a7dab8de3 100644 --- a/15-recentstack/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -6,48 +6,48 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS_V1_BASE_IMAGE=postgres:15-bookworm +ARG PGIS1_BASE_IMAGE=postgres:16-bookworm -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git -ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS_V1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS_V1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS_V1_GDAL_CHECKOUT=tags/v3.7.2 -ARG PGIS_V1_PROJ_CHECKOUT=tags/9.3.0 -ARG PGIS_V1_SFCGAL_CHECKOUT=tags/v1.4.1 -ARG PGIS_V1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS_V1_BOOST_VERSION=1.74.0 +ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS_V1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_CMAKE_BUILD_TYPE=Release -FROM ${PGIS_V1_BASE_IMAGE} as builder +FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / -ARG PGIS_V1_BOOST_VERSION -ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -98,42 +98,44 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG PGIS_V1_CMAKE_BUILD_TYPE -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder # cgal & sfcgal -ARG PGIS_V1_SFCGAL_REPOSITORY -ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} -ARG PGIS_V1_SFCGAL_CHECKOUT -ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS_V1_CGAL_REPOSITORY -ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} -ARG PGIS_V1_CGAL_CHECKOUT -ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir cgal \ && cd cgal \ && git init \ - && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ && cd SFCGAL \ && git init \ - && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ @@ -144,18 +146,21 @@ RUN set -ex \ && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal + +FROM builder as proj-builder + # proj -ARG PGIS_V1_PROJ_REPOSITORY -ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} -ARG PGIS_V1_PROJ_CHECKOUT -ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} -RUN set -ex \ +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ && cd PROJ \ && git init \ - && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 @@ -172,7 +177,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -180,41 +185,55 @@ RUN set -ex \ \ && rm -fr /usr/src/PROJ + +FROM builder as geos-builder + # geos -ARG PGIS_V1_GEOS_REPOSITORY -ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} -ARG PGIS_V1_GEOS_CHECKOUT -ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} -RUN set -ex \ +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir geos \ && cd geos \ && git init \ - && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local # gdal -ARG PGIS_V1_GDAL_REPOSITORY -ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} -ARG PGIS_V1_GDAL_CHECKOUT -ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ && git init \ - && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ @@ -238,7 +257,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -280,7 +299,7 @@ RUN set -ex \ && rm -fr /usr/src/gdal # Minimal command line test. -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -292,36 +311,36 @@ RUN set -ex \ && pcre-config --version # ------------------------------------------- -# STAGE final +# final stage # ------------------------------------------- -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 15-recentstack spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS - 16-recent spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG PGIS_V1_CMAKE_BUILD_TYPE -ARG PGIS_V1_BASE_IMAGE -ARG PGIS_V1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ - PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ - PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -347,29 +366,37 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /_pgis*.* / -COPY --from=builder /usr/local /usr/local - -ARG PGIS_V1_GDAL_CHECKOUT -ARG PGIS_V1_GDAL_REPOSITORY -ARG PGIS_V1_GEOS_CHECKOUT -ARG PGIS_V1_GEOS_REPOSITORY -ARG PGIS_V1_PROJ_CHECKOUT -ARG PGIS_V1_PROJ_REPOSITORY -ARG PGIS_V1_SFCGAL_CHECKOUT -ARG PGIS_V1_SFCGAL_REPOSITORY - -ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ - PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ - PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ - PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ - PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ - PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ - PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ - PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} # Minimal command line test ( fail fast ) -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -384,14 +411,12 @@ RUN set -ex \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# install postgis -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_REPOSITORY - -ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ - PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -429,8 +454,8 @@ RUN set -ex \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ @@ -509,7 +534,7 @@ COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin # last final test -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ diff --git a/16-recentstack/bookworm/initdb-postgis.sh b/16-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 16-recentstack/bookworm/initdb-postgis.sh rename to 16-recent/bookworm/initdb-postgis.sh diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags new file mode 100644 index 000000000..fc0f1d47f --- /dev/null +++ b/16-recent/bookworm/tags @@ -0,0 +1 @@ +16-recent-bookworm 16-recent diff --git a/16-recentstack/bookworm/update-postgis.sh b/16-recent/bookworm/update-postgis.sh similarity index 100% rename from 16-recentstack/bookworm/update-postgis.sh rename to 16-recent/bookworm/update-postgis.sh diff --git a/16-recentstack/bookworm/tags b/16-recentstack/bookworm/tags deleted file mode 100644 index ee11770cb..000000000 --- a/16-recentstack/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-recentstack-bookworm 16-recentstack diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 7a6e8a0c7..73a865b65 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -1,21 +1,21 @@ -ARG PGIS_V1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} +ARG PGIS1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} +ARG PGIS1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} -ARG PGIS_V1_POSTGIS_REPOSITORY -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS {{ .[env.variant].POSTGIS_VERSION }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} -ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }} +# ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} +# ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }} RUN set -eux \ # && apk add --no-cache --virtual .fetch-deps \ @@ -49,9 +49,8 @@ RUN set -eux \ \ autoconf \ automake \ + bison \ cunit-dev \ - docbook-xml \ - docbook5-xml \ file \ g++ \ gcc \ @@ -71,11 +70,11 @@ RUN set -eux \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ @@ -135,8 +134,12 @@ RUN set -eux \ ca-certificates \ # clean && cd / \ - && rm -rf /usr/src/postgis \ - && apk del .fetch-deps .build-deps \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ # At the end of the build, we print the collected information # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt diff --git a/Dockerfile.bundle.template b/Dockerfile.bundle0.template similarity index 55% rename from Dockerfile.bundle.template rename to Dockerfile.bundle0.template index 4a2cc2c20..211260b6c 100644 --- a/Dockerfile.bundle.template +++ b/Dockerfile.bundle0.template @@ -11,28 +11,32 @@ ARG REGISTRY={{ env.REGISTRY }} ARG REPO_NAME={{ env.REPO_NAME }} ARG IMAGE_NAME={{ env.IMAGE_NAME }} -ARG PGIS_V1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} -ARG PGIS_V1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS_V1_MOBILITYDB_CHECKOUT={{ .[env.variant].MOBILITYDB_CHECKOUT }} -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1={{ .[env.variant].MOBILITYDB_CHECKOUT_SHA1 }} +ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git +ARG PGIS1_MOBILITYDB_CHECKOUT={{ .[env.variant].MOBILITYDB_CHECKOUT }} +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1={{ .[env.variant].MOBILITYDB_CHECKOUT_SHA1 }} -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT={{ .[env.variant].PGSQL_HTTP_CHECKOUT }} -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_HTTP_CHECKOUT_SHA1 }} +ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git +ARG PGIS1_PGSQL_HTTP_CHECKOUT={{ .[env.variant].PGSQL_HTTP_CHECKOUT }} +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_HTTP_CHECKOUT_SHA1 }} -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT={{ .[env.variant].PGSQL_GZIP_CHECKOUT }} -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_GZIP_CHECKOUT_SHA1 }} +ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS1_PGSQL_GZIP_CHECKOUT={{ .[env.variant].PGSQL_GZIP_CHECKOUT }} +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_GZIP_CHECKOUT_SHA1 }} -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS_V1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS_V1_TIMESCALEDB_CHECKOUT={{ .[env.variant].TIMESCALEDB_CHECKOUT }} -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1={{ .[env.variant].TIMESCALEDB_CHECKOUT_SHA1 }} +ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false +ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git +ARG PGIS1_TIMESCALEDB_CHECKOUT={{ .[env.variant].TIMESCALEDB_CHECKOUT }} +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1={{ .[env.variant].TIMESCALEDB_CHECKOUT_SHA1 }} -FROM ${PGIS_V1_BASE_IMAGE} AS builder +ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git +ARG PGIS1_PG_HINT_PLAN_CHECKOUT={{ .[env.variant].PG_HINT_PLAN_CHECKOUT }} +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1={{ .[env.variant].PG_HINT_PLAN_CHECKOUT_SHA1 }} -RUN set -ex \ +FROM ${PGIS1_BASE_IMAGE} AS builder + +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -57,6 +61,8 @@ RUN set -ex \ libkrb5-dev \ # pgsql-http libcurl4-gnutls-dev \ + # hydra (columnar) + liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw @@ -65,70 +71,70 @@ RUN set -ex \ && rm -rf /var/lib/apt/lists/* -ARG PGIS_V1_MOBILITYDB_REPOSITORY -ARG PGIS_V1_MOBILITYDB_CHECKOUT -ARG PGIS_V1_MOBILITYDB_CHECKOUT_SHA1 - -ARG PGIS_V1_PGSQL_HTTP_REPOSITORY -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT -ARG PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-http-gzip -ARG PGIS_V1_PGSQL_GZIP_REPOSITORY -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT -ARG PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_HTTP_REPOSITORY +ARG PGIS1_PGSQL_HTTP_CHECKOUT +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 -ARG PGIS_V1_TIMESCALEDB_APACHE_ONLY -ARG PGIS_V1_TIMESCALEDB_REPOSITORY -ARG PGIS_V1_TIMESCALEDB_CHECKOUT -ARG PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1 +ARG PGIS1_PGSQL_GZIP_REPOSITORY +ARG PGIS1_PGSQL_GZIP_CHECKOUT +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-gzip \ && cd pgsql-gzip \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_GZIP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_gzip_last_commit.txt \ && make -j$(nproc) \ && make install -RUN set -ex \ +RUN set -eux \ && mkdir -p /pgsql-http \ && cd pgsql-http \ && git init \ - && git remote add origin ${PGIS_V1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PGSQL_HTTP_CHECKOUT} \ + && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgsql_http_last_commit.txt \ && make -j$(nproc) \ && make install +FROM builder as builder-timescaledb + +ARG PGIS1_TIMESCALEDB_APACHE_ONLY +ARG PGIS1_TIMESCALEDB_REPOSITORY +ARG PGIS1_TIMESCALEDB_CHECKOUT +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 + {{ if env.version | startswith("16") then ( -}} # Timescaledb not supported on pg16 yet {{ ) else ( -}} # Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -ex \ +RUN set -eux \ && mkdir -p /timescaledb \ && cd timescaledb \ && git init \ - && git remote add origin ${PGIS_V1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_TIMESCALEDB_CHECKOUT} \ + && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_timescaledb_last_commit.txt \ && ./bootstrap \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ \ - -DAPACHE_ONLY=${PGIS_V1_TIMESCALEDB_APACHE_ONLY} \ + -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ -DREGRESS_CHECKS=OFF \ -DSEND_TELEMETRY_DEFAULT=NO \ -DTAP_CHECKS=OFF \ @@ -141,16 +147,22 @@ RUN set -ex \ {{ ) end -}} +FROM builder as builder-mobilitydb + +ARG PGIS1_MOBILITYDB_REPOSITORY +ARG PGIS1_MOBILITYDB_CHECKOUT +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 + # Install MobilityDB -RUN set -ex \ +RUN set -eux \ && mkdir -p /MobilityDB \ && cd MobilityDB \ && git init \ - && git remote add origin ${PGIS_V1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_MOBILITYDB_CHECKOUT} \ + && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS_V1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_MobilityDB_last_commit.txt \ && mkdir build \ && cd build \ @@ -161,18 +173,21 @@ RUN set -ex \ && make -j$(nproc) \ && make install -RUN pgxn install ddlx -RUN pgxn install h3 # https://github.com/zachasme/h3-pg -RUN pgxn install json_accessors -RUN pgxn install lostgis -RUN pgxn install parray_gin -RUN pgxn install pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install pg_roaringbitmap -RUN pgxn install pg_rowalesce -RUN pgxn install pg_uuidv7 -RUN pgxn install pg_xenophile -RUN pgxn install pg_xxhash -RUN pgxn install pgsql_tweaks + +FROM builder as builder-pgxn + +RUN pgxn install --verbose ddlx +RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +RUN pgxn install --verbose json_accessors +RUN pgxn install --verbose lostgis +RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install --verbose pg_roaringbitmap +RUN pgxn install --verbose pg_rowalesce +RUN pgxn install --verbose pg_uuidv7 +RUN pgxn install --verbose pg_xenophile +RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsql_tweaks {{ if env.version | startswith("16") then ( -}} # sqlite_fdw not supported on pg16 yet @@ -181,20 +196,43 @@ RUN pgxn install pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw {{ ) end -}} -RUN git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git +FROM builder as builder-other -#TODO: add https://github.com/hydradatabase/hydra -# https://github.com/powa-team/pg_qualstats -# https://github.com/darold/pgtt -# https://github.com/apache/arrow-flight-sql-postgresql -# https://github.com/neondatabase/pg_embedding/ -# pgrust ; "pg-graphql -# https://github.com/kelvich/pg_tiktoken -# -# -------------------------------------------------------------- +ARG PGIS1_PG_HINT_PLAN_REPOSITORY +ARG PGIS1_PG_HINT_PLAN_CHECKOUT +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + +{{ if env.version | startswith("16") then ( -}} +# PG16 + hydra not supperted https://github.com/hydradatabase/hydra +{{ ) else ( -}} +# add add https://github.com/hydradatabase/hydra +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && cd hydra/columnar \ + && git checkout main \ + && ./configure \ + && make -j$(nproc) \ + && make install +{{ ) end -}} + +# install pg_hint_plan +RUN set -eux \ + && mkdir pg_hint_plan \ + && cd pg_hint_plan \ + && git init \ + && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ + && make -j$(nproc) \ + && make install + +RUN set -eux \ + && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} @@ -205,12 +243,11 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -#TODO - uncomment -RUN set -ex \ +RUN set -eux \ && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ \ @@ -312,18 +349,31 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +# Install from stages +COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -# Install MobilityDB,Timescaledb,h3,etc from builder -COPY --from=builder /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba # check any missing dependencies -RUN set -ex \ +RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true # multiple LLVM existance is not allowed. -RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ +RUN set -eux \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ echo "More than one llvm package or none at all found. Stopping."; \ dpkg -l | grep llvm ; \ @@ -331,14 +381,14 @@ RUN llvm_count=$(dpkg -l | grep llvm | wc -l) \ fi # add MobilityDB requirements -RUN set -eux; \ - cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ +RUN set -eux \ + && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ {{ if env.version | startswith("16") then ( -}} # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) - echo "shared_preload_libraries = 'postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ {{ ) else ( -}} # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ {{ ) end -}} # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ diff --git a/Dockerfile.debian.template b/Dockerfile.debian.template index ef8a47bc8..0d37b61cc 100644 --- a/Dockerfile.debian.template +++ b/Dockerfile.debian.template @@ -7,7 +7,8 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ENV POSTGIS_MAJOR {{ .[env.variant].POSTGIS_MAJOR }} ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} -RUN apt-get update \ +RUN set -eux \ + && apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ && apt-get install -y --no-install-recommends \ # ca-certificates: for accessing remote raster files; diff --git a/Dockerfile.master.template b/Dockerfile.master.template index d19f95a9e..c8fdf1d2a 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -1,48 +1,48 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS_V1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +ARG PGIS1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} -ARG PGIS_V1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS_V1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS_V1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS_V1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS_V1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git -ARG PGIS_V1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS_V1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} -ARG PGIS_V1_GEOS_CHECKOUT={{ .[env.variant].GEOS_CHECKOUT }} -ARG PGIS_V1_GDAL_CHECKOUT={{ .[env.variant].GDAL_CHECKOUT }} -ARG PGIS_V1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} -ARG PGIS_V1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} -ARG PGIS_V1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} +ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} +ARG PGIS1_GEOS_CHECKOUT={{ .[env.variant].GEOS_CHECKOUT }} +ARG PGIS1_GDAL_CHECKOUT={{ .[env.variant].GDAL_CHECKOUT }} +ARG PGIS1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} +ARG PGIS1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} +ARG PGIS1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} -ARG PGIS_V1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} +ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} -ARG PGIS_V1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_CMAKE_BUILD_TYPE=Release -FROM ${PGIS_V1_BASE_IMAGE} as builder +FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / -ARG PGIS_V1_BOOST_VERSION -ENV PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -97,42 +97,44 @@ RUN set -ex \ libwebp-dev \ libzstd-dev -ARG PGIS_V1_CMAKE_BUILD_TYPE -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder # cgal & sfcgal -ARG PGIS_V1_SFCGAL_REPOSITORY -ENV PGIS_V1_SFCGAL_REPOSITORY ${PGIS_V1_SFCGAL_REPOSITORY} -ARG PGIS_V1_SFCGAL_CHECKOUT -ENV PGIS_V1_SFCGAL_CHECKOUT ${PGIS_V1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS_V1_CGAL_REPOSITORY -ENV PGIS_V1_CGAL_REPOSITORY ${PGIS_V1_CGAL_REPOSITORY} -ARG PGIS_V1_CGAL_CHECKOUT -ENV PGIS_V1_CGAL_CHECKOUT ${PGIS_V1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir cgal \ && cd cgal \ && git init \ - && git remote add origin ${PGIS_V1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_CGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ && cd SFCGAL \ && git init \ - && git remote add origin ${PGIS_V1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_SFCGAL_CHECKOUT} \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ && cmake .. \ -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ -DSFCGAL_BUILD_BENCH=OFF \ -DSFCGAL_BUILD_EXAMPLES=OFF \ -DSFCGAL_BUILD_TESTS=OFF \ @@ -143,18 +145,21 @@ RUN set -ex \ && rm -fr /usr/src/SFCGAL \ && rm -fr /usr/src/cgal + +FROM builder as proj-builder + # proj -ARG PGIS_V1_PROJ_REPOSITORY -ENV PGIS_V1_PROJ_REPOSITORY ${PGIS_V1_PROJ_REPOSITORY} -ARG PGIS_V1_PROJ_CHECKOUT -ENV PGIS_V1_PROJ_CHECKOUT ${PGIS_V1_PROJ_CHECKOUT} -RUN set -ex \ +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ && cd PROJ \ && git init \ - && git remote add origin ${PGIS_V1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_PROJ_CHECKOUT} \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 @@ -171,7 +176,7 @@ RUN set -ex \ && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ && mkdir build \ && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ ; \ @@ -179,41 +184,55 @@ RUN set -ex \ \ && rm -fr /usr/src/PROJ + +FROM builder as geos-builder + # geos -ARG PGIS_V1_GEOS_REPOSITORY -ENV PGIS_V1_GEOS_REPOSITORY ${PGIS_V1_GEOS_REPOSITORY} -ARG PGIS_V1_GEOS_CHECKOUT -ENV PGIS_V1_GEOS_CHECKOUT ${PGIS_V1_GEOS_CHECKOUT} -RUN set -ex \ +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +RUN set -eux \ && cd /usr/src \ && mkdir geos \ && cd geos \ && git init \ - && git remote add origin ${PGIS_V1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GEOS_CHECKOUT} \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ && make -j$(nproc) \ && make install \ && cd / \ && rm -fr /usr/src/geos + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local # gdal -ARG PGIS_V1_GDAL_REPOSITORY -ENV PGIS_V1_GDAL_REPOSITORY ${PGIS_V1_GDAL_REPOSITORY} -ARG PGIS_V1_GDAL_CHECKOUT -ENV PGIS_V1_GDAL_CHECKOUT ${PGIS_V1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -RUN set -ex \ +RUN set -eux \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ && git init \ - && git remote add origin ${PGIS_V1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_GDAL_CHECKOUT} \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ @@ -237,7 +256,7 @@ RUN set -ex \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ @@ -279,7 +298,7 @@ RUN set -ex \ && rm -fr /usr/src/gdal # Minimal command line test. -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -291,36 +310,36 @@ RUN set -ex \ && pcre-config --version # ------------------------------------------- -# STAGE final +# final stage # ------------------------------------------- -FROM ${PGIS_V1_BASE_IMAGE} +FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS - {{ env.version }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ARG PGIS_V1_CMAKE_BUILD_TYPE -ARG PGIS_V1_BASE_IMAGE -ARG PGIS_V1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION -ENV PGIS_V1_CMAKE_BUILD_TYPE=${PGIS_V1_CMAKE_BUILD_TYPE} \ - PGIS_V1_BASE_IMAGE=${PGIS_V1_BASE_IMAGE} \ - PGIS_V1_BOOST_VERSION=${PGIS_V1_BOOST_VERSION} +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ - libboost-atomic${PGIS_V1_BOOST_VERSION} \ - libboost-chrono${PGIS_V1_BOOST_VERSION} \ - libboost-date-time${PGIS_V1_BOOST_VERSION} \ - libboost-filesystem${PGIS_V1_BOOST_VERSION} \ - libboost-program-options${PGIS_V1_BOOST_VERSION} \ - libboost-serialization${PGIS_V1_BOOST_VERSION} \ - libboost-system${PGIS_V1_BOOST_VERSION} \ - libboost-test${PGIS_V1_BOOST_VERSION} \ - libboost-thread${PGIS_V1_BOOST_VERSION} \ - libboost-timer${PGIS_V1_BOOST_VERSION} \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ libcurl3-gnutls \ libexpat1 \ libgmp10 \ @@ -354,29 +373,37 @@ RUN set -ex \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /_pgis*.* / -COPY --from=builder /usr/local /usr/local - -ARG PGIS_V1_GDAL_CHECKOUT -ARG PGIS_V1_GDAL_REPOSITORY -ARG PGIS_V1_GEOS_CHECKOUT -ARG PGIS_V1_GEOS_REPOSITORY -ARG PGIS_V1_PROJ_CHECKOUT -ARG PGIS_V1_PROJ_REPOSITORY -ARG PGIS_V1_SFCGAL_CHECKOUT -ARG PGIS_V1_SFCGAL_REPOSITORY - -ENV PGIS_V1_GDAL_CHECKOUT=${PGIS_V1_GDAL_CHECKOUT} \ - PGIS_V1_GDAL_REPOSITORY=${PGIS_V1_GDAL_REPOSITORY} \ - PGIS_V1_GEOS_CHECKOUT=${PGIS_V1_GEOS_CHECKOUT} \ - PGIS_V1_GEOS_REPOSITORY=${PGIS_V1_GEOS_REPOSITORY} \ - PGIS_V1_PROJ_CHECKOUT=${PGIS_V1_PROJ_CHECKOUT} \ - PGIS_V1_PROJ_REPOSITORY=${PGIS_V1_PROJ_REPOSITORY} \ - PGIS_V1_SFCGAL_CHECKOUT=${PGIS_V1_SFCGAL_CHECKOUT} \ - PGIS_V1_SFCGAL_REPOSITORY=${PGIS_V1_SFCGAL_REPOSITORY} +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} # Minimal command line test ( fail fast ) -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ @@ -391,14 +418,12 @@ RUN set -ex \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# install postgis -ARG PGIS_V1_POSTGIS_CHECKOUT -ARG PGIS_V1_POSTGIS_REPOSITORY - -ENV PGIS_V1_POSTGIS_CHECKOUT=${PGIS_V1_POSTGIS_CHECKOUT} \ - PGIS_V1_POSTGIS_REPOSITORY=${PGIS_V1_POSTGIS_REPOSITORY} +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen -RUN set -ex \ +RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -436,8 +461,8 @@ RUN set -ex \ && mkdir postgis \ && cd postgis \ && git init \ - && git remote add origin ${PGIS_V1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS_V1_POSTGIS_CHECKOUT} \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ @@ -516,7 +541,7 @@ COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin # last final test -RUN set -ex \ +RUN set -eux \ && ldconfig \ && cs2cs \ && ldd $(which gdalinfo) \ diff --git a/Makefile b/Makefile index 5f97d0264..190887a2d 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ test: $(foreach dir,$(DOCKERFILE_DIRS),test-$(word 1,$(subst /, ,$(dir)))-$(word # -------------------------------------------------- # Push targets for each version-variant combination define push-target -push-$(1)-$(2): $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),push-$(shell echo $(1) | cut -d- -f1,2)-$(2)) +push-$(1)-$(2): $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),push-$(shell echo $(1) | cut -d- -f1,2)-$(2)) @echo '::push $(1)/$(2)' # push all image tags $(foreach tag,$(shell cat $(1)/$(2)/tags), \ diff --git a/README.md b/README.md index 4b078daa4..41c978852 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-14) We provide multi-platform image support for the following architectures: @@ -87,29 +87,29 @@ For those new to PostGIS, we recommend the following image versions: -### 🧪Recentstack ( experimental ) +### 🧪Recent ( experimental ) - + | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recentstack-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recentstack-bookworm), [`15-recentstack`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recentstack) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recentstack/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recentstack: latest tagged postgis, geos, proj, gdal | -| [`16-recentstack-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recentstack-bookworm), [`16-recentstack`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recentstack) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recentstack/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recentstack: latest tagged postgis, geos, proj, gdal | - +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | + ### 🧪Debian Geo Bundle ( experimental ) This repository provides Debian-based PostGIS Docker images enriched with additional geospatial packages such as [pgRouting](https://pgrouting.org/), [h3-pg]( https://github.com/zachasme/h3-pg), [pgsql-ogr-fdw](https://github.com/pramsey/pgsql-ogr-fdw), [MobilityDB](https://mobilitydb.com/), [PL/Python3](https://www.postgresql.org/docs/current/plpython.html), [pgPointcloud](https://pgpointcloud.github.io/pointcloud/), [pgVector](https://github.com/pgvector/pgvector), [TimeScaleDB](https://www.timescale.com/) and others. These images serve as a comprehensive solution for various server side geospatial needs. -Please note that the included package list is subject to change as we continue to refine the bundle. +Please note that the included package list is subject to change as we continue to refine the 'bundle0'. - + + | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`13-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bundle-bookworm), [`13-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bundle-bookworm), [`13-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | -| [`14-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle-bookworm), [`14-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle-bookworm), [`14-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle-bookworm), [`15-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle-bookworm), [`15-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle), [`bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle-bookworm), [`16-3.4.0-bundle-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle-bookworm), [`16-3.4-bundle`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | - +| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | + ### ⛰️Alpine based diff --git a/apply-readme.sh b/apply-readme.sh index 887f13e39..282a75924 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -10,7 +10,7 @@ versions=$(jq 'keys[]' "$input_file") distinct_variants=$(jq -r 'to_entries[] | .value | keys[]' "$input_file" | sort -u) rm -f _dockerlists_*.md -for readme_group in $distinct_variants recentstack bundle test; do +for readme_group in $distinct_variants recent bundle0 test; do echo "init _dockerlists_${readme_group}.md" echo "| \`$dockername:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md echo "| ---- | :-: | :-: | :-: | :-: | :-: |" >>_dockerlists_"${readme_group}".md @@ -31,8 +31,8 @@ for version in $versions; do if [[ "$postgis" == "master" ]]; then POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal" - elif [[ "$postgis" == "recentstack" ]]; then - POSTGIS_DOC_VERSION="..recentstack: latest tagged postgis, geos, proj, gdal" + elif [[ "$postgis" == "recent" ]]; then + POSTGIS_DOC_VERSION="..recent: latest tagged postgis, geos, proj, gdal" else POSTGIS_DOC_VERSION=$(echo "$POSTGIS_VERSION" | awk -F'[+-]' '{print $1}') fi @@ -54,7 +54,7 @@ echo "|-------------------------|" echo "|- Generated images -|" echo "|-------------------------|" -for readme_group in $distinct_variants recentstack bundle test; do +for readme_group in $distinct_variants recent bundle0 test; do echo " " echo "---- ${readme_group} ----" cat _dockerlists_"${readme_group}".md @@ -65,7 +65,7 @@ done TODAY=$(date +%Y-%m-%d) sed -i -r "s/(## Versions) \([0-9]{4}-[0-9]{2}-[0-9]{2}\)/\1 ($TODAY)/g" README.md # Replace content between the special comments in README.md for each readme_group -for readme_group in $distinct_variants recentstack bundle test; do +for readme_group in $distinct_variants recent bundle0 test; do echo "## ${readme_group} ##" awk -v readme_group="$readme_group" -v content="$(<_dockerlists_"${readme_group}".md)" ' $0 ~ "" {print; print content; f=1; next} diff --git a/localtest.sh b/localtest.sh index 89d54ee93..f38f95f16 100755 --- a/localtest.sh +++ b/localtest.sh @@ -33,20 +33,17 @@ echo " ------- .env.test -------- " cat .env.test echo " -------------------------- " -# generate,update -# versions.json, Dockerfiles, README.md, .github/workflows/main.yml .circleci/config.yml - ./update.sh # check commands -make -n test-15-3.4-bundle-bookworm -make -n push-15-3.4-bundle-bookworm -make -n manifest-15-3.4-bundle-bookworm +make -n test-15-3.4-bundle0-bookworm +make -n push-15-3.4-bundle0-bookworm +make -n manifest-15-3.4-bundle0-bookworm # run commands -make test-15-3.4-bundle-bookworm -make push-15-3.4-bundle-bookworm -make manifest-15-3.4-bundle-bookworm +make test-15-3.4-bundle0-bookworm +make push-15-3.4-bundle0-bookworm +make manifest-15-3.4-bundle0-bookworm # check images echo " " @@ -65,7 +62,7 @@ echo "done." # manual tests cheetsheets: # ---------------------------- -# REGISTRY=localhost:5000 make push-15-3.4-bundle -# REGISTRY=localhost:5000 make push-15-3.4-bundle-bookworm -# TEST=true make push-15-3.4-bundle-bookworm +# REGISTRY=localhost:5000 make push-15-3.4-bundle0 +# REGISTRY=localhost:5000 make push-15-3.4-bundle0-bookworm +# TEST=true make push-15-3.4-bundle0-bookworm # diff --git a/manifest.sh b/manifest.sh index 7f9037713..3255c7028 100755 --- a/manifest.sh +++ b/manifest.sh @@ -174,26 +174,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.0-bullseye \ --target ${dockername}:13-3.4.0-bullseye || true -# ----- 13-3.4-bundle-bookworm ----- - -echo "manifest: ${dockername}:13-3.4-bundle-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bundle-bookworm \ - --target ${dockername}:13-3.4-bundle-bookworm || true - -echo "manifest: ${dockername}:13-3.4.0-bundle-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.0-bundle-bookworm \ - --target ${dockername}:13-3.4.0-bundle-bookworm || true - -echo "manifest: ${dockername}:13-3.4-bundle" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bundle \ - --target ${dockername}:13-3.4-bundle || true - # ----- 14-3.4-alpine3.18 ----- echo "manifest: ${dockername}:14-3.4-alpine3.18" @@ -248,25 +228,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.0-bullseye \ --target ${dockername}:14-3.4.0-bullseye || true -# ----- 14-3.4-bundle-bookworm ----- +# ----- 14-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:14-3.4-bundle-bookworm" +echo "manifest: ${dockername}:14-3.4-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bundle-bookworm \ - --target ${dockername}:14-3.4-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4-bundle0-bookworm \ + --target ${dockername}:14-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:14-3.4.0-bundle-bookworm" +echo "manifest: ${dockername}:14-3.4.0-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.0-bundle-bookworm \ - --target ${dockername}:14-3.4.0-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4.0-bundle0-bookworm \ + --target ${dockername}:14-3.4.0-bundle0-bookworm || true -echo "manifest: ${dockername}:14-3.4-bundle" +echo "manifest: ${dockername}:14-3.4-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bundle \ - --target ${dockername}:14-3.4-bundle || true + --template ${dockername}-ARCHVARIANT:14-3.4-bundle0 \ + --target ${dockername}:14-3.4-bundle0 || true # ----- 15-3.4-alpine3.18 ----- @@ -334,31 +314,31 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.0-bullseye \ --target ${dockername}:15-3.4.0-bullseye || true -# ----- 15-3.4-bundle-bookworm ----- +# ----- 15-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:15-3.4-bundle-bookworm" +echo "manifest: ${dockername}:15-3.4-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle-bookworm \ - --target ${dockername}:15-3.4-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ + --target ${dockername}:15-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4.0-bundle-bookworm" +echo "manifest: ${dockername}:15-3.4.0-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.0-bundle-bookworm \ - --target ${dockername}:15-3.4.0-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.0-bundle0-bookworm \ + --target ${dockername}:15-3.4.0-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4-bundle" +echo "manifest: ${dockername}:15-3.4-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle \ - --target ${dockername}:15-3.4-bundle || true + --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ + --target ${dockername}:15-3.4-bundle0 || true -echo "manifest: ${dockername}:bundle" +echo "manifest: ${dockername}:bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:bundle \ - --target ${dockername}:bundle || true + --template ${dockername}-ARCHVARIANT:bundle0 \ + --target ${dockername}:bundle0 || true # ----- 15-master-bookworm ----- @@ -374,19 +354,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-master \ --target ${dockername}:15-master || true -# ----- 15-recentstack-bookworm ----- +# ----- 15-recent-bookworm ----- -echo "manifest: ${dockername}:15-recentstack-bookworm" +echo "manifest: ${dockername}:15-recent-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recentstack-bookworm \ - --target ${dockername}:15-recentstack-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ + --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recentstack" +echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recentstack \ - --target ${dockername}:15-recentstack || true + --template ${dockername}-ARCHVARIANT:15-recent \ + --target ${dockername}:15-recent || true # ----- 16-3.4-alpine3.18 ----- @@ -442,25 +422,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.0-bullseye \ --target ${dockername}:16-3.4.0-bullseye || true -# ----- 16-3.4-bundle-bookworm ----- +# ----- 16-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:16-3.4-bundle-bookworm" +echo "manifest: ${dockername}:16-3.4-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle-bookworm \ - --target ${dockername}:16-3.4-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ + --target ${dockername}:16-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4.0-bundle-bookworm" +echo "manifest: ${dockername}:16-3.4.0-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.0-bundle-bookworm \ - --target ${dockername}:16-3.4.0-bundle-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.0-bundle0-bookworm \ + --target ${dockername}:16-3.4.0-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4-bundle" +echo "manifest: ${dockername}:16-3.4-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle \ - --target ${dockername}:16-3.4-bundle || true + --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ + --target ${dockername}:16-3.4-bundle0 || true # ----- 16-master-bookworm ----- @@ -476,16 +456,16 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-master \ --target ${dockername}:16-master || true -# ----- 16-recentstack-bookworm ----- +# ----- 16-recent-bookworm ----- -echo "manifest: ${dockername}:16-recentstack-bookworm" +echo "manifest: ${dockername}:16-recent-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recentstack-bookworm \ - --target ${dockername}:16-recentstack-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ + --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recentstack" +echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recentstack \ - --target ${dockername}:16-recentstack || true + --template ${dockername}-ARCHVARIANT:16-recent \ + --target ${dockername}:16-recent || true diff --git a/versions.json b/versions.json index a3353f1dd..3f3da3acb 100644 --- a/versions.json +++ b/versions.json @@ -110,27 +110,6 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" } }, - "13-3.4-bundle": { - "bookworm": { - "tags": "13-3.4-bundle-bookworm 13-3.4.0-bundle-bookworm 13-3.4-bundle", - "postgis": "3.4", - "readme_group": "bundle", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "arch": "amd64 arm64", - "template": "Dockerfile.bundle.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", - "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", - "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", - "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", - "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.0", - "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" - } - }, "14-3.4": { "bullseye": { "tags": "14-3.4-bullseye 14-3.4.0-bullseye", @@ -168,23 +147,25 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" } }, - "14-3.4-bundle": { + "14-3.4-bundle0": { "bookworm": { - "tags": "14-3.4-bundle-bookworm 14-3.4.0-bundle-bookworm 14-3.4-bundle", + "tags": "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", "postgis": "3.4", - "readme_group": "bundle", + "readme_group": "bundle0", "PG_MAJOR": "14", "PG_DOCKER": "14", "arch": "amd64 arm64", - "template": "Dockerfile.bundle.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", - "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "template": "Dockerfile.bundle0.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", + "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.0", - "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "TIMESCALEDB_CHECKOUT": "tags/2.12.1", + "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", + "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" } @@ -226,23 +207,25 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" } }, - "15-3.4-bundle": { + "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle-bookworm 15-3.4.0-bundle-bookworm 15-3.4-bundle bundle", + "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0", "postgis": "3.4", - "readme_group": "bundle", + "readme_group": "bundle0", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", - "template": "Dockerfile.bundle.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", - "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "template": "Dockerfile.bundle0.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", + "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.0", - "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "TIMESCALEDB_CHECKOUT": "tags/2.12.1", + "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", + "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" } @@ -256,26 +239,26 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5c3c66a9282b3472bb161f61d1e762789cf4928b", - "POSTGIS_CHECKOUT_SHA1": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a", + "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a", "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", - "SFCGAL_CHECKOUT": "35f72d2f52b4253013201b170467757b0fc355e5", - "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", - "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", - "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", + "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", + "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", + "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", + "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e", + "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0" } }, - "15-recentstack": { + "15-recent": { "bookworm": { - "tags": "15-recentstack-bookworm 15-recentstack", - "postgis": "recentstack", - "readme_group": "recentstack", + "tags": "15-recent-bookworm 15-recent", + "postgis": "recent", + "readme_group": "recent", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", @@ -332,23 +315,25 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" } }, - "16-3.4-bundle": { + "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle-bookworm 16-3.4.0-bundle-bookworm 16-3.4-bundle", + "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0", "postgis": "3.4", - "readme_group": "bundle", + "readme_group": "bundle0", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", - "template": "Dockerfile.bundle.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-alpha", - "MOBILITYDB_CHECKOUT_SHA1": "ae74a3f12757a768942c6a38ed774323bcd446ec", + "template": "Dockerfile.bundle0.template", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", + "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.0", - "TIMESCALEDB_CHECKOUT_SHA1": "ec99b00f18a6cc636fc7ff6e4bcff870d4201c90", + "TIMESCALEDB_CHECKOUT": "tags/2.12.1", + "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", + "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" } @@ -362,26 +347,26 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5c3c66a9282b3472bb161f61d1e762789cf4928b", - "POSTGIS_CHECKOUT_SHA1": "5c3c66a9282b3472bb161f61d1e762789cf4928b", + "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a", + "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a", "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", - "SFCGAL_CHECKOUT": "35f72d2f52b4253013201b170467757b0fc355e5", - "SFCGAL_CHECKOUT_SHA1": "35f72d2f52b4253013201b170467757b0fc355e5", - "PROJ_CHECKOUT": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "PROJ_CHECKOUT_SHA1": "2040e685f5ab9c2958b7b611f5aaafee21fed82f", - "GDAL_CHECKOUT": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", - "GDAL_CHECKOUT_SHA1": "2cf3921a088d42d6840a8b18e5ce7b994d4e9cf4", + "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", + "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", + "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", + "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", + "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e", + "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0" } }, - "16-recentstack": { + "16-recent": { "bookworm": { - "tags": "16-recentstack-bookworm 16-recentstack", - "postgis": "recentstack", - "readme_group": "recentstack", + "tags": "16-recent-bookworm 16-recent", + "postgis": "recent", + "readme_group": "recent", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", diff --git a/versions.sh b/versions.sh index 1f88cf6f0..378e054cb 100755 --- a/versions.sh +++ b/versions.sh @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC2154 set -Eeuo pipefail # Source environment variables and necessary configurations @@ -152,40 +153,63 @@ postgisGitHash="$(git ls-remote https://github.com/postgis/postgis.git heads/mas # Function to get the latest version tag and its SHA1 hash get_latest_version_and_hash() { # Argument 1: Repository URL - local repo_url=$1 + local repo_url="$1" # Argument 2: Repository identifier - local repo_id=$2 - echo "[+] Checking lastversion : $repo_id - $repo_url" + local repo_id="$2" + # Argumnet 3: tag filter - optional + local repo_only="${3:-}" + + echo "[+] Checking lastversion : $repo_id - $repo_url" # Fetch the latest version tag using the lastversion command - eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")" - + + if [ -z "$repo_only" ]; then + eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")" + else + eval "lastversion_${repo_id}${repo_only}=$(lastversion --format tag --pre --only "${repo_only}" "${repo_url}")" + fi + # Intermediary step to resolve the variable name - local var_name="lastversion_${repo_id}" + local var_name="lastversion_${repo_id}${repo_only}" local last_version=${!var_name} - + # Fetch the SHA1 hash of the tag using the get_tag_hash function - eval "lastversion_${repo_id}_sha1=$(get_tag_hash "${repo_url}" "${last_version}")" + eval "lastversion_${repo_id}${repo_only}_sha1=$(get_tag_hash "${repo_url}" "${last_version}")" #creating new variables for using later .. - echo " lastversion_${repo_id} = ${last_version}" + echo " lastversion_${repo_id}${repo_only} = ${last_version}" - local sha1_var_name="lastversion_${repo_id}_sha1" + local sha1_var_name="lastversion_${repo_id}${repo_only}_sha1" local sha1_value=${!sha1_var_name} - echo " lastversion_${repo_id}_sha1 = ${sha1_value}" + echo " lastversion_${repo_id}${repo_only}_sha1 = ${sha1_value}" echo " " + + if [ -z "$last_version" ]; then + echo "[-] Error: could not get the latest version tag! Stopping!" + exit 1 + fi + + if [ -z "$sha1_value" ]; then + echo "[-] Error: could not get the SHA1 hash for the latest version tag! Stopping!" + exit 1 + fi } get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" -get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" -get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" -get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" -get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" -get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" -get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal" +get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" +get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" +get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" +get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" +get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" +get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal" + +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL16 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL15 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL14 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL13 #------------------------------------------- @@ -324,7 +348,7 @@ for version in "${versions[@]}"; do fi echo " " - if [[ "master" == "$postgisVersion" || "recentstack" == "$postgisVersion" ]]; then + if [[ "master" == "$postgisVersion" || "recent" == "$postgisVersion" ]]; then srcVersion="" srcSha256="" srcSha1="" @@ -374,13 +398,13 @@ for version in "${versions[@]}"; do postgisFullVersion["$suite"]="$postgisVersion" postgisMajor["$suite"]="" postgisDocSrc["$suite"]="development: postgis, geos, proj, gdal" - elif [ "recentstack" == "$postgisVersion" ]; then + elif [ "recent" == "$postgisVersion" ]; then #TODO debianPostgisMajMin["$suite"]="" postgisPackageName["$suite"]="" postgisFullVersion["$suite"]="$postgisVersion" postgisMajor["$suite"]="" - postgisDocSrc["$suite"]="... recentstack ... " + postgisDocSrc["$suite"]="... recent ... " else postgisMajMin["$suite"]="$(echo "${postgisVersion}" | cut -d. -f1).$(echo "${postgisVersion}" | cut -d. -f2)" echo "postgisMajMin[$suite]= ${postgisMajMin[${suite}]}" @@ -422,8 +446,8 @@ for version in "${versions[@]}"; do if [[ "master" == "$postgisVersion" ]]; then postgisDockerTag="master" - elif [[ "recentstack" == "$postgisVersion" ]]; then - postgisDockerTag="recentstack" + elif [[ "recent" == "$postgisVersion" ]]; then + postgisDockerTag="recent" else postgisDockerTag="${postgisLastDockerTags[$postgisVersion]}" fi @@ -433,8 +457,8 @@ for version in "${versions[@]}"; do if [ -n "$bundleType" ]; then readme_group="$bundleType" bundleTypeTags="-${bundleType}" - elif [[ "recentstack" == "$postgisVersion" ]]; then - readme_group="recentstack" + elif [[ "recent" == "$postgisVersion" ]]; then + readme_group="recent" elif [[ ${mainTags} =~ [a-zA-Z] ]]; then readme_group="test" else @@ -442,7 +466,7 @@ for version in "${versions[@]}"; do fi tags="${mainTags}${bundleTypeTags}-${variant}" - if [[ "master" != "$postgisVersion" && "recentstack" != "$postgisVersion" && "${postgisDocSrc[$variant]}" != "${postgisDockerTag}" ]]; then + if [[ "master" != "$postgisVersion" && "recent" != "$postgisVersion" && "${postgisDocSrc[$variant]}" != "${postgisDockerTag}" ]]; then tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisDocSrc[$variant]}${bundleTypeTags}-${variant}" fi if [[ "$variant" == "$debian_latest" ]]; then @@ -488,7 +512,7 @@ for version in "${versions[@]}"; do printf " BOOST_VERSION: '%s'\n" "${boostVersion[$variant]}" } >>_versions.yml - elif [[ "recentstack" == "$postgisVersion" ]]; then + elif [[ "recent" == "$postgisVersion" ]]; then { printf " arch: '%s'\n" "amd64 arm64" printf " template: '%s'\n" "Dockerfile.master.template" @@ -533,6 +557,12 @@ for version in "${versions[@]}"; do printf " TIMESCALEDB_CHECKOUT: 'tags/%s'\n" "$lastversion_timescaledb" printf " TIMESCALEDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_timescaledb_sha1" + + lastversion_pg_hint_plan="lastversion_pg_hint_planREL${postgresVersion}" + lastversion_pg_hint_plan_sha1="lastversion_pg_hint_planREL${postgresVersion}_sha1" + printf " PG_HINT_PLAN_CHECKOUT: 'tags/%s'\n" "${!lastversion_pg_hint_plan}" + printf " PG_HINT_PLAN_CHECKOUT_SHA1: '%s'\n" "${!lastversion_pg_hint_plan_sha1}" + fi printf " POSTGIS_MAJOR: '%s'\n" "${postgisMajor[$variant]}" @@ -554,7 +584,7 @@ for version in "${versions[@]}"; do ) elif [ -d "$version/$variant" ]; then ( - if [[ "master" == "$postgisVersion" || "$postgisVersion" == "recentstack" ]]; then + if [[ "master" == "$postgisVersion" || "$postgisVersion" == "recent" ]]; then echo "Alpine - $postgisVersion is not supported! STOP!" exit 1 fi @@ -569,7 +599,7 @@ for version in "${versions[@]}"; do fi tags="${mainTags}-${variant}" - if [[ "master" != "$postgisVersion" && "$postgisVersion" != "recentstack" && "$srcVersion" != "${postgisLastDockerTags[$postgisVersion]}" ]]; then + if [[ "master" != "$postgisVersion" && "$postgisVersion" != "recent" && "$srcVersion" != "${postgisLastDockerTags[$postgisVersion]}" ]]; then tags+=" ${postgresLastMainTags[$postgresVersion]}-${srcVersion}-${variant}" fi if [[ "$variant" == "$alpine_latest" ]]; then From 081a098d2a35bbef4d05cd517877be84e8bfe966 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 21 Oct 2023 02:55:28 +0200 Subject: [PATCH 003/167] refactoring, fixing, updates... --- .github/workflows/main.yml | 12 +++---- 14-3.4-bundle0/bookworm/Dockerfile | 46 ++++++++++++++++++------ 15-3.4-bundle0/bookworm/Dockerfile | 46 ++++++++++++++++++------ 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/alpine3.18/tags | 2 +- 15-3.4/bookworm/tags | 2 +- 15-master/bookworm/Dockerfile | 8 ++--- 16-3.4-bundle0/bookworm/Dockerfile | 48 ++++++++++++++++++------- 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/alpine3.18/tags | 2 +- 16-3.4/bookworm/tags | 2 +- 16-master/bookworm/Dockerfile | 8 ++--- Dockerfile.bundle0.template | 53 +++++++++++++++++----------- README.md | 18 +++++----- manifest.sh | 36 +++++++++---------- versions.json | 56 +++++++++++++++--------------- versions.sh | 2 +- 17 files changed, 214 insertions(+), 131 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 859c4416c..7a39f65e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,16 +37,16 @@ jobs: # --skip-- - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } - { version: "14-3.4-bundle0", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", readme_group: "bundle0" } - - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", readme_group: "bookworm" } + - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0", readme_group: "bundle0" } + - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent", readme_group: "recent" } - - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", readme_group: "bookworm" } + - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" } +# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0", readme_group: "bundle0" } + - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent", readme_group: "recent" } #matrix-include-end diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 8d514cc61..d0504d793 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 @@ -72,6 +72,13 @@ RUN set -eux \ zlib1g-dev \ # sqlite_fdw sqlite3 \ + # plv8 + ninja-build \ + pkg-config \ + # bytemagic + libmagic-dev \ + # pgsoudium \ + libsodium-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -177,20 +184,29 @@ RUN set -eux \ FROM builder as builder-pgxn +RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx +RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis +RUN pgxn install --verbose orafce RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap RUN pgxn install --verbose pg_rowalesce RUN pgxn install --verbose pg_uuidv7 RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks - RUN USE_PGXS=1 pgxn install sqlite_fdw +# RUN pgxn install --verbose plv8 # todo: need to fix build +# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check +# RUN pgxn install --verbose pg_bm25 # need rust + +# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other @@ -282,6 +298,7 @@ RUN set -eux \ pgtop \ pspg \ \ + \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -292,33 +309,40 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-periods \ + postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pgaudit \ +# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ postgresql-$PG_MAJOR-repack \ postgresql-$PG_MAJOR-rum \ - \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-plpgsql-check \ - postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ + postgresql-$PG_MAJOR-pointcloud \ # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ + # MeCab based tokenizer for pgdg-pgroonga + groonga-tokenizer-mecab \ + # bytemagic + libmagic1 libmagic-mgc \ + # pgsodium + libsodium23 \ \ - # && pip3 install --upgrade pip \ +# && pip3 install --upgrade pip \ \ # && pipx install geopy \ # && pipx install plpygis \ diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index a9c6b6b5d..468f91696 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 @@ -72,6 +72,13 @@ RUN set -eux \ zlib1g-dev \ # sqlite_fdw sqlite3 \ + # plv8 + ninja-build \ + pkg-config \ + # bytemagic + libmagic-dev \ + # pgsoudium \ + libsodium-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -177,20 +184,29 @@ RUN set -eux \ FROM builder as builder-pgxn +RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx +RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis +RUN pgxn install --verbose orafce RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap RUN pgxn install --verbose pg_rowalesce RUN pgxn install --verbose pg_uuidv7 RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks - RUN USE_PGXS=1 pgxn install sqlite_fdw +# RUN pgxn install --verbose plv8 # todo: need to fix build +# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check +# RUN pgxn install --verbose pg_bm25 # need rust + +# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other @@ -282,6 +298,7 @@ RUN set -eux \ pgtop \ pspg \ \ + \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -292,33 +309,40 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-periods \ + postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pgaudit \ +# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ postgresql-$PG_MAJOR-repack \ postgresql-$PG_MAJOR-rum \ - \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-plpgsql-check \ - postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ + postgresql-$PG_MAJOR-pointcloud \ # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ + # MeCab based tokenizer for pgdg-pgroonga + groonga-tokenizer-mecab \ + # bytemagic + libmagic1 libmagic-mgc \ + # pgsodium + libsodium23 \ \ - # && pip3 install --upgrade pip \ +# && pip3 install --upgrade pip \ \ # && pipx install geopy \ # && pipx install plpygis \ diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index c3e2f82c2..38cd245b5 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0 +15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags index efefe6a49..7c8ad00ef 100644 --- a/15-3.4/alpine3.18/tags +++ b/15-3.4/alpine3.18/tags @@ -1 +1 @@ -15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine +15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index c3385ab20..d4dfc3cce 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest +15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 2879f9d0b..62ce57119 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,12 +15,12 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a +ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2 ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e -ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4 +ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a +ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665 ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa -ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c +ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 2e7f55f55..732be2576 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 @@ -72,6 +72,13 @@ RUN set -eux \ zlib1g-dev \ # sqlite_fdw sqlite3 \ + # plv8 + ninja-build \ + pkg-config \ + # bytemagic + libmagic-dev \ + # pgsoudium \ + libsodium-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -152,21 +159,29 @@ RUN set -eux \ FROM builder as builder-pgxn +RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx +RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis +RUN pgxn install --verbose orafce RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap RUN pgxn install --verbose pg_rowalesce RUN pgxn install --verbose pg_uuidv7 RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks +RUN USE_PGXS=1 pgxn install sqlite_fdw +# RUN pgxn install --verbose plv8 # todo: need to fix build +# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check +# RUN pgxn install --verbose pg_bm25 # need rust -# sqlite_fdw not supported on pg16 yet -# RUN USE_PGXS=1 pgxn install sqlite_fdw +# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other @@ -251,6 +266,7 @@ RUN set -eux \ pgtop \ pspg \ \ + \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -261,36 +277,42 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-periods \ + postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pgaudit \ +# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ postgresql-$PG_MAJOR-repack \ postgresql-$PG_MAJOR-rum \ - \ + postgresql-$PG_MAJOR-show-plans \ + postgresql-$PG_MAJOR-squeeze \ # # not yet available for 16 -# postgresql-$PG_MAJOR-partman \ -# postgresql-$PG_MAJOR-pg-fact-loader \ -# postgresql-$PG_MAJOR-pglogical \ -# postgresql-$PG_MAJOR-plpgsql-check \ # postgresql-$PG_MAJOR-pointcloud \ -# postgresql-$PG_MAJOR-squeeze \ -# # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ + # MeCab based tokenizer for pgdg-pgroonga + groonga-tokenizer-mecab \ + # bytemagic + libmagic1 libmagic-mgc \ + # pgsodium + libsodium23 \ \ - # && pip3 install --upgrade pip \ +# && pip3 install --upgrade pip \ \ # && pipx install geopy \ # && pipx install plpygis \ diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 451463d9f..1fe9762e2 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 +16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0 diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags index 70989ffa3..b59d72481 100644 --- a/16-3.4/alpine3.18/tags +++ b/16-3.4/alpine3.18/tags @@ -1 +1 @@ -16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine +16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index 4aaa8915e..099c9151e 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 +16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a0adaeffd..6fefcec76 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,12 +15,12 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a +ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2 ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e -ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4 +ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a +ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665 ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa -ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c +ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 211260b6c..5eafed660 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -67,6 +67,13 @@ RUN set -eux \ zlib1g-dev \ # sqlite_fdw sqlite3 \ + # plv8 + ninja-build \ + pkg-config \ + # bytemagic + libmagic-dev \ + # pgsoudium \ + libsodium-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -176,25 +183,29 @@ RUN set -eux \ FROM builder as builder-pgxn +RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx +RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis +RUN pgxn install --verbose orafce RUN pgxn install --verbose parray_gin +RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap RUN pgxn install --verbose pg_rowalesce RUN pgxn install --verbose pg_uuidv7 RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks - -{{ if env.version | startswith("16") then ( -}} -# sqlite_fdw not supported on pg16 yet -# RUN USE_PGXS=1 pgxn install sqlite_fdw -{{ ) else ( -}} RUN USE_PGXS=1 pgxn install sqlite_fdw -{{ ) end -}} +# RUN pgxn install --verbose plv8 # todo: need to fix build +# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check +# RUN pgxn install --verbose pg_bm25 # need rust + +# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other @@ -290,6 +301,7 @@ RUN set -eux \ pgtop \ pspg \ \ + \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -300,45 +312,46 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-periods \ + postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pgaudit \ +# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ postgresql-$PG_MAJOR-repack \ postgresql-$PG_MAJOR-rum \ - \ + postgresql-$PG_MAJOR-show-plans \ + postgresql-$PG_MAJOR-squeeze \ {{ if env.version | startswith("16") then ( -}} # # not yet available for 16 -# postgresql-$PG_MAJOR-partman \ -# postgresql-$PG_MAJOR-pg-fact-loader \ -# postgresql-$PG_MAJOR-pglogical \ -# postgresql-$PG_MAJOR-plpgsql-check \ # postgresql-$PG_MAJOR-pointcloud \ -# postgresql-$PG_MAJOR-squeeze \ -# {{ ) else ( -}} - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-pointcloud \ - postgresql-$PG_MAJOR-squeeze \ {{ ) end -}} # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ + # MeCab based tokenizer for pgdg-pgroonga + groonga-tokenizer-mecab \ + # bytemagic + libmagic1 libmagic-mgc \ + # pgsodium + libsodium23 \ \ - # && pip3 install --upgrade pip \ +# && pip3 install --upgrade pip \ \ # && pipx install geopy \ # && pipx install plpygis \ diff --git a/README.md b/README.md index 41c978852..57eef862d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ ------------------------ # 🐳🐘🌍 postgis/postgis -[![Build Status](https://github.com/imresamu/docker-postgis/workflows/Docker%20PostGIS%20CI/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://github.com/imresamu/docker-postgis/workflows/Build%20PostGIS%20images/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16beta3. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -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-14) +## Versions (2023-10-21) We provide multi-platform image support for the following architectures: @@ -64,8 +64,8 @@ For those new to PostGIS, we recommend the following image versions: | [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | | [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | | [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### 📘Debian - bullseye @@ -107,8 +107,8 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### ⛰️Alpine based @@ -125,8 +125,8 @@ Please note that the included package list is subject to change as we continue t | [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | | [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | | [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | ### 📋Test images diff --git a/manifest.sh b/manifest.sh index 3255c7028..1fdb7817f 100755 --- a/manifest.sh +++ b/manifest.sh @@ -268,12 +268,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ --target ${dockername}:15-3.4-alpine || true -echo "manifest: ${dockername}:alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:alpine \ - --target ${dockername}:alpine || true - # ----- 15-3.4-bookworm ----- echo "manifest: ${dockername}:15-3.4-bookworm" @@ -294,12 +288,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4 \ --target ${dockername}:15-3.4 || true -echo "manifest: ${dockername}:latest" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:latest \ - --target ${dockername}:latest || true - # ----- 15-3.4-bullseye ----- echo "manifest: ${dockername}:15-3.4-bullseye" @@ -334,12 +322,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ --target ${dockername}:15-3.4-bundle0 || true -echo "manifest: ${dockername}:bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:bundle0 \ - --target ${dockername}:bundle0 || true - # ----- 15-master-bookworm ----- echo "manifest: ${dockername}:15-master-bookworm" @@ -388,6 +370,12 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ --target ${dockername}:16-3.4-alpine || true +echo "manifest: ${dockername}:alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:alpine \ + --target ${dockername}:alpine || true + # ----- 16-3.4-bookworm ----- echo "manifest: ${dockername}:16-3.4-bookworm" @@ -408,6 +396,12 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4 \ --target ${dockername}:16-3.4 || true +echo "manifest: ${dockername}:latest" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:latest \ + --target ${dockername}:latest || true + # ----- 16-3.4-bullseye ----- echo "manifest: ${dockername}:16-3.4-bullseye" @@ -442,6 +436,12 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ --target ${dockername}:16-3.4-bundle0 || true +echo "manifest: ${dockername}:bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:bundle0 \ + --target ${dockername}:bundle0 || true + # ----- 16-master-bookworm ----- echo "manifest: ${dockername}:16-master-bookworm" diff --git a/versions.json b/versions.json index 3f3da3acb..c1f2f7f9f 100644 --- a/versions.json +++ b/versions.json @@ -162,8 +162,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.1", - "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", "POSTGIS_MAJOR": "3", @@ -183,7 +183,7 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", + "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -194,7 +194,7 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", + "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -209,7 +209,7 @@ }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0", + "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "15", @@ -222,8 +222,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.1", - "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -239,16 +239,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a", - "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a", - "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", - "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", + "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2", + "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2", + "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651", + "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651", "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", - "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", - "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e", - "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e", + "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665", + "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665", + "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a", + "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0" @@ -291,7 +291,7 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", + "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -302,7 +302,7 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", + "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -317,7 +317,7 @@ }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0", + "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -330,8 +330,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.1", - "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -347,16 +347,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a", - "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a", - "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c", - "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c", + "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2", + "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2", + "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651", + "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651", "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", - "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4", - "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e", - "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e", + "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665", + "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665", + "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a", + "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a", "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", "BOOST_VERSION": "1.74.0" diff --git a/versions.sh b/versions.sh index 378e054cb..653584715 100755 --- a/versions.sh +++ b/versions.sh @@ -23,7 +23,7 @@ debian_variants=" bullseye bookworm " debian_latest="bookworm" alpine_latest="alpine3.18" postgis_latest="3.4" -postgres_latest="15" +postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" postgres_versions="11 12 13 14 15 16" From 6f17cbace0f78f8f51880710fd8bef8ad8144edd Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 21 Oct 2023 03:07:53 +0200 Subject: [PATCH 004/167] fix bundle --- 14-3.4-bundle0/bookworm/Dockerfile | 9 +++++---- 15-3.4-bundle0/bookworm/Dockerfile | 9 +++++---- 16-3.4-bundle0/bookworm/Dockerfile | 9 +++++---- Dockerfile.bundle0.template | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index d0504d793..8f68b0273 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -190,7 +190,7 @@ RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose orafce + RUN pgxn install --verbose parray_gin RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl @@ -202,12 +202,13 @@ RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw + +#TODO # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust - -# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - +# RUN pgxn install --verbose orafce : todo check +# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 468f91696..35559b771 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -190,7 +190,7 @@ RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose orafce + RUN pgxn install --verbose parray_gin RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl @@ -202,12 +202,13 @@ RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw + +#TODO # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust - -# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - +# RUN pgxn install --verbose orafce : todo check +# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 732be2576..90cc91a41 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -165,7 +165,7 @@ RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose orafce + RUN pgxn install --verbose parray_gin RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl @@ -177,12 +177,13 @@ RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw + +#TODO # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust - -# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - +# RUN pgxn install --verbose orafce : todo check +# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 5eafed660..9ac1ffe4e 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -189,7 +189,7 @@ RUN pgxn install --verbose dsef RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose orafce + RUN pgxn install --verbose parray_gin RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl @@ -201,12 +201,13 @@ RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw + +#TODO # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust - -# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - +# RUN pgxn install --verbose orafce : todo check +# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c FROM builder as builder-other From c4ef5c3cbd8db8208be2df51dcf8743e0cfe5658 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 30 Oct 2023 23:49:09 +0100 Subject: [PATCH 005/167] updates ... --- .dockerignore | 1 + .gitignore | 1 + 14-3.4-bundle0/bookworm/Dockerfile | 4 ++- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++- 15-master/bookworm/Dockerfile | 14 ++++---- 15-recent/bookworm/Dockerfile | 4 +-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++- 16-master/bookworm/Dockerfile | 14 ++++---- 16-recent/bookworm/Dockerfile | 4 +-- Dockerfile.bundle0.template | 4 ++- Dockerfile.master.template | 2 +- README.md | 2 +- apply-templates.sh | 7 ++++ versions.json | 56 +++++++++++++++--------------- versions.sh | 4 +-- 15 files changed, 71 insertions(+), 54 deletions(-) diff --git a/.dockerignore b/.dockerignore index a24870387..d54c78ac4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ .git _* .jq-template.awk +.template-helper-functions.jq .vscode/ .git/ diff --git a/.gitignore b/.gitignore index 8c8d8fcd6..892bf50b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .jq-template.awk +.template-helper-functions.jq _* .vscode/ diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 8f68b0273..577a4e033 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -298,7 +298,7 @@ RUN set -eux \ pgtap \ pgtop \ pspg \ - \ + vip-manager \ \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ @@ -315,8 +315,10 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ # postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 35559b771..648ebc2d3 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -298,7 +298,7 @@ RUN set -eux \ pgtap \ pgtop \ pspg \ - \ + vip-manager \ \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ @@ -315,8 +315,10 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ # postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 62ce57119..cbdb757cc 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -12,15 +12,15 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2 -ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a -ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665 -ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa -ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651 +ARG PGIS1_POSTGIS_CHECKOUT=a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9 +ARG PGIS1_GEOS_CHECKOUT=d7a5a51cb762675f3d068a37d02a31142fd6f822 +ARG PGIS1_GDAL_CHECKOUT=6bbd2c080a0d6243a2758261c8302a8ffc93deaf +ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_SFCGAL_CHECKOUT=3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071 +ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index a35c55ccc..cc164d1b3 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -12,12 +12,12 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3RC1 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 90cc91a41..75978ec02 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -266,7 +266,7 @@ RUN set -eux \ pgtap \ pgtop \ pspg \ - \ + vip-manager \ \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ @@ -283,8 +283,10 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ # postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 6fefcec76..4d2a9ffd3 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -12,15 +12,15 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2 -ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875 -ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a -ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665 -ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa -ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651 +ARG PGIS1_POSTGIS_CHECKOUT=a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9 +ARG PGIS1_GEOS_CHECKOUT=d7a5a51cb762675f3d068a37d02a31142fd6f822 +ARG PGIS1_GDAL_CHECKOUT=6bbd2c080a0d6243a2758261c8302a8ffc93deaf +ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_SFCGAL_CHECKOUT=3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071 +ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index a7dab8de3..27082da7f 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -12,12 +12,12 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3RC1 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 9ac1ffe4e..9a4312f81 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -301,7 +301,7 @@ RUN set -eux \ pgtap \ pgtop \ pspg \ - \ + vip-manager \ \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ @@ -318,8 +318,10 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-fact-loader \ postgresql-$PG_MAJOR-pg-failover-slots \ postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ # postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check + postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index c8fdf1d2a..638dd5193 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -7,7 +7,7 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} diff --git a/README.md b/README.md index 57eef862d..d9badf395 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-21) +## Versions (2023-10-30) We provide multi-platform image support for the following architectures: diff --git a/apply-templates.sh b/apply-templates.sh index 6c5943ba3..47358f74a 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -20,6 +20,13 @@ elif [ "${BASH_SOURCE[0]}" -nt "$jqt" ]; then wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk' fi +jqf='.template-helper-functions.jq' +if [ -n "${BASHBREW_SCRIPTS:-}" ]; then + jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq" +elif [ "$BASH_SOURCE" -nt "$jqf" ]; then + wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq' +fi + if [ "$#" -eq 0 ]; then versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" eval "set -- $versions" diff --git a/versions.json b/versions.json index c1f2f7f9f..2f5eee55b 100644 --- a/versions.json +++ b/versions.json @@ -239,18 +239,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2", - "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2", - "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651", - "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651", - "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665", - "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665", - "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a", - "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a", - "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", - "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", + "POSTGIS_CHECKOUT": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "POSTGIS_CHECKOUT_SHA1": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", + "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", + "SFCGAL_CHECKOUT": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "SFCGAL_CHECKOUT_SHA1": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", + "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", + "GDAL_CHECKOUT": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", + "GDAL_CHECKOUT_SHA1": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", + "GEOS_CHECKOUT": "d7a5a51cb762675f3d068a37d02a31142fd6f822", + "GEOS_CHECKOUT_SHA1": "d7a5a51cb762675f3d068a37d02a31142fd6f822", "BOOST_VERSION": "1.74.0" } }, @@ -267,8 +267,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.2", - "GDAL_CHECKOUT_SHA1": "f74cd4144199fd7667e5c151a251cdbad1f44641", + "GDAL_CHECKOUT": "tags/v3.7.3RC1", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.4.1", @@ -347,18 +347,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2", - "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2", - "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651", - "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651", - "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa", - "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665", - "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665", - "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a", - "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a", - "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875", - "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875", + "POSTGIS_CHECKOUT": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "POSTGIS_CHECKOUT_SHA1": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", + "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", + "SFCGAL_CHECKOUT": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "SFCGAL_CHECKOUT_SHA1": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", + "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", + "GDAL_CHECKOUT": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", + "GDAL_CHECKOUT_SHA1": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", + "GEOS_CHECKOUT": "d7a5a51cb762675f3d068a37d02a31142fd6f822", + "GEOS_CHECKOUT_SHA1": "d7a5a51cb762675f3d068a37d02a31142fd6f822", "BOOST_VERSION": "1.74.0" } }, @@ -375,8 +375,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.2", - "GDAL_CHECKOUT_SHA1": "f74cd4144199fd7667e5c151a251cdbad1f44641", + "GDAL_CHECKOUT": "tags/v3.7.3RC1", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.4.1", diff --git a/versions.sh b/versions.sh index 653584715..d99f3dff8 100755 --- a/versions.sh +++ b/versions.sh @@ -144,7 +144,7 @@ fi packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" -sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')" +sfcgalGitHash="$(git ls-remote https://gitlab.com/sfcgal/SFCGAL.git heads/master | awk '{ print $1}')" projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')" @@ -204,7 +204,7 @@ get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" -get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal" +get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL16 get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL15 From e59f74886fba46d822cd3fd6f584649c7150624c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 31 Oct 2023 00:27:54 +0100 Subject: [PATCH 006/167] update ... --- README.md | 2 +- apply-templates.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d9badf395..5fdd7eec1 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-30) +## Versions (2023-10-31) We provide multi-platform image support for the following architectures: diff --git a/apply-templates.sh b/apply-templates.sh index 47358f74a..5d2732d65 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -22,9 +22,9 @@ fi jqf='.template-helper-functions.jq' if [ -n "${BASHBREW_SCRIPTS:-}" ]; then - jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq" -elif [ "$BASH_SOURCE" -nt "$jqf" ]; then - wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq' + jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq" +elif [ "${BASH_SOURCE[0]}" -nt "$jqf" ]; then + wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq' fi if [ "$#" -eq 0 ]; then From c8df76b7b6751cf271fa12716c51f632729b4c18 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 2 Nov 2023 01:39:20 +0100 Subject: [PATCH 007/167] update ... --- 14-3.4-bundle0/bookworm/Dockerfile | 4 +- 15-3.4-bundle0/bookworm/Dockerfile | 4 +- 15-master/bookworm/Dockerfile | 8 ++-- 15-recent/bookworm/Dockerfile | 4 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 +- 16-master/bookworm/Dockerfile | 8 ++-- 16-recent/bookworm/Dockerfile | 4 +- README.md | 2 +- versions.json | 60 +++++++++++++++--------------- 9 files changed, 49 insertions(+), 49 deletions(-) diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 577a4e033..a2b02ce35 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 648ebc2d3..d5cc8d893 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index cbdb757cc..d6c3bcb76 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,11 +15,11 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9 -ARG PGIS1_GEOS_CHECKOUT=d7a5a51cb762675f3d068a37d02a31142fd6f822 -ARG PGIS1_GDAL_CHECKOUT=6bbd2c080a0d6243a2758261c8302a8ffc93deaf +ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 +ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 +ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 -ARG PGIS1_SFCGAL_CHECKOUT=3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071 +ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index cc164d1b3..752919223 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,9 +17,9 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3RC1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 75978ec02..f8afb7b9c 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 4d2a9ffd3..76b7f16d6 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,11 +15,11 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9 -ARG PGIS1_GEOS_CHECKOUT=d7a5a51cb762675f3d068a37d02a31142fd6f822 -ARG PGIS1_GDAL_CHECKOUT=6bbd2c080a0d6243a2758261c8302a8ffc93deaf +ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 +ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 +ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 -ARG PGIS1_SFCGAL_CHECKOUT=3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071 +ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 27082da7f..5bcbc6fdc 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,9 +17,9 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3RC1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.4.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/README.md b/README.md index 5fdd7eec1..6a3266f36 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-31) +## Versions (2023-11-02) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 2f5eee55b..3a9dff736 100644 --- a/versions.json +++ b/versions.json @@ -162,8 +162,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", + "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", + "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", "POSTGIS_MAJOR": "3", @@ -222,8 +222,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", + "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", + "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -239,18 +239,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", - "POSTGIS_CHECKOUT_SHA1": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", - "SFCGAL_CHECKOUT": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", - "SFCGAL_CHECKOUT_SHA1": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", - "GDAL_CHECKOUT_SHA1": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", - "GEOS_CHECKOUT": "d7a5a51cb762675f3d068a37d02a31142fd6f822", - "GEOS_CHECKOUT_SHA1": "d7a5a51cb762675f3d068a37d02a31142fd6f822", + "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", + "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", + "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", "BOOST_VERSION": "1.74.0" } }, @@ -267,12 +267,12 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.3RC1", - "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", + "GDAL_CHECKOUT": "tags/v3.8.0beta1", + "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", - "SFCGAL_CHECKOUT": "tags/v1.4.1", - "SFCGAL_CHECKOUT_SHA1": "2d6a1a89552f14fe2926038b7237686bb9e5472e", + "SFCGAL_CHECKOUT": "tags/v1.5.0", + "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" @@ -330,8 +330,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", + "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", + "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -347,18 +347,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", - "POSTGIS_CHECKOUT_SHA1": "a5e9fc1124d0de4d6994e5572fd66b1c78fc7af9", + "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", - "SFCGAL_CHECKOUT": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", - "SFCGAL_CHECKOUT_SHA1": "3d6cb5629bfb9655bbbea9939d7d6b9bf3b5b071", + "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", - "GDAL_CHECKOUT_SHA1": "6bbd2c080a0d6243a2758261c8302a8ffc93deaf", - "GEOS_CHECKOUT": "d7a5a51cb762675f3d068a37d02a31142fd6f822", - "GEOS_CHECKOUT_SHA1": "d7a5a51cb762675f3d068a37d02a31142fd6f822", + "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", + "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", + "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", "BOOST_VERSION": "1.74.0" } }, @@ -375,12 +375,12 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.3RC1", - "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", + "GDAL_CHECKOUT": "tags/v3.8.0beta1", + "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", - "SFCGAL_CHECKOUT": "tags/v1.4.1", - "SFCGAL_CHECKOUT_SHA1": "2d6a1a89552f14fe2926038b7237686bb9e5472e", + "SFCGAL_CHECKOUT": "tags/v1.5.0", + "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" From c5ff4f1f99e6527fe63549150cc5a1bf9689fff0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 4 Nov 2023 12:37:49 +0100 Subject: [PATCH 008/167] update templates, add netcdf to gdal, etc .. --- 11-3.3/alpine3.18/Dockerfile | 18 ----------- 12-3.4/alpine3.18/Dockerfile | 18 ----------- 13-3.4/alpine3.18/Dockerfile | 18 ----------- 14-3.4-bundle0/bookworm/Dockerfile | 4 +-- 14-3.4/alpine3.18/Dockerfile | 18 ----------- 15-3.4-bundle0/bookworm/Dockerfile | 4 +-- 15-3.4/alpine3.18/Dockerfile | 18 ----------- 15-master/bookworm/Dockerfile | 43 +++++++++++++++++++++--- 15-recent/bookworm/Dockerfile | 37 ++++++++++++++++++++- 16-3.4-bundle0/bookworm/Dockerfile | 4 +-- 16-3.4/alpine3.18/Dockerfile | 18 ----------- 16-master/bookworm/Dockerfile | 43 +++++++++++++++++++++--- 16-recent/bookworm/Dockerfile | 37 ++++++++++++++++++++- Dockerfile.alpine.template | 18 ----------- Dockerfile.master.template | 35 ++++++++++++++++++++ README.md | 2 +- versions.json | 52 +++++++++++++++--------------- versions.sh | 47 ++++++++++++++++----------- 18 files changed, 246 insertions(+), 188 deletions(-) diff --git a/11-3.3/alpine3.18/Dockerfile b/11-3.3/alpine3.18/Dockerfile index c7689bfa3..0221b233d 100644 --- a/11-3.3/alpine3.18/Dockerfile +++ b/11-3.3/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 11 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.3.4 -# ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index 834d6adc0..cd1db43c1 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index 5a0a52abc..e8d8c40df 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index a2b02ce35..577a4e033 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 84b212d5c..4a0af0f6d 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index d5cc8d893..648ebc2d3 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 53e2d2b66..0255bd80c 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index d6c3bcb76..daf20df11 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,13 +15,20 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 -ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 -ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 -ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 752919223..97d6421ce 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,11 +17,18 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index f8afb7b9c..75978ec02 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index 589a5ee85..03a3926b9 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 76b7f16d6..e6306aa0d 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,13 +15,20 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 -ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 -ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 -ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 5bcbc6fdc..b5f350175 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,11 +17,18 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 73a865b65..552d2734d 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -14,25 +14,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} -# ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }} - RUN set -eux \ -# && apk add --no-cache --virtual .fetch-deps \ -# ca-certificates \ -# openssl \ -# tar \ -# \ -# && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ -# && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ -# && mkdir -p /usr/src/postgis \ -# && tar \ -# --extract \ -# --file postgis.tar.gz \ -# --directory /usr/src/postgis \ -# --strip-components 1 \ -# && rm postgis.tar.gz \ - \ && apk add --no-cache --virtual .build-deps \ \ ca-certificates \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 638dd5193..d047c2925 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -17,6 +17,13 @@ ARG PGIS1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} ARG PGIS1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} ARG PGIS1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} +ARG PGIS1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} +ARG PGIS1_GEOS_CHECKOUT_SHA1={{ .[env.variant].GEOS_CHECKOUT_SHA1 }} +ARG PGIS1_GDAL_CHECKOUT_SHA1={{ .[env.variant].GDAL_CHECKOUT_SHA1 }} +ARG PGIS1_PROJ_CHECKOUT_SHA1={{ .[env.variant].PROJ_CHECKOUT_SHA1 }} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1={{ .[env.variant].SFCGAL_CHECKOUT_SHA1 }} +ARG PGIS1_CGAL_CHECKOUT_SHA1={{ .[env.variant].CGAL_CHECKOUT_SHA1 }} + ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -92,6 +99,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -107,11 +115,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -121,6 +131,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -129,6 +141,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -153,6 +167,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -161,6 +177,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -192,6 +210,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -200,6 +220,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -225,6 +247,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -234,6 +257,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -261,6 +286,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -275,12 +301,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -368,8 +397,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -386,8 +417,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -464,6 +497,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/README.md b/README.md index 6a3266f36..65b16699f 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-11-02) +## Versions (2023-11-04) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 3a9dff736..7ed099b80 100644 --- a/versions.json +++ b/versions.json @@ -162,8 +162,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", "POSTGIS_MAJOR": "3", @@ -222,8 +222,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -239,18 +239,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", - "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", - "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", + "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", + "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", + "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" } }, @@ -267,8 +267,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0beta1", - "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", + "GDAL_CHECKOUT": "tags/v3.7.3", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", @@ -330,8 +330,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -347,18 +347,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", - "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", - "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", + "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", + "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", + "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" } }, @@ -375,8 +375,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0beta1", - "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", + "GDAL_CHECKOUT": "tags/v3.7.3", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", diff --git a/versions.sh b/versions.sh index d99f3dff8..fe28150b6 100755 --- a/versions.sh +++ b/versions.sh @@ -33,6 +33,7 @@ declare -A postgisDebPkgNameVersionSuffixes=( [3.2]='3' [3.3]='3' [3.4]='3' + [3.5]='3' ) declare -A boostVersion=( @@ -156,16 +157,24 @@ get_latest_version_and_hash() { local repo_url="$1" # Argument 2: Repository identifier local repo_id="$2" + # development version .. witj --pre + local repo_development="${3:-}" # Argumnet 3: tag filter - optional - local repo_only="${3:-}" + local repo_only="${4:-}" echo "[+] Checking lastversion : $repo_id - $repo_url" # Fetch the latest version tag using the lastversion command + if [[ "${repo_development}" == "pre-releases" ]]; then + repo_development=" --pre " + else + repo_development="" + fi + if [ -z "$repo_only" ]; then - eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")" + eval "lastversion_${repo_id}=$(lastversion ${repo_development} --format tag "${repo_url}")" else - eval "lastversion_${repo_id}${repo_only}=$(lastversion --format tag --pre --only "${repo_only}" "${repo_url}")" + eval "lastversion_${repo_id}${repo_only}=$(lastversion ${repo_development} --format tag --only "${repo_only}" "${repo_url}")" fi # Intermediary step to resolve the variable name @@ -194,22 +203,22 @@ get_latest_version_and_hash() { fi } -get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" -get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" - -get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" -get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" -get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" -get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" -get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" -get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" - -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL16 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL15 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL14 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL13 +get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" pre-releases +get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases +get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases +get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases + +get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases +get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" releases +get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" releases +get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases +get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases +get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases + +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL14 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL13 #------------------------------------------- From 4b5f54515ae385567dd7204c3125bad697468cc9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 5 Nov 2023 03:26:47 +0100 Subject: [PATCH 009/167] fixes, refactoring, updates ... --- .github/workflows/main.yml | 9 ++--- 14-3.4-bundle0/bookworm/Dockerfile | 6 +-- 15-3.4-bundle0/bookworm/Dockerfile | 6 +-- 15-master/bookworm/Dockerfile | 10 ++--- 15-recent/bookworm/Dockerfile | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 6 +-- 16-master/bookworm/Dockerfile | 10 ++--- 16-recent/bookworm/Dockerfile | 2 +- Dockerfile.master.template | 2 +- README.md | 64 +++++++++++++++--------------- localtest.sh | 55 +++++++++++++++---------- tools/environment_init.sh | 51 ++++++++---------------- versions.json | 16 ++++---- versions.sh | 2 +- 14 files changed, 119 insertions(+), 122 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a39f65e3..ac038a978 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -150,7 +150,6 @@ jobs: DOCKER_BUILDKIT: '1' BUILDX_PLATFORMS: linux/amd64 - # Todo: wait CircleCI workflow to start updating the manifest steps: - name: Checkout source uses: actions/checkout@v4 @@ -170,7 +169,7 @@ jobs: - run: make check_version - - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds +# - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds - name: Login to dockerhub uses: docker/login-action@v2 @@ -186,7 +185,7 @@ jobs: DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} run: make push-readme - - name: Update docker manifest - if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} - run: ./manifest.sh +# - name: Update docker manifest +# if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} +# run: ./manifest.sh diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 577a4e033..3d8947126 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 +ARG REGISTRY=localhost:5000 +ARG REPO_NAME=testrepo +ARG IMAGE_NAME=testpostgisimage-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 648ebc2d3..7edb38af8 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 +ARG REGISTRY=localhost:5000 +ARG REPO_NAME=testrepo +ARG IMAGE_NAME=testpostgisimage-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index daf20df11..34bfe7d83 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,15 +17,15 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 -ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_GDAL_CHECKOUT=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 -ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_GDAL_CHECKOUT_SHA1=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 97d6421ce..5191f6eca 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 75978ec02..3d08325b2 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 +ARG REGISTRY=localhost:5000 +ARG REPO_NAME=testrepo +ARG IMAGE_NAME=testpostgisimage-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index e6306aa0d..87bf9f51a 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,15 +17,15 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 -ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_GDAL_CHECKOUT=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 -ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_GDAL_CHECKOUT_SHA1=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index b5f350175..0f5620104 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index d047c2925..fa6e876db 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -280,7 +280,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ diff --git a/README.md b/README.md index 65b16699f..d6ff9ce7f 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-11-04) +## Versions (2023-11-05) We provide multi-platform image support for the following architectures: @@ -58,14 +58,14 @@ For those new to PostGIS, we recommend the following image versions: - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### 📘Debian - bullseye @@ -76,24 +76,24 @@ For those new to PostGIS, we recommend the following image versions: - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | +| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | ### 🧪Recent ( experimental ) -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | ### 🧪Debian Geo Bundle ( experimental ) @@ -104,11 +104,11 @@ Please note that the included package list is subject to change as we continue t -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### ⛰️Alpine based @@ -119,14 +119,14 @@ Please note that the included package list is subject to change as we continue t - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | +| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | ### 📋Test images @@ -136,10 +136,10 @@ Please note that the included package list is subject to change as we continue t - The ~master SFCGAL version is 1.4 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | -| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | +| [`15-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | +| [`16-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | ## 🚀Usage diff --git a/localtest.sh b/localtest.sh index f38f95f16..da2b2fb32 100755 --- a/localtest.sh +++ b/localtest.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash set -Eeuo pipefail +# Enable TEST mode and use the local registry at localhost:5000 (as specified in the .env.test file). +export TEST=true +# Source environment variables and necessary configurations +source tools/environment_init.sh + # Check if the container with name "registry" is already running # https://docs.docker.com/registry/deploying/ @@ -20,38 +25,48 @@ else echo "Container with name: $testregistry is already running" fi -# Enable TEST mode and use the local registry at localhost:5000 (as specified in the .env.test file). -export TEST=true -set -a -# shellcheck disable=SC1091 -source .env.test -set +a - -echo " " -echo "Test mode = $TEST ; Reading from the .env.test file !" -echo " ------- .env.test -------- " -cat .env.test -echo " -------------------------- " - +# check update code ./update.sh +test_tag=16-3.4-bookworm + # check commands -make -n test-15-3.4-bundle0-bookworm -make -n push-15-3.4-bundle0-bookworm -make -n manifest-15-3.4-bundle0-bookworm +make -n test-${test_tag} +make -n push-${test_tag} +make -n manifest-${test_tag} # run commands -make test-15-3.4-bundle0-bookworm -make push-15-3.4-bundle0-bookworm -make manifest-15-3.4-bundle0-bookworm +make test-${test_tag} +make push-${test_tag} +make manifest-${test_tag} # check images echo " " echo " ---- generated images ---- " make dockerlist -# check registy +# check images echo " " +echo " ---- check images exists ---- " +image_to_check="15-3.4-bundle0-bookworm" +if check_image_exists "$image_to_check"; then + echo "Image '$image_to_check' is available." +else + echo "Image '$image_to_check' does not exist." + echo "Unexpected error .. STOP" + exit 1 +fi + +# should not exists .... +if check_image_exists "99-9.9.9"; then + echo "exist - Unexpected error .. STOP" + exit 1 +else + echo "OK: not found check is OK" +fi + +# check registy +echo " --- registry --- " make lregistryinfo echo " " diff --git a/tools/environment_init.sh b/tools/environment_init.sh index a4da29d53..30e1a6d0f 100644 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -89,44 +89,27 @@ if ! python3 -c 'import yaml, json' &>/dev/null; then exit 1 fi -# check_image_exists +# Define a function to check for the existence of a Docker image tag. +# Usage: +# check_image_exists "tag" # -# Checks if a specific Docker image tag exists in a repository. -# -# Arguments: -# TAG_NAME: The name of the Docker image tag to check. -# -# Globals: -# REPO_NAME: Name of the Docker repository. -# IMAGE_NAME: Name of the Docker image. -# -# Outputs: -# Prints metadata and whether the image exists. -# -# Returns: -# 0: If the Docker image tag exists. -# 1: If the Docker image tag does not exist. -# -# Example: -# if check_image_exists "15-3.4-bundle-bookworm-x2"; then -# echo "Proceeding with next steps..." -# else -# echo "Taking alternative actions..." -# fi +# This function uses `manifest-tool` to inspect the image manifest. It is a more reliable way to check +# for image existence across different platforms and registries without requiring the image to be pulled locally. # +# The function prints a message indicating whether the image-tag exists and returns an exit code. +# Exit code 0 indicates that the image-tag exists, while 1 indicates non-existence. function check_image_exists() { - local TAG_NAME="$1" - # Assuming REPO_NAME and IMAGE_NAME are either passed as global variables or defined elsewhere - local EXISTS_RAW - EXISTS_RAW=$(curl -s "https://hub.docker.com/v2/repositories/${REPO_NAME}/${IMAGE_NAME}/tags/${TAG_NAME}/" | jq .) - local EXISTS - EXISTS=$(echo "${EXISTS_RAW}" | jq -r 'select(.name=="'"${TAG_NAME}"'") | .name') - if [[ "$EXISTS" == "$TAG_NAME" ]]; then - echo "Image tag $1 exists." - return 0 # Return true (image exists) + local image_name="${dockername}:$1" + local output + # Attempt to inspect the image using manifest-tool. Capture the output, including any errors. + output=$(manifest-tool inspect "$image_name" 2>&1 || true) + # Check the output for a "not found" message, which indicates the image does not exist. + if echo "$output" | grep -q "not found"; then + echo "The Docker image '$image_name' does not exist." + return 1 # Return an exit code of 1 to signify the image does not exist. else - echo "Image tag: $1 does not exist." - return 1 # Return false (image does not exist) + echo "The Docker image '$image_name' exists." + return 0 # # Return an exit code of 0 to signify the image exists. fi } diff --git a/versions.json b/versions.json index 7ed099b80..95f1404fa 100644 --- a/versions.json +++ b/versions.json @@ -245,10 +245,10 @@ "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", - "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", - "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", - "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", + "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", + "GDAL_CHECKOUT": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", + "GDAL_CHECKOUT_SHA1": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" @@ -353,10 +353,10 @@ "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", - "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", - "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", - "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", + "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", + "GDAL_CHECKOUT": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", + "GDAL_CHECKOUT_SHA1": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" diff --git a/versions.sh b/versions.sh index fe28150b6..07a112e5a 100755 --- a/versions.sh +++ b/versions.sh @@ -33,7 +33,7 @@ declare -A postgisDebPkgNameVersionSuffixes=( [3.2]='3' [3.3]='3' [3.4]='3' - [3.5]='3' + [3.5]='3' ) declare -A boostVersion=( From 35324a05f9f06066c89735de1fc0c0f1c73ec7a1 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 5 Nov 2023 04:02:30 +0100 Subject: [PATCH 010/167] fix shellcheck error, etc.. --- 14-3.4-bundle0/bookworm/Dockerfile | 6 +++--- 15-3.4-bundle0/bookworm/Dockerfile | 6 +++--- 16-3.4-bundle0/bookworm/Dockerfile | 6 +++--- tools/install_shellcheck.sh | 9 +++++++++ versions.sh | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100755 tools/install_shellcheck.sh diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 3d8947126..577a4e033 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=localhost:5000 -ARG REPO_NAME=testrepo -ARG IMAGE_NAME=testpostgisimage-amd64 +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 7edb38af8..648ebc2d3 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=localhost:5000 -ARG REPO_NAME=testrepo -ARG IMAGE_NAME=testpostgisimage-amd64 +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 3d08325b2..75978ec02 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -12,9 +12,9 @@ # set the base image , make build-* is overwriting with the actual value ! -ARG REGISTRY=localhost:5000 -ARG REPO_NAME=testrepo -ARG IMAGE_NAME=testpostgisimage-amd64 +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm diff --git a/tools/install_shellcheck.sh b/tools/install_shellcheck.sh new file mode 100755 index 000000000..258126e70 --- /dev/null +++ b/tools/install_shellcheck.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -Eeuo pipefail + +# https://github.com/koalaman/shellcheck#installing-a-pre-compiled-binary + +scversion="stable" # or "v0.4.7", or "latest" +wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv +cp "shellcheck-${scversion}/shellcheck" /usr/bin/ +shellcheck --version diff --git a/versions.sh b/versions.sh index 07a112e5a..7a334e387 100755 --- a/versions.sh +++ b/versions.sh @@ -166,7 +166,7 @@ get_latest_version_and_hash() { # Fetch the latest version tag using the lastversion command if [[ "${repo_development}" == "pre-releases" ]]; then - repo_development=" --pre " + repo_development="--pre" else repo_development="" fi From bb0534cabfb6c1eaf3d40a0eacceca3acf658f53 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 5 Nov 2023 04:03:10 +0100 Subject: [PATCH 011/167] update README.md --- README.md | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index d6ff9ce7f..604952e63 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,14 @@ For those new to PostGIS, we recommend the following image versions: - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### 📘Debian - bullseye @@ -76,24 +76,24 @@ For those new to PostGIS, we recommend the following image versions: - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | +| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | ### 🧪Recent ( experimental ) -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | ### 🧪Debian Geo Bundle ( experimental ) @@ -104,11 +104,11 @@ Please note that the included package list is subject to change as we continue t -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | ### ⛰️Alpine based @@ -119,14 +119,14 @@ Please note that the included package list is subject to change as we continue t - PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | +| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | ### 📋Test images @@ -136,10 +136,10 @@ Please note that the included package list is subject to change as we continue t - The ~master SFCGAL version is 1.4 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). -| `localhost:5000/testrepo/testpostgisimage-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | -| [`16-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | +| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | +| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | ## 🚀Usage From 45f414204a7406c3cd7c81054d80c49637bbd519 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 5 Nov 2023 04:10:50 +0100 Subject: [PATCH 012/167] fix localtest .. --- localtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localtest.sh b/localtest.sh index da2b2fb32..c3427882a 100755 --- a/localtest.sh +++ b/localtest.sh @@ -48,7 +48,7 @@ make dockerlist # check images echo " " echo " ---- check images exists ---- " -image_to_check="15-3.4-bundle0-bookworm" +image_to_check="$test_tag" if check_image_exists "$image_to_check"; then echo "Image '$image_to_check' is available." else From 05a35549e2306584d6302e5d3d18945e12e14fc3 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 6 Nov 2023 15:00:33 +0100 Subject: [PATCH 013/167] update bundle0, refresh --- 14-3.4-bundle0/bookworm/Dockerfile | 5 ++++- 15-3.4-bundle0/bookworm/Dockerfile | 5 ++++- 15-master/bookworm/Dockerfile | 12 ++++++------ 16-3.4-bundle0/bookworm/Dockerfile | 5 ++++- 16-master/bookworm/Dockerfile | 12 ++++++------ Dockerfile.bundle0.template | 6 +++++- README.md | 2 +- versions.json | 24 ++++++++++++------------ 8 files changed, 42 insertions(+), 29 deletions(-) diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index 577a4e033..471c46b1a 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -187,7 +187,7 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis @@ -293,6 +293,7 @@ RUN set -eux \ postgresql-postgis \ postgresql-postgis-scripts \ \ + pg-activity \ pgbackrest \ pgbadger \ pgtap \ @@ -305,6 +306,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ @@ -334,6 +336,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-pointcloud \ # # add MobilityDb missing dependency from libgsl-dev diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 648ebc2d3..1b4a947f2 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -187,7 +187,7 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis @@ -293,6 +293,7 @@ RUN set -eux \ postgresql-postgis \ postgresql-postgis-scripts \ \ + pg-activity \ pgbackrest \ pgbadger \ pgtap \ @@ -305,6 +306,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ @@ -334,6 +336,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-pointcloud \ # # add MobilityDb missing dependency from libgsl-dev diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 34bfe7d83..2b8b6c59e 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -16,18 +16,18 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_GEOS_CHECKOUT=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 +ARG PGIS1_GDAL_CHECKOUT=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f -ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT_SHA1=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 +ARG PGIS1_GDAL_CHECKOUT_SHA1=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f -ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 75978ec02..c109fa638 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -162,7 +162,7 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis @@ -261,6 +261,7 @@ RUN set -eux \ postgresql-postgis \ postgresql-postgis-scripts \ \ + pg-activity \ pgbackrest \ pgbadger \ pgtap \ @@ -273,6 +274,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ @@ -305,6 +307,7 @@ RUN set -eux \ # # not yet available for 16 # postgresql-$PG_MAJOR-pointcloud \ +# postgresql-$PG_MAJOR-age \ # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 87bf9f51a..0e62a0cd1 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -16,18 +16,18 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_GEOS_CHECKOUT=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 +ARG PGIS1_GDAL_CHECKOUT=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f -ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d -ARG PGIS1_GDAL_CHECKOUT_SHA1=32b9e0cb4d32232b644e9cc607089fec543ca6d4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 +ARG PGIS1_GDAL_CHECKOUT_SHA1=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f -ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 9a4312f81..6825f5d90 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -186,7 +186,7 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg +# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis @@ -296,6 +296,7 @@ RUN set -eux \ postgresql-postgis \ postgresql-postgis-scripts \ \ + pg-activity \ pgbackrest \ pgbadger \ pgtap \ @@ -308,6 +309,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ @@ -341,7 +343,9 @@ RUN set -eux \ # # not yet available for 16 # postgresql-$PG_MAJOR-pointcloud \ +# postgresql-$PG_MAJOR-age \ {{ ) else ( -}} + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-pointcloud \ {{ ) end -}} # diff --git a/README.md b/README.md index 604952e63..9d6fb8e66 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-11-05) +## Versions (2023-11-06) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 95f1404fa..16c07b6b6 100644 --- a/versions.json +++ b/versions.json @@ -241,16 +241,16 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", - "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", - "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", + "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", + "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", - "GDAL_CHECKOUT_SHA1": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", - "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", - "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GDAL_CHECKOUT": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", + "GDAL_CHECKOUT_SHA1": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", + "GEOS_CHECKOUT": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", + "GEOS_CHECKOUT_SHA1": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", "BOOST_VERSION": "1.74.0" } }, @@ -349,16 +349,16 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", - "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", - "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", + "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", + "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", - "GDAL_CHECKOUT_SHA1": "32b9e0cb4d32232b644e9cc607089fec543ca6d4", - "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", - "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GDAL_CHECKOUT": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", + "GDAL_CHECKOUT_SHA1": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", + "GEOS_CHECKOUT": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", + "GEOS_CHECKOUT_SHA1": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", "BOOST_VERSION": "1.74.0" } }, From 32eeb6f20e999857fbc806834c28fd111052a7bd Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 8 Nov 2023 21:02:15 +0100 Subject: [PATCH 014/167] update .. --- 15-master/bookworm/Dockerfile | 8 ++++---- 16-master/bookworm/Dockerfile | 8 ++++---- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 2b8b6c59e..ec4650db3 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -16,15 +16,15 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 -ARG PGIS1_GDAL_CHECKOUT=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde +ARG PGIS1_GEOS_CHECKOUT=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 -ARG PGIS1_GDAL_CHECKOUT_SHA1=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde +ARG PGIS1_GEOS_CHECKOUT_SHA1=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 0e62a0cd1..d7ec50781 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -16,15 +16,15 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 -ARG PGIS1_GDAL_CHECKOUT=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde +ARG PGIS1_GEOS_CHECKOUT=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87 -ARG PGIS1_GDAL_CHECKOUT_SHA1=9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde +ARG PGIS1_GEOS_CHECKOUT_SHA1=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/README.md b/README.md index 9d6fb8e66..af0c60460 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-11-06) +## Versions (2023-11-08) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 16c07b6b6..d5a5c23c8 100644 --- a/versions.json +++ b/versions.json @@ -247,10 +247,10 @@ "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", - "GDAL_CHECKOUT_SHA1": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", - "GEOS_CHECKOUT": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", - "GEOS_CHECKOUT_SHA1": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", + "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", + "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", + "GEOS_CHECKOUT": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", + "GEOS_CHECKOUT_SHA1": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", "BOOST_VERSION": "1.74.0" } }, @@ -355,10 +355,10 @@ "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", - "GDAL_CHECKOUT_SHA1": "9a3e48a2cbc7f9fefd5fa2d61c1f5db2346a8fde", - "GEOS_CHECKOUT": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", - "GEOS_CHECKOUT_SHA1": "bb2db233eb2d51ba1f44cfaaf5dbd39f0cb1af87", + "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", + "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", + "GEOS_CHECKOUT": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", + "GEOS_CHECKOUT_SHA1": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", "BOOST_VERSION": "1.74.0" } }, From 8ed64fe222c2e6cbfd54cf1a57b2b4cbb8ed91a8 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 8 Nov 2023 23:45:12 +0100 Subject: [PATCH 015/167] update ... --- 15-master/bookworm/Dockerfile | 4 ++-- 16-master/bookworm/Dockerfile | 4 ++-- versions.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index ec4650db3..2c5b77445 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GEOS_CHECKOUT=4e40afd8f16773c85a8124b72665754721189837 ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GEOS_CHECKOUT_SHA1=4e40afd8f16773c85a8124b72665754721189837 ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index d7ec50781..57e4d5278 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GEOS_CHECKOUT=4e40afd8f16773c85a8124b72665754721189837 ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=e4a6e1af65f7d60fa63d7666f6cb000e365bb50f +ARG PGIS1_GEOS_CHECKOUT_SHA1=4e40afd8f16773c85a8124b72665754721189837 ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/versions.json b/versions.json index d5a5c23c8..42829704b 100644 --- a/versions.json +++ b/versions.json @@ -249,8 +249,8 @@ "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", - "GEOS_CHECKOUT": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", - "GEOS_CHECKOUT_SHA1": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", + "GEOS_CHECKOUT": "4e40afd8f16773c85a8124b72665754721189837", + "GEOS_CHECKOUT_SHA1": "4e40afd8f16773c85a8124b72665754721189837", "BOOST_VERSION": "1.74.0" } }, @@ -357,8 +357,8 @@ "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", - "GEOS_CHECKOUT": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", - "GEOS_CHECKOUT_SHA1": "e4a6e1af65f7d60fa63d7666f6cb000e365bb50f", + "GEOS_CHECKOUT": "4e40afd8f16773c85a8124b72665754721189837", + "GEOS_CHECKOUT_SHA1": "4e40afd8f16773c85a8124b72665754721189837", "BOOST_VERSION": "1.74.0" } }, From 661379e3215c8b1c9e629fa2e64faf11d17e871f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 11 Nov 2023 04:39:24 +0100 Subject: [PATCH 016/167] update ... fix master .. --- 15-master/bookworm/Dockerfile | 16 ++++++++-------- 16-master/bookworm/Dockerfile | 16 ++++++++-------- README.md | 2 +- versions.json | 32 ++++++++++++++++---------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 2c5b77445..42769c664 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,18 +15,18 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=4e40afd8f16773c85a8124b72665754721189837 -ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 +ARG PGIS1_POSTGIS_CHECKOUT=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GDAL_CHECKOUT=59eaaed3168f49e8a7a3821730277aff68a86d16 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 -ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=4e40afd8f16773c85a8124b72665754721189837 -ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GDAL_CHECKOUT_SHA1=59eaaed3168f49e8a7a3821730277aff68a86d16 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 57e4d5278..414d588a9 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,18 +15,18 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT=4e40afd8f16773c85a8124b72665754721189837 -ARG PGIS1_GDAL_CHECKOUT=3065c75de3a1af23688da064318be3a9550f1a94 +ARG PGIS1_POSTGIS_CHECKOUT=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GDAL_CHECKOUT=59eaaed3168f49e8a7a3821730277aff68a86d16 ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 -ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 -ARG PGIS1_GEOS_CHECKOUT_SHA1=4e40afd8f16773c85a8124b72665754721189837 -ARG PGIS1_GDAL_CHECKOUT_SHA1=3065c75de3a1af23688da064318be3a9550f1a94 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GDAL_CHECKOUT_SHA1=59eaaed3168f49e8a7a3821730277aff68a86d16 ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/README.md b/README.md index af0c60460..2ffc99c01 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-11-08) +## Versions (2023-11-11) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 42829704b..8f26792ca 100644 --- a/versions.json +++ b/versions.json @@ -239,18 +239,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", - "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT": "c438732240688e769e5eefe08122f7954ba9313d", + "POSTGIS_CHECKOUT_SHA1": "c438732240688e769e5eefe08122f7954ba9313d", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", + "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", - "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", - "GEOS_CHECKOUT": "4e40afd8f16773c85a8124b72665754721189837", - "GEOS_CHECKOUT_SHA1": "4e40afd8f16773c85a8124b72665754721189837", + "GDAL_CHECKOUT": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GDAL_CHECKOUT_SHA1": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", + "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "BOOST_VERSION": "1.74.0" } }, @@ -347,18 +347,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", - "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT": "c438732240688e769e5eefe08122f7954ba9313d", + "POSTGIS_CHECKOUT_SHA1": "c438732240688e769e5eefe08122f7954ba9313d", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", + "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "3065c75de3a1af23688da064318be3a9550f1a94", - "GDAL_CHECKOUT_SHA1": "3065c75de3a1af23688da064318be3a9550f1a94", - "GEOS_CHECKOUT": "4e40afd8f16773c85a8124b72665754721189837", - "GEOS_CHECKOUT_SHA1": "4e40afd8f16773c85a8124b72665754721189837", + "GDAL_CHECKOUT": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GDAL_CHECKOUT_SHA1": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", + "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "BOOST_VERSION": "1.74.0" } }, From ee09e500dd4780ae958b577066c08ecd27472894 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 11 Nov 2023 06:56:27 +0100 Subject: [PATCH 017/167] remove 14-3.4-bundle0 and improve bundle0 --- .circleci/config.yml | 3 +- .github/workflows/main.yml | 3 +- 14-3.4-bundle0/bookworm/Dockerfile | 403 ----------------------------- 14-3.4-bundle0/bookworm/tags | 1 - 15-3.4-bundle0/bookworm/Dockerfile | 3 +- 16-3.4-bundle0/bookworm/Dockerfile | 3 +- Dockerfile.bundle0.template | 3 +- README.md | 1 - manifest.sh | 20 -- versions.json | 23 -- 10 files changed, 5 insertions(+), 458 deletions(-) delete mode 100644 14-3.4-bundle0/bookworm/Dockerfile delete mode 100644 14-3.4-bundle0/bookworm/tags diff --git a/.circleci/config.yml b/.circleci/config.yml index b30ab291e..7c092c8f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,9 +103,8 @@ workflows: "13-3.4-bookworm", "13-3.4-bullseye", "14-3.4-alpine3.18", -# --skip-- "14-3.4-bookworm", --> generated with the related bundle job! + "14-3.4-bookworm", "14-3.4-bullseye", - "14-3.4-bundle0-bookworm", "15-3.4-alpine3.18", # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! "15-3.4-bullseye", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac038a978..6a4a66c7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,9 +34,8 @@ jobs: - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.0-bullseye", readme_group: "bullseye" } - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } + - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "14-3.4-bundle0", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", readme_group: "bundle0" } - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile deleted file mode 100644 index 471c46b1a..000000000 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ /dev/null @@ -1,403 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle0.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - - -# Experimental Geo Bundle package. -# This is a work in progress and not yet ready for production. -# Some packages will be removed from this bundle and others will be added. -# The goal is to have a bundle that includes all the most popular extensions with PostGIS - -# set the base image , make build-* is overwriting with the actual value ! - -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 - -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm - -ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 - -ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be - -ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee - -ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git -ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=81e4f0f37966081bc1909db9796bfc1b1b5d2349 - -FROM ${PGIS1_BASE_IMAGE} AS builder - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - g++ \ - git \ - make \ - pgxnclient \ - postgresql-server-dev-$PG_MAJOR \ - unzip \ - wget \ - # MobilityDB - libgeos++-dev \ - libgsl-dev \ - libjson-c-dev \ - libproj-dev \ - # TimescaleDB - libkrb5-dev \ - # pgsql-http - libcurl4-gnutls-dev \ - # hydra (columnar) - liblz4-dev \ - # pgsql-gzip - zlib1g-dev \ - # sqlite_fdw - sqlite3 \ - # plv8 - ninja-build \ - pkg-config \ - # bytemagic - libmagic-dev \ - # pgsoudium \ - libsodium-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -FROM builder as builder-http-gzip - -ARG PGIS1_PGSQL_HTTP_REPOSITORY -ARG PGIS1_PGSQL_HTTP_CHECKOUT -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 - -ARG PGIS1_PGSQL_GZIP_REPOSITORY -ARG PGIS1_PGSQL_GZIP_CHECKOUT -ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 - -RUN set -eux \ - && mkdir -p /pgsql-gzip \ - && cd pgsql-gzip \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_gzip_last_commit.txt \ - && make -j$(nproc) \ - && make install - -RUN set -eux \ - && mkdir -p /pgsql-http \ - && cd pgsql-http \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_http_last_commit.txt \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-timescaledb - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY -ARG PGIS1_TIMESCALEDB_REPOSITORY -ARG PGIS1_TIMESCALEDB_CHECKOUT -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 - -# Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -eux \ - && mkdir -p /timescaledb \ - && cd timescaledb \ - && git init \ - && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_timescaledb_last_commit.txt \ - && ./bootstrap \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - \ - -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ - -DREGRESS_CHECKS=OFF \ - -DSEND_TELEMETRY_DEFAULT=NO \ - -DTAP_CHECKS=OFF \ - -DWARNINGS_AS_ERRORS=OFF \ - -DENABLE_DEBUG_UTILS=OFF \ - && cd build \ - && make -j$(nproc) \ - && make install - - - -FROM builder as builder-mobilitydb - -ARG PGIS1_MOBILITYDB_REPOSITORY -ARG PGIS1_MOBILITYDB_CHECKOUT -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 - -# Install MobilityDB -RUN set -eux \ - && mkdir -p /MobilityDB \ - && cd MobilityDB \ - && git init \ - && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_MobilityDB_last_commit.txt \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - .. \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-pgxn - -RUN pgxn install --verbose byteamagic -RUN pgxn install --verbose ddlx -RUN pgxn install --verbose dsef -# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg -RUN pgxn install --verbose json_accessors -RUN pgxn install --verbose lostgis - -RUN pgxn install --verbose parray_gin -RUN pgxn install --verbose permuteseq -RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install --verbose pg_roaringbitmap -RUN pgxn install --verbose pg_rowalesce -RUN pgxn install --verbose pg_uuidv7 -RUN pgxn install --verbose pg_xenophile -RUN pgxn install --verbose pg_xxhash -RUN pgxn install --verbose pgsodium -RUN pgxn install --verbose pgsql_tweaks -RUN USE_PGXS=1 pgxn install sqlite_fdw - -#TODO -# RUN pgxn install --verbose plv8 # todo: need to fix build -# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check -# RUN pgxn install --verbose pg_bm25 # need rust -# RUN pgxn install --verbose orafce : todo check -# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - -FROM builder as builder-other - -ARG PGIS1_PG_HINT_PLAN_REPOSITORY -ARG PGIS1_PG_HINT_PLAN_CHECKOUT -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 - -# add add https://github.com/hydradatabase/hydra -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ - && cd hydra/columnar \ - && git checkout main \ - && ./configure \ - && make -j$(nproc) \ - && make install - -# install pg_hint_plan -RUN set -eux \ - && mkdir pg_hint_plan \ - && cd pg_hint_plan \ - && git init \ - && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ - && make -j$(nproc) \ - && make install - -RUN set -eux \ - && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git - - -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:14-3.4-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 14-3.4-bookworm " \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -# install all utf8 locales; -# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -RUN set -eux \ - && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ - && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - \ - bzip2 \ - curl \ - jq \ - unzip \ - wget \ - \ - gdal-bin \ - proj-bin \ - sqlite3 \ - \ - pipx \ - python-is-python3 \ - python3 \ - python3-geoalchemy2 \ - python3-pglast \ - python3-pip \ - python3-psycopg2 \ - python3-setuptools \ - python3-sqlalchemy \ - \ - postgis \ - postgresql \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgvector \ - postgresql-client-common \ - postgresql-common \ - postgresql-contrib \ - postgresql-plpython3-$PG_MAJOR \ - postgresql-postgis \ - postgresql-postgis-scripts \ - \ - pg-activity \ - pgbackrest \ - pgbadger \ - pgtap \ - pgtop \ - pspg \ - vip-manager \ - \ - postgresql-$PG_MAJOR-asn1oid \ - postgresql-$PG_MAJOR-cron \ - postgresql-$PG_MAJOR-decoderbufs \ - postgresql-$PG_MAJOR-extra-window-functions \ - postgresql-$PG_MAJOR-first-last-agg \ - postgresql-$PG_MAJOR-h3 \ - postgresql-$PG_MAJOR-hll \ - postgresql-$PG_MAJOR-hypopg \ - postgresql-$PG_MAJOR-icu-ext \ - postgresql-$PG_MAJOR-jsquery \ - postgresql-$PG_MAJOR-numeral \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-periods \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pg-failover-slots \ - postgresql-$PG_MAJOR-pg-stat-kcache \ - postgresql-$PG_MAJOR-pg-wait-sampling \ - postgresql-$PG_MAJOR-pgaudit \ -# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check - postgresql-$PG_MAJOR-pgl-ddl-deploy \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-pgmp \ - postgresql-$PG_MAJOR-pgpcre \ - postgresql-$PG_MAJOR-pgq3 \ - postgresql-$PG_MAJOR-pgsphere \ - postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-plpgsql-check \ - postgresql-$PG_MAJOR-prefix \ - postgresql-$PG_MAJOR-prioritize \ - postgresql-$PG_MAJOR-q3c \ - postgresql-$PG_MAJOR-repack \ - postgresql-$PG_MAJOR-rum \ - postgresql-$PG_MAJOR-show-plans \ - postgresql-$PG_MAJOR-squeeze \ - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-pointcloud \ - # - # add MobilityDb missing dependency from libgsl-dev - libgsl27 \ - # MeCab based tokenizer for pgdg-pgroonga - groonga-tokenizer-mecab \ - # bytemagic - libmagic1 libmagic-mgc \ - # pgsodium - libsodium23 \ - \ -# && pip3 install --upgrade pip \ - \ -# && pipx install geopy \ -# && pipx install plpygis \ -# && pipx install pygml \ -# && pipx install shapely \ - \ - && rm -Rf /root/.cache/pip \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# Install from stages -COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-other /postgres_dba /postgres_dba - -# check any missing dependencies -RUN set -eux \ - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - dpkg -l | grep llvm ; \ - exit 1; \ - fi - -# add MobilityDB requirements -RUN set -eux \ - && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ - # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ - # MobilityDB recomendation - echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ - echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample - -# for postgres_dba Use ":dba" to see menu -RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc diff --git a/14-3.4-bundle0/bookworm/tags b/14-3.4-bundle0/bookworm/tags deleted file mode 100644 index f97bd34a3..000000000 --- a/14-3.4-bundle0/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0 diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 1b4a947f2..f6906cb1b 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -187,11 +187,10 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose parray_gin +#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index c109fa638..7e72e129f 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -162,11 +162,10 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose parray_gin +#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 6825f5d90..b8ef7cc8b 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -186,11 +186,10 @@ FROM builder as builder-pgxn RUN pgxn install --verbose byteamagic RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef -# RUN pgxn install --verbose h3 # https://github.com/zachasme/h3-pg RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis -RUN pgxn install --verbose parray_gin +#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap diff --git a/README.md b/README.md index 2ffc99c01..4ea431dcb 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,6 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | | [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | | [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | diff --git a/manifest.sh b/manifest.sh index 1fdb7817f..bc82398e5 100755 --- a/manifest.sh +++ b/manifest.sh @@ -228,26 +228,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.0-bullseye \ --target ${dockername}:14-3.4.0-bullseye || true -# ----- 14-3.4-bundle0-bookworm ----- - -echo "manifest: ${dockername}:14-3.4-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bundle0-bookworm \ - --target ${dockername}:14-3.4-bundle0-bookworm || true - -echo "manifest: ${dockername}:14-3.4.0-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.0-bundle0-bookworm \ - --target ${dockername}:14-3.4.0-bundle0-bookworm || true - -echo "manifest: ${dockername}:14-3.4-bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bundle0 \ - --target ${dockername}:14-3.4-bundle0 || true - # ----- 15-3.4-alpine3.18 ----- echo "manifest: ${dockername}:15-3.4-alpine3.18" diff --git a/versions.json b/versions.json index 8f26792ca..990caa6f3 100644 --- a/versions.json +++ b/versions.json @@ -147,29 +147,6 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" } }, - "14-3.4-bundle0": { - "bookworm": { - "tags": "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", - "postgis": "3.4", - "readme_group": "bundle0", - "PG_MAJOR": "14", - "PG_DOCKER": "14", - "arch": "amd64 arm64", - "template": "Dockerfile.bundle0.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", - "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", - "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", - "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", - "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", - "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", - "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" - } - }, "15-3.4": { "bullseye": { "tags": "15-3.4-bullseye 15-3.4.0-bullseye", From 534f2d662d90a23362ff65519e19e1725f76a1a7 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 11 Nov 2023 13:34:40 +0100 Subject: [PATCH 018/167] improvements, update ... --- 11-3.3/bookworm/Dockerfile | 9 +++++++++ 11-3.3/bullseye/Dockerfile | 9 +++++++++ 12-3.4/bookworm/Dockerfile | 9 +++++++++ 12-3.4/bullseye/Dockerfile | 9 +++++++++ 13-3.4/bookworm/Dockerfile | 9 +++++++++ 13-3.4/bullseye/Dockerfile | 9 +++++++++ 14-3.4/bookworm/Dockerfile | 9 +++++++++ 14-3.4/bullseye/Dockerfile | 9 +++++++++ 15-3.4-bundle0/bookworm/Dockerfile | 7 ++++--- 15-3.4/bookworm/Dockerfile | 9 +++++++++ 15-3.4/bullseye/Dockerfile | 9 +++++++++ 15-master/bookworm/Dockerfile | 8 ++++---- 16-3.4-bundle0/bookworm/Dockerfile | 7 ++++--- 16-3.4/bookworm/Dockerfile | 9 +++++++++ 16-3.4/bullseye/Dockerfile | 9 +++++++++ 16-master/bookworm/Dockerfile | 8 ++++---- Dockerfile.bundle0.template | 7 ++++--- Dockerfile.debian.template | 9 +++++++++ versions.json | 16 ++++++++-------- 19 files changed, 145 insertions(+), 25 deletions(-) diff --git a/11-3.3/bookworm/Dockerfile b/11-3.3/bookworm/Dockerfile index 735ef6917..1fc519d7a 100644 --- a/11-3.3/bookworm/Dockerfile +++ b/11-3.3/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/11-3.3/bullseye/Dockerfile b/11-3.3/bullseye/Dockerfile index d6a537d60..07f78ac58 100644 --- a/11-3.3/bullseye/Dockerfile +++ b/11-3.3/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile index a4e7df64a..d05ad2002 100644 --- a/12-3.4/bookworm/Dockerfile +++ b/12-3.4/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile index b421824c2..3574fb533 100644 --- a/12-3.4/bullseye/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile index bb6191ba8..68a108867 100644 --- a/13-3.4/bookworm/Dockerfile +++ b/13-3.4/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile index 46ea47c6b..a8135b931 100644 --- a/13-3.4/bullseye/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile index 007cc600a..e6725981d 100644 --- a/14-3.4/bookworm/Dockerfile +++ b/14-3.4/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile index 1896d3972..b7bf80958 100644 --- a/14-3.4/bullseye/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index f6906cb1b..92a466e6a 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -380,13 +380,14 @@ COPY --from=builder-other /postgres_dba /postgres_d RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true -# multiple LLVM existance is not allowed. +# multiple LLVM existance is not optimal; so we give a warning. +# known problem: duplicated LLVM RUN set -eux \ + && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "WARNING: More than one llvm package or none at all found!"; \ dpkg -l | grep llvm ; \ - exit 1; \ fi # add MobilityDB requirements diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile index 87fb0189c..6269101ba 100644 --- a/15-3.4/bookworm/Dockerfile +++ b/15-3.4/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile index 260921b9c..5b9055c97 100644 --- a/15-3.4/bullseye/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 42769c664..d4fe13d3c 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 -ARG PGIS1_GDAL_CHECKOUT=59eaaed3168f49e8a7a3821730277aff68a86d16 +ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 -ARG PGIS1_GDAL_CHECKOUT_SHA1=59eaaed3168f49e8a7a3821730277aff68a86d16 +ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 7e72e129f..bea717121 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -350,13 +350,14 @@ COPY --from=builder-other /postgres_dba /postgres_d RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true -# multiple LLVM existance is not allowed. +# multiple LLVM existance is not optimal; so we give a warning. +# known problem: duplicated LLVM RUN set -eux \ + && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "WARNING: More than one llvm package or none at all found!"; \ dpkg -l | grep llvm ; \ - exit 1; \ fi # add MobilityDB requirements diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile index 8231a9b1c..5688c1f86 100644 --- a/16-3.4/bookworm/Dockerfile +++ b/16-3.4/bookworm/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile index 0e262ba45..16d59af98 100644 --- a/16-3.4/bullseye/Dockerfile +++ b/16-3.4/bullseye/Dockerfile @@ -24,6 +24,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 414d588a9..7e290dc06 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 -ARG PGIS1_GDAL_CHECKOUT=59eaaed3168f49e8a7a3821730277aff68a86d16 +ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c438732240688e769e5eefe08122f7954ba9313d +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 -ARG PGIS1_GDAL_CHECKOUT_SHA1=59eaaed3168f49e8a7a3821730277aff68a86d16 +ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index b8ef7cc8b..7b2f6caf5 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -390,13 +390,14 @@ COPY --from=builder-other /postgres_dba /postgres_d RUN set -eux \ && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true -# multiple LLVM existance is not allowed. +# multiple LLVM existance is not optimal; so we give a warning. +# known problem: duplicated LLVM RUN set -eux \ + && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "WARNING: More than one llvm package or none at all found!"; \ dpkg -l | grep llvm ; \ - exit 1; \ fi # add MobilityDB requirements diff --git a/Dockerfile.debian.template b/Dockerfile.debian.template index 0d37b61cc..067c9b0f4 100644 --- a/Dockerfile.debian.template +++ b/Dockerfile.debian.template @@ -19,6 +19,15 @@ RUN set -eux \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ && rm -rf /var/lib/apt/lists/* +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin diff --git a/versions.json b/versions.json index 990caa6f3..be443dbd7 100644 --- a/versions.json +++ b/versions.json @@ -216,16 +216,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "c438732240688e769e5eefe08122f7954ba9313d", - "POSTGIS_CHECKOUT_SHA1": "c438732240688e769e5eefe08122f7954ba9313d", + "POSTGIS_CHECKOUT": "e12e7302bfe021026d8f3d8b567a3f048a782771", + "POSTGIS_CHECKOUT_SHA1": "e12e7302bfe021026d8f3d8b567a3f048a782771", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "59eaaed3168f49e8a7a3821730277aff68a86d16", - "GDAL_CHECKOUT_SHA1": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", + "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "BOOST_VERSION": "1.74.0" @@ -324,16 +324,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "c438732240688e769e5eefe08122f7954ba9313d", - "POSTGIS_CHECKOUT_SHA1": "c438732240688e769e5eefe08122f7954ba9313d", + "POSTGIS_CHECKOUT": "e12e7302bfe021026d8f3d8b567a3f048a782771", + "POSTGIS_CHECKOUT_SHA1": "e12e7302bfe021026d8f3d8b567a3f048a782771", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "59eaaed3168f49e8a7a3821730277aff68a86d16", - "GDAL_CHECKOUT_SHA1": "59eaaed3168f49e8a7a3821730277aff68a86d16", + "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", + "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", "BOOST_VERSION": "1.74.0" From a7f15183001d5fb7e68bdc291be4c9be0cf7a4a5 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 12 Nov 2023 00:00:39 +0100 Subject: [PATCH 019/167] update to geos 3.12.1 --- 15-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- versions.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 5191f6eca..da027ee00 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 0f5620104..5fd4d77e6 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/versions.json b/versions.json index be443dbd7..bf0b310e0 100644 --- a/versions.json +++ b/versions.json @@ -246,8 +246,8 @@ "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.7.3", "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", - "GEOS_CHECKOUT": "tags/3.12.0", - "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "GEOS_CHECKOUT": "tags/3.12.1", + "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", @@ -354,8 +354,8 @@ "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.7.3", "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", - "GEOS_CHECKOUT": "tags/3.12.0", - "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "GEOS_CHECKOUT": "tags/3.12.1", + "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", From 30eb331973d83cf45f1f74963de844ccc0ee4c93 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 12 Nov 2023 16:17:07 +0100 Subject: [PATCH 020/167] update .. --- 15-master/bookworm/Dockerfile | 4 ++-- 16-master/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index d4fe13d3c..565fbd17f 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GEOS_CHECKOUT=8ebc1bd3b44a0e213ddf9ee5397697df47269006 ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GEOS_CHECKOUT_SHA1=8ebc1bd3b44a0e213ddf9ee5397697df47269006 ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 7e290dc06..f0eaa7dc9 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -16,14 +16,14 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GEOS_CHECKOUT=8ebc1bd3b44a0e213ddf9ee5397697df47269006 ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8cf761b4d77b1261e0f6673c6716adb2daee7eb1 +ARG PGIS1_GEOS_CHECKOUT_SHA1=8ebc1bd3b44a0e213ddf9ee5397697df47269006 ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 diff --git a/README.md b/README.md index 4ea431dcb..51a48785f 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-11-11) +## Versions (2023-11-12) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index bf0b310e0..5b27f0fb2 100644 --- a/versions.json +++ b/versions.json @@ -226,8 +226,8 @@ "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", - "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", + "GEOS_CHECKOUT": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", + "GEOS_CHECKOUT_SHA1": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", "BOOST_VERSION": "1.74.0" } }, @@ -334,8 +334,8 @@ "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GEOS_CHECKOUT": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", - "GEOS_CHECKOUT_SHA1": "8cf761b4d77b1261e0f6673c6716adb2daee7eb1", + "GEOS_CHECKOUT": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", + "GEOS_CHECKOUT_SHA1": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", "BOOST_VERSION": "1.74.0" } }, From a9a1a0bf88402c090205c9fd4fa8e7ba11e7f8d5 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 15 Nov 2023 06:36:02 +0100 Subject: [PATCH 021/167] locking geos + update ) --- 15-master/bookworm/Dockerfile | 16 ++++----- 15-recent/bookworm/Dockerfile | 8 ++--- 16-master/bookworm/Dockerfile | 16 ++++----- 16-recent/bookworm/Dockerfile | 8 ++--- README.md | 2 +- versions.json | 48 +++++++++++++------------- versions.sh | 64 ++++++++++++++++++++++++----------- 7 files changed, 94 insertions(+), 68 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 565fbd17f..4187fc5d3 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT=8ebc1bd3b44a0e213ddf9ee5397697df47269006 -ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c -ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ARG PGIS1_POSTGIS_CHECKOUT=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 +ARG PGIS1_GEOS_CHECKOUT=e45ab35daa746e0a589d394e8fb76f31a79933f9 +ARG PGIS1_GDAL_CHECKOUT=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 +ARG PGIS1_PROJ_CHECKOUT=15389b39c7eeeae4cf3849f9b4d9e8481520642f ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8ebc1bd3b44a0e213ddf9ee5397697df47269006 -ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c -ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 +ARG PGIS1_GEOS_CHECKOUT_SHA1=e45ab35daa746e0a589d394e8fb76f31a79933f9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=15389b39c7eeeae4cf3849f9b4d9e8481520642f ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index da027ee00..033798df6 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -16,15 +16,15 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 +ARG PGIS1_GEOS_CHECKOUT=tags/tags/3.12.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index f0eaa7dc9..248360e42 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT=8ebc1bd3b44a0e213ddf9ee5397697df47269006 -ARG PGIS1_GDAL_CHECKOUT=f77e05dd2fbfd96933621de9a42f763fd158933c -ARG PGIS1_PROJ_CHECKOUT=e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ARG PGIS1_POSTGIS_CHECKOUT=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 +ARG PGIS1_GEOS_CHECKOUT=e45ab35daa746e0a589d394e8fb76f31a79933f9 +ARG PGIS1_GDAL_CHECKOUT=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 +ARG PGIS1_PROJ_CHECKOUT=15389b39c7eeeae4cf3849f9b4d9e8481520642f ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e12e7302bfe021026d8f3d8b567a3f048a782771 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8ebc1bd3b44a0e213ddf9ee5397697df47269006 -ARG PGIS1_GDAL_CHECKOUT_SHA1=f77e05dd2fbfd96933621de9a42f763fd158933c -ARG PGIS1_PROJ_CHECKOUT_SHA1=e9c0e8c80595315921f2ae715a8ca6eca4a19558 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 +ARG PGIS1_GEOS_CHECKOUT_SHA1=e45ab35daa746e0a589d394e8fb76f31a79933f9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=15389b39c7eeeae4cf3849f9b4d9e8481520642f ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 5fd4d77e6..ae74c5c42 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,15 +16,15 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 +ARG PGIS1_GEOS_CHECKOUT=tags/tags/3.12.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/README.md b/README.md index 51a48785f..b12e87a9a 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-11-12) +## Versions (2023-11-15) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 5b27f0fb2..6279b1605 100644 --- a/versions.json +++ b/versions.json @@ -216,18 +216,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "e12e7302bfe021026d8f3d8b567a3f048a782771", - "POSTGIS_CHECKOUT_SHA1": "e12e7302bfe021026d8f3d8b567a3f048a782771", + "POSTGIS_CHECKOUT": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", + "POSTGIS_CHECKOUT_SHA1": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GEOS_CHECKOUT": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", - "GEOS_CHECKOUT_SHA1": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", + "PROJ_CHECKOUT": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", + "PROJ_CHECKOUT_SHA1": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", + "GDAL_CHECKOUT": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", + "GDAL_CHECKOUT_SHA1": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", + "GEOS_CHECKOUT": "e45ab35daa746e0a589d394e8fb76f31a79933f9", + "GEOS_CHECKOUT_SHA1": "e45ab35daa746e0a589d394e8fb76f31a79933f9", "BOOST_VERSION": "1.74.0" } }, @@ -244,10 +244,10 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.3", - "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", - "GEOS_CHECKOUT": "tags/3.12.1", - "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", + "GDAL_CHECKOUT": "tags/v3.8.0", + "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", + "GEOS_CHECKOUT": "tags/tags/3.12.0", + "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", @@ -324,18 +324,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "e12e7302bfe021026d8f3d8b567a3f048a782771", - "POSTGIS_CHECKOUT_SHA1": "e12e7302bfe021026d8f3d8b567a3f048a782771", + "POSTGIS_CHECKOUT": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", + "POSTGIS_CHECKOUT_SHA1": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "PROJ_CHECKOUT": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "PROJ_CHECKOUT_SHA1": "e9c0e8c80595315921f2ae715a8ca6eca4a19558", - "GDAL_CHECKOUT": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GDAL_CHECKOUT_SHA1": "f77e05dd2fbfd96933621de9a42f763fd158933c", - "GEOS_CHECKOUT": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", - "GEOS_CHECKOUT_SHA1": "8ebc1bd3b44a0e213ddf9ee5397697df47269006", + "PROJ_CHECKOUT": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", + "PROJ_CHECKOUT_SHA1": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", + "GDAL_CHECKOUT": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", + "GDAL_CHECKOUT_SHA1": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", + "GEOS_CHECKOUT": "e45ab35daa746e0a589d394e8fb76f31a79933f9", + "GEOS_CHECKOUT_SHA1": "e45ab35daa746e0a589d394e8fb76f31a79933f9", "BOOST_VERSION": "1.74.0" } }, @@ -352,10 +352,10 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.7.3", - "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", - "GEOS_CHECKOUT": "tags/3.12.1", - "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", + "GDAL_CHECKOUT": "tags/v3.8.0", + "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", + "GEOS_CHECKOUT": "tags/tags/3.12.0", + "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", diff --git a/versions.sh b/versions.sh index 7a334e387..65b4d3cc2 100755 --- a/versions.sh +++ b/versions.sh @@ -27,6 +27,13 @@ postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" postgres_versions="11 12 13 14 15 16" +# locking versions for dependencies +CGAL_CHECKOUT_LOCK="" +SFCGAL_CHECKOUT_LOCK="" +GEOS_CHECKOUT_LOCK="tags/3.12.0" +PROJ_CHECKOUT_LOCK="" +GDAL_CHECKOUT_LOCK="" + declare -A postgisDebPkgNameVersionSuffixes=( [3.0]='3' [3.1]='3' @@ -34,6 +41,7 @@ declare -A postgisDebPkgNameVersionSuffixes=( [3.3]='3' [3.4]='3' [3.5]='3' + [3.6]='3' ) declare -A boostVersion=( @@ -50,6 +58,9 @@ function get_tag_hash() { local repo="$1" local version="$2" + # remover tasg/ prefix if exists. + version=${version#tags/} + git ls-remote --sort="v:refname" "$repo" refs/tags/"$version"* | grep -E 'refs/tags/'"$version"'(\^\{\})?$' | tail -n1 | @@ -161,6 +172,8 @@ get_latest_version_and_hash() { local repo_development="${3:-}" # Argumnet 3: tag filter - optional local repo_only="${4:-}" + # Argumnet 4: checkout lock + local checkout_lock="${5:-}" echo "[+] Checking lastversion : $repo_id - $repo_url" # Fetch the latest version tag using the lastversion command @@ -171,10 +184,23 @@ get_latest_version_and_hash() { repo_development="" fi - if [ -z "$repo_only" ]; then - eval "lastversion_${repo_id}=$(lastversion ${repo_development} --format tag "${repo_url}")" + if [[ "${repo_only}" == "norepo" ]]; then + repo_only="" + fi + + if [ -z "$checkout_lock" ]; then + if [ -z "$repo_only" ]; then + eval "lastversion_${repo_id}=$(lastversion ${repo_development} --format tag "${repo_url}")" + else + eval "lastversion_${repo_id}${repo_only}=$(lastversion ${repo_development} --format tag --only "${repo_only}" "${repo_url}")" + fi else - eval "lastversion_${repo_id}${repo_only}=$(lastversion ${repo_development} --format tag --only "${repo_only}" "${repo_url}")" + echo "[+] Locked to ${checkout_lock}" + if [ -z "$repo_only" ]; then + eval "lastversion_${repo_id}=${checkout_lock}" + else + eval "lastversion_${repo_id}${repo_only}=${checkout_lock}" + fi fi # Intermediary step to resolve the variable name @@ -203,22 +229,22 @@ get_latest_version_and_hash() { fi } -get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" pre-releases -get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases -get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases -get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases - -get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases -get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" releases -get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" releases -get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases -get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases -get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases - -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL14 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL13 +get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" pre-releases norepo "" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases norepo "" +get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases norepo "" +get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases norepo "" + +get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases norepo "" +get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" releases norepo "${CGAL_CHECKOUT_LOCK}" +get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" releases norepo "${GEOS_CHECKOUT_LOCK}" +get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases norepo "${GDAL_CHECKOUT_LOCK}" +get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases norepo "${PROJ_CHECKOUT_LOCK}" +get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases norepo "${SFCGAL_CHECKOUT_LOCK}" + +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 "" +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 "" +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL14 "" +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL13 "" #------------------------------------------- From f6610f86aae1e77eea770c5d251f0cc11b0d8bbb Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 15 Nov 2023 07:04:29 +0100 Subject: [PATCH 022/167] fix recent - geos lock --- 15-recent/bookworm/Dockerfile | 2 +- 16-recent/bookworm/Dockerfile | 2 +- versions.json | 4 ++-- versions.sh | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 033798df6..712a2d2d2 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/tags/3.12.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index ae74c5c42..076825a66 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/tags/3.12.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 diff --git a/versions.json b/versions.json index 6279b1605..d831ad0d9 100644 --- a/versions.json +++ b/versions.json @@ -246,7 +246,7 @@ "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.8.0", "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", - "GEOS_CHECKOUT": "tags/tags/3.12.0", + "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", @@ -354,7 +354,7 @@ "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.8.0", "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", - "GEOS_CHECKOUT": "tags/tags/3.12.0", + "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", diff --git a/versions.sh b/versions.sh index 65b4d3cc2..6725727cc 100755 --- a/versions.sh +++ b/versions.sh @@ -58,7 +58,7 @@ function get_tag_hash() { local repo="$1" local version="$2" - # remover tasg/ prefix if exists. + # remove tag/ prefix if exists. version=${version#tags/} git ls-remote --sort="v:refname" "$repo" refs/tags/"$version"* | @@ -175,6 +175,9 @@ get_latest_version_and_hash() { # Argumnet 4: checkout lock local checkout_lock="${5:-}" + # remove tag/ prefix if exists. + checkout_lock=${checkout_lock#tags/} + echo "[+] Checking lastversion : $repo_id - $repo_url" # Fetch the latest version tag using the lastversion command @@ -195,7 +198,7 @@ get_latest_version_and_hash() { eval "lastversion_${repo_id}${repo_only}=$(lastversion ${repo_development} --format tag --only "${repo_only}" "${repo_url}")" fi else - echo "[+] Locked to ${checkout_lock}" + echo " !Locked to ${checkout_lock}" if [ -z "$repo_only" ]; then eval "lastversion_${repo_id}=${checkout_lock}" else From a243c1ac72fddfe60e9d0f7ce8a54651f17420b6 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 16 Nov 2023 09:57:34 +0100 Subject: [PATCH 023/167] improve CircleCI --- .circleci/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c092c8f4..71abcec52 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,10 @@ jobs: type: string steps: - checkout + - docker/check: + registry: docker.io + docker-username: DOCKERHUB_USERNAME + docker-password: DOCKERHUB_ACCESS_TOKEN - run: uname -a - run: docker --version - run: docker info @@ -39,11 +43,6 @@ jobs: - run: pip3 install lastversion - run: source tools/environment_init.sh - run: make check_version - - docker/check: - registry: docker.io - docker-username: DOCKERHUB_USERNAME - docker-password: DOCKERHUB_ACCESS_TOKEN - - run: name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists command: | From e43b43379f4c19d5027a251e7a554b7358bee3d8 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 20 Nov 2023 15:45:33 +0100 Subject: [PATCH 024/167] update postgis 3.4.1 --- .github/workflows/main.yml | 12 +-- 11-3.3/alpine3.18/Dockerfile | 4 +- 11-3.3/alpine3.18/tags | 2 +- 12-3.4/alpine3.18/Dockerfile | 4 +- 12-3.4/alpine3.18/tags | 2 +- 13-3.4/alpine3.18/Dockerfile | 4 +- 13-3.4/alpine3.18/tags | 2 +- 14-3.4/alpine3.18/Dockerfile | 4 +- 14-3.4/alpine3.18/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 1 + 15-3.4/alpine3.18/Dockerfile | 4 +- 15-3.4/alpine3.18/tags | 2 +- 15-master/bookworm/Dockerfile | 26 +++--- 15-recent/bookworm/Dockerfile | 8 +- 16-3.4-bundle0/bookworm/Dockerfile | 1 + 16-3.4/alpine3.18/Dockerfile | 4 +- 16-3.4/alpine3.18/tags | 2 +- 16-master/bookworm/Dockerfile | 26 +++--- 16-recent/bookworm/Dockerfile | 8 +- Dockerfile.bundle0.template | 1 + README.md | 14 ++-- manifest.sh | 36 ++++----- versions.json | 124 ++++++++++++++--------------- versions.sh | 2 +- 24 files changed, 149 insertions(+), 146 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a4a66c7e..5dd742d1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,25 +24,25 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "11-3.3", variant: "alpine3.18", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine", readme_group: "alpine3.18" } + - { version: "11-3.3", variant: "alpine3.18", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine", readme_group: "alpine3.18" } - { version: "11-3.3", variant: "bookworm", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", readme_group: "bookworm" } - { version: "11-3.3", variant: "bullseye", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bullseye 11-3.3.4-bullseye", readme_group: "bullseye" } - - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent", readme_group: "recent" } - - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } diff --git a/11-3.3/alpine3.18/Dockerfile b/11-3.3/alpine3.18/Dockerfile index 0221b233d..f228770ae 100644 --- a/11-3.3/alpine3.18/Dockerfile +++ b/11-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:11-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.4 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=846cce0c6420a3d0483d2a1a3baee182d2fc1217 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 FROM ${PGIS1_BASE_IMAGE} diff --git a/11-3.3/alpine3.18/tags b/11-3.3/alpine3.18/tags index 74b2f3bde..f7deab421 100644 --- a/11-3.3/alpine3.18/tags +++ b/11-3.3/alpine3.18/tags @@ -1 +1 @@ -11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine +11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index cd1db43c1..64df67dc5 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.18/tags b/12-3.4/alpine3.18/tags index 5d3182592..106282d13 100644 --- a/12-3.4/alpine3.18/tags +++ b/12-3.4/alpine3.18/tags @@ -1 +1 @@ -12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine +12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index e8d8c40df..aac7e9145 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.18/tags b/13-3.4/alpine3.18/tags index 6c7665f4f..2fe60a890 100644 --- a/13-3.4/alpine3.18/tags +++ b/13-3.4/alpine3.18/tags @@ -1 +1 @@ -13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine +13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 4a0af0f6d..2c2a6e2db 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.18/tags b/14-3.4/alpine3.18/tags index 2a1575478..d2ca7f39d 100644 --- a/14-3.4/alpine3.18/tags +++ b/14-3.4/alpine3.18/tags @@ -1 +1 @@ -14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine +14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 92a466e6a..821e6ba1f 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -203,6 +203,7 @@ RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw #TODO +# add https://github.com/bosth/geofdw # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 0255bd80c..f0d0bb48f 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags index 7c8ad00ef..2f00fec87 100644 --- a/15-3.4/alpine3.18/tags +++ b/15-3.4/alpine3.18/tags @@ -1 +1 @@ -15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine +15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 4187fc5d3..c99bdf8b8 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 -ARG PGIS1_GEOS_CHECKOUT=e45ab35daa746e0a589d394e8fb76f31a79933f9 -ARG PGIS1_GDAL_CHECKOUT=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 -ARG PGIS1_PROJ_CHECKOUT=15389b39c7eeeae4cf3849f9b4d9e8481520642f -ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 -ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 -ARG PGIS1_GEOS_CHECKOUT_SHA1=e45ab35daa746e0a589d394e8fb76f31a79933f9 -ARG PGIS1_GDAL_CHECKOUT_SHA1=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 -ARG PGIS1_PROJ_CHECKOUT_SHA1=15389b39c7eeeae4cf3849f9b4d9e8481520642f -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 -ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ARG PGIS1_POSTGIS_CHECKOUT=f0643233c02e31ff98de3b8ec6c4b9670500ce06 +ARG PGIS1_GEOS_CHECKOUT=b3c6777b99fdec10a4cbdf26005697df0111f67d +ARG PGIS1_GDAL_CHECKOUT=994e40dbbf3dfd58ad66de02d87070afafd8da88 +ARG PGIS1_PROJ_CHECKOUT=f759fe597ae8302bb84663532921570b47b96ab7 +ARG PGIS1_SFCGAL_CHECKOUT=83dcde8ec703373775262a4032a7bf56a254c1fd +ARG PGIS1_CGAL_CHECKOUT=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f0643233c02e31ff98de3b8ec6c4b9670500ce06 +ARG PGIS1_GEOS_CHECKOUT_SHA1=b3c6777b99fdec10a4cbdf26005697df0111f67d +ARG PGIS1_GDAL_CHECKOUT_SHA1=994e40dbbf3dfd58ad66de02d87070afafd8da88 +ARG PGIS1_PROJ_CHECKOUT_SHA1=f759fe597ae8302bb84663532921570b47b96ab7 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=83dcde8ec703373775262a4032a7bf56a254c1fd +ARG PGIS1_CGAL_CHECKOUT_SHA1=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 712a2d2d2..71fb7f09b 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -15,15 +15,15 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index bea717121..e8d572ae8 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -178,6 +178,7 @@ RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw #TODO +# add https://github.com/bosth/geofdw # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index 03a3926b9..378a553a7 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags index b59d72481..a766d120f 100644 --- a/16-3.4/alpine3.18/tags +++ b/16-3.4/alpine3.18/tags @@ -1 +1 @@ -16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine +16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 248360e42..a53f70318 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 -ARG PGIS1_GEOS_CHECKOUT=e45ab35daa746e0a589d394e8fb76f31a79933f9 -ARG PGIS1_GDAL_CHECKOUT=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 -ARG PGIS1_PROJ_CHECKOUT=15389b39c7eeeae4cf3849f9b4d9e8481520642f -ARG PGIS1_SFCGAL_CHECKOUT=919eb1442515e4c5cd0fb03f0803beb548d24d60 -ARG PGIS1_CGAL_CHECKOUT=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dc000e90e42a2cd85cef46ecb12b82c41f5d1a16 -ARG PGIS1_GEOS_CHECKOUT_SHA1=e45ab35daa746e0a589d394e8fb76f31a79933f9 -ARG PGIS1_GDAL_CHECKOUT_SHA1=61b83a3c4abfb38d0a0237c1205ad1fbf73827c4 -ARG PGIS1_PROJ_CHECKOUT_SHA1=15389b39c7eeeae4cf3849f9b4d9e8481520642f -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=919eb1442515e4c5cd0fb03f0803beb548d24d60 -ARG PGIS1_CGAL_CHECKOUT_SHA1=08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9 +ARG PGIS1_POSTGIS_CHECKOUT=f0643233c02e31ff98de3b8ec6c4b9670500ce06 +ARG PGIS1_GEOS_CHECKOUT=b3c6777b99fdec10a4cbdf26005697df0111f67d +ARG PGIS1_GDAL_CHECKOUT=994e40dbbf3dfd58ad66de02d87070afafd8da88 +ARG PGIS1_PROJ_CHECKOUT=f759fe597ae8302bb84663532921570b47b96ab7 +ARG PGIS1_SFCGAL_CHECKOUT=83dcde8ec703373775262a4032a7bf56a254c1fd +ARG PGIS1_CGAL_CHECKOUT=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f0643233c02e31ff98de3b8ec6c4b9670500ce06 +ARG PGIS1_GEOS_CHECKOUT_SHA1=b3c6777b99fdec10a4cbdf26005697df0111f67d +ARG PGIS1_GDAL_CHECKOUT_SHA1=994e40dbbf3dfd58ad66de02d87070afafd8da88 +ARG PGIS1_PROJ_CHECKOUT_SHA1=f759fe597ae8302bb84663532921570b47b96ab7 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=83dcde8ec703373775262a4032a7bf56a254c1fd +ARG PGIS1_CGAL_CHECKOUT_SHA1=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 076825a66..0b2c30d2d 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -15,15 +15,15 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 -ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 7b2f6caf5..7d61218dc 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -202,6 +202,7 @@ RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw #TODO +# add https://github.com/bosth/geofdw # RUN pgxn install --verbose plv8 # todo: need to fix build # RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check # RUN pgxn install --verbose pg_bm25 # need rust diff --git a/README.md b/README.md index b12e87a9a..a5f6c95af 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-11-15) +## Versions (2023-11-20) We provide multi-platform image support for the following architectures: @@ -120,12 +120,12 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.4 | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 | +| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.5-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.5 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.1 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.1 | ### 📋Test images diff --git a/manifest.sh b/manifest.sh index bc82398e5..775450513 100755 --- a/manifest.sh +++ b/manifest.sh @@ -20,11 +20,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:11-3.3-alpine3.18 \ --target ${dockername}:11-3.3-alpine3.18 || true -echo "manifest: ${dockername}:11-3.3.4-alpine3.18" +echo "manifest: ${dockername}:11-3.3.5-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3.4-alpine3.18 \ - --target ${dockername}:11-3.3.4-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:11-3.3.5-alpine3.18 \ + --target ${dockername}:11-3.3.5-alpine3.18 || true echo "manifest: ${dockername}:11-3.3-alpine" manifest-tool push from-args \ @@ -74,11 +74,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.18 \ --target ${dockername}:12-3.4-alpine3.18 || true -echo "manifest: ${dockername}:12-3.4.0-alpine3.18" +echo "manifest: ${dockername}:12-3.4.1-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.0-alpine3.18 \ - --target ${dockername}:12-3.4.0-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.4.1-alpine3.18 \ + --target ${dockername}:12-3.4.1-alpine3.18 || true echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ @@ -128,11 +128,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.18 \ --target ${dockername}:13-3.4-alpine3.18 || true -echo "manifest: ${dockername}:13-3.4.0-alpine3.18" +echo "manifest: ${dockername}:13-3.4.1-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.0-alpine3.18 \ - --target ${dockername}:13-3.4.0-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.4.1-alpine3.18 \ + --target ${dockername}:13-3.4.1-alpine3.18 || true echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ @@ -182,11 +182,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.18 \ --target ${dockername}:14-3.4-alpine3.18 || true -echo "manifest: ${dockername}:14-3.4.0-alpine3.18" +echo "manifest: ${dockername}:14-3.4.1-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.0-alpine3.18 \ - --target ${dockername}:14-3.4.0-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.4.1-alpine3.18 \ + --target ${dockername}:14-3.4.1-alpine3.18 || true echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ @@ -236,11 +236,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.18 \ --target ${dockername}:15-3.4-alpine3.18 || true -echo "manifest: ${dockername}:15-3.4.0-alpine3.18" +echo "manifest: ${dockername}:15-3.4.1-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.0-alpine3.18 \ - --target ${dockername}:15-3.4.0-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.4.1-alpine3.18 \ + --target ${dockername}:15-3.4.1-alpine3.18 || true echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ @@ -338,11 +338,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.18 \ --target ${dockername}:16-3.4-alpine3.18 || true -echo "manifest: ${dockername}:16-3.4.0-alpine3.18" +echo "manifest: ${dockername}:16-3.4.1-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.0-alpine3.18 \ - --target ${dockername}:16-3.4.0-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.4.1-alpine3.18 \ + --target ${dockername}:16-3.4.1-alpine3.18 || true echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index d831ad0d9..13790da42 100644 --- a/versions.json +++ b/versions.json @@ -23,17 +23,17 @@ "POSTGIS_VERSION": "3.3.4+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "11-3.3-alpine3.18 11-3.3.4-alpine3.18 11-3.3-alpine", + "tags": "11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "11", "PG_DOCKER": "11", - "POSTGIS_VERSION": "3.3.4", - "POSTGIS_SHA256": "68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e", - "POSTGIS_CHECKOUT": "tags/3.3.4", - "POSTGIS_CHECKOUT_SHA1": "846cce0c6420a3d0483d2a1a3baee182d2fc1217" + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" } }, "12-3.4": { @@ -60,17 +60,17 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "12-3.4-alpine3.18 12-3.4.0-alpine3.18 12-3.4-alpine", + "tags": "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.0", - "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "13-3.4": { @@ -97,17 +97,17 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "13-3.4-alpine3.18 13-3.4.0-alpine3.18 13-3.4-alpine", + "tags": "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.0", - "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "14-3.4": { @@ -134,17 +134,17 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "14-3.4-alpine3.18 14-3.4.0-alpine3.18 14-3.4-alpine", + "tags": "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.0", - "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "15-3.4": { @@ -171,17 +171,17 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", + "tags": "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.0", - "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "15-3.4-bundle0": { @@ -216,18 +216,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", - "POSTGIS_CHECKOUT_SHA1": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", - "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "PROJ_CHECKOUT": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", - "PROJ_CHECKOUT_SHA1": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", - "GDAL_CHECKOUT": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", - "GDAL_CHECKOUT_SHA1": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", - "GEOS_CHECKOUT": "e45ab35daa746e0a589d394e8fb76f31a79933f9", - "GEOS_CHECKOUT_SHA1": "e45ab35daa746e0a589d394e8fb76f31a79933f9", + "POSTGIS_CHECKOUT": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", + "POSTGIS_CHECKOUT_SHA1": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", + "CGAL_CHECKOUT": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", + "CGAL_CHECKOUT_SHA1": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", + "SFCGAL_CHECKOUT": "83dcde8ec703373775262a4032a7bf56a254c1fd", + "SFCGAL_CHECKOUT_SHA1": "83dcde8ec703373775262a4032a7bf56a254c1fd", + "PROJ_CHECKOUT": "f759fe597ae8302bb84663532921570b47b96ab7", + "PROJ_CHECKOUT_SHA1": "f759fe597ae8302bb84663532921570b47b96ab7", + "GDAL_CHECKOUT": "994e40dbbf3dfd58ad66de02d87070afafd8da88", + "GDAL_CHECKOUT_SHA1": "994e40dbbf3dfd58ad66de02d87070afafd8da88", + "GEOS_CHECKOUT": "b3c6777b99fdec10a4cbdf26005697df0111f67d", + "GEOS_CHECKOUT_SHA1": "b3c6777b99fdec10a4cbdf26005697df0111f67d", "BOOST_VERSION": "1.74.0" } }, @@ -240,14 +240,14 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.8.0", "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", - "GEOS_CHECKOUT": "tags/3.12.0", - "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "GEOS_CHECKOUT": "tags/3.12.1", + "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", @@ -279,17 +279,17 @@ "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine", + "tags": "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.0", - "POSTGIS_SHA256": "3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8" + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "16-3.4-bundle0": { @@ -324,18 +324,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", - "POSTGIS_CHECKOUT_SHA1": "dc000e90e42a2cd85cef46ecb12b82c41f5d1a16", - "CGAL_CHECKOUT": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "CGAL_CHECKOUT_SHA1": "08b5c909556c0c4e60b4b318ff0e5a3b8d6897b9", - "SFCGAL_CHECKOUT": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "SFCGAL_CHECKOUT_SHA1": "919eb1442515e4c5cd0fb03f0803beb548d24d60", - "PROJ_CHECKOUT": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", - "PROJ_CHECKOUT_SHA1": "15389b39c7eeeae4cf3849f9b4d9e8481520642f", - "GDAL_CHECKOUT": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", - "GDAL_CHECKOUT_SHA1": "61b83a3c4abfb38d0a0237c1205ad1fbf73827c4", - "GEOS_CHECKOUT": "e45ab35daa746e0a589d394e8fb76f31a79933f9", - "GEOS_CHECKOUT_SHA1": "e45ab35daa746e0a589d394e8fb76f31a79933f9", + "POSTGIS_CHECKOUT": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", + "POSTGIS_CHECKOUT_SHA1": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", + "CGAL_CHECKOUT": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", + "CGAL_CHECKOUT_SHA1": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", + "SFCGAL_CHECKOUT": "83dcde8ec703373775262a4032a7bf56a254c1fd", + "SFCGAL_CHECKOUT_SHA1": "83dcde8ec703373775262a4032a7bf56a254c1fd", + "PROJ_CHECKOUT": "f759fe597ae8302bb84663532921570b47b96ab7", + "PROJ_CHECKOUT_SHA1": "f759fe597ae8302bb84663532921570b47b96ab7", + "GDAL_CHECKOUT": "994e40dbbf3dfd58ad66de02d87070afafd8da88", + "GDAL_CHECKOUT_SHA1": "994e40dbbf3dfd58ad66de02d87070afafd8da88", + "GEOS_CHECKOUT": "b3c6777b99fdec10a4cbdf26005697df0111f67d", + "GEOS_CHECKOUT_SHA1": "b3c6777b99fdec10a4cbdf26005697df0111f67d", "BOOST_VERSION": "1.74.0" } }, @@ -348,14 +348,14 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "tags/3.4.0", - "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", "GDAL_CHECKOUT": "tags/v3.8.0", "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", - "GEOS_CHECKOUT": "tags/3.12.0", - "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", + "GEOS_CHECKOUT": "tags/3.12.1", + "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "CGAL_CHECKOUT": "tags/v5.6", diff --git a/versions.sh b/versions.sh index 6725727cc..a84936ad2 100755 --- a/versions.sh +++ b/versions.sh @@ -30,7 +30,7 @@ postgres_versions="11 12 13 14 15 16" # locking versions for dependencies CGAL_CHECKOUT_LOCK="" SFCGAL_CHECKOUT_LOCK="" -GEOS_CHECKOUT_LOCK="tags/3.12.0" +GEOS_CHECKOUT_LOCK="" PROJ_CHECKOUT_LOCK="" GDAL_CHECKOUT_LOCK="" From 5aa415e778b42d9621211f4f38ab960fa4150c31 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 3 Dec 2023 19:40:41 +0100 Subject: [PATCH 025/167] multiple improvements - add recent tags, readme info etc - readme updates, more security info - version updates - etc .. --- .github/workflows/main.yml | 28 +++---- 11-3.3/bookworm/Dockerfile | 1 + 11-3.3/bullseye/Dockerfile | 1 + 12-3.4/bookworm/Dockerfile | 5 +- 12-3.4/bookworm/tags | 2 +- 12-3.4/bullseye/Dockerfile | 5 +- 12-3.4/bullseye/tags | 2 +- 13-3.4/bookworm/Dockerfile | 5 +- 13-3.4/bookworm/tags | 2 +- 13-3.4/bullseye/Dockerfile | 5 +- 13-3.4/bullseye/tags | 2 +- 14-3.4/bookworm/Dockerfile | 5 +- 14-3.4/bookworm/tags | 2 +- 14-3.4/bullseye/Dockerfile | 5 +- 14-3.4/bullseye/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 4 +- 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/bookworm/Dockerfile | 5 +- 15-3.4/bookworm/tags | 2 +- 15-3.4/bullseye/Dockerfile | 5 +- 15-3.4/bullseye/tags | 2 +- 15-master/bookworm/Dockerfile | 26 +++--- 15-recent/bookworm/Dockerfile | 8 +- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 +- 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/bookworm/Dockerfile | 5 +- 16-3.4/bookworm/tags | 2 +- 16-3.4/bullseye/Dockerfile | 5 +- 16-3.4/bullseye/tags | 2 +- 16-master/bookworm/Dockerfile | 26 +++--- 16-recent/bookworm/Dockerfile | 8 +- 16-recent/bookworm/tags | 2 +- Dockerfile.debian.template | 5 ++ README.md | 69 +++++++++++----- apply-readme.sh | 12 ++- manifest.sh | 102 +++++++++++++++--------- versions.json | 124 ++++++++++++++--------------- versions.sh | 21 ++++- 39 files changed, 309 insertions(+), 208 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5dd742d1b..527e2e251 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,26 +28,26 @@ jobs: - { version: "11-3.3", variant: "bookworm", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", readme_group: "bookworm" } - { version: "11-3.3", variant: "bullseye", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bullseye 11-3.3.4-bullseye", readme_group: "bullseye" } - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } - - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", readme_group: "bookworm" } - - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } + - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } - - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", readme_group: "bookworm" } - - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", readme_group: "bookworm" } + - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.1-bullseye", readme_group: "bullseye" } - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } - - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" } - - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" } + - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", readme_group: "bookworm" } + - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", readme_group: "bookworm" } - - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } +# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", readme_group: "bookworm" } + - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" } -# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", readme_group: "bookworm" } - - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" } - - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } +# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } + - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/11-3.3/bookworm/Dockerfile b/11-3.3/bookworm/Dockerfile index 1fc519d7a..e26c7683a 100644 --- a/11-3.3/bookworm/Dockerfile +++ b/11-3.3/bookworm/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + # \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/11-3.3/bullseye/Dockerfile b/11-3.3/bullseye/Dockerfile index 07f78ac58..a41701357 100644 --- a/11-3.3/bullseye/Dockerfile +++ b/11-3.3/bullseye/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + # \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile index d05ad2002..8daa36909 100644 --- a/12-3.4/bookworm/Dockerfile +++ b/12-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags index 5140fdf82..7a98fdd2b 100644 --- a/12-3.4/bookworm/tags +++ b/12-3.4/bookworm/tags @@ -1 +1 @@ -12-3.4-bookworm 12-3.4.0-bookworm 12-3.4 +12-3.4-bookworm 12-3.4.1-bookworm 12-3.4 diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile index 3574fb533..b8cf11e4b 100644 --- a/12-3.4/bullseye/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags index 2de2a735f..ad816812d 100644 --- a/12-3.4/bullseye/tags +++ b/12-3.4/bullseye/tags @@ -1 +1 @@ -12-3.4-bullseye 12-3.4.0-bullseye +12-3.4-bullseye 12-3.4.1-bullseye diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile index 68a108867..899ac0c10 100644 --- a/13-3.4/bookworm/Dockerfile +++ b/13-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags index 06232a75e..221b9f2e1 100644 --- a/13-3.4/bookworm/tags +++ b/13-3.4/bookworm/tags @@ -1 +1 @@ -13-3.4-bookworm 13-3.4.0-bookworm 13-3.4 +13-3.4-bookworm 13-3.4.1-bookworm 13-3.4 diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile index a8135b931..3b563ec08 100644 --- a/13-3.4/bullseye/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags index 94a5d2dc2..8afde38f2 100644 --- a/13-3.4/bullseye/tags +++ b/13-3.4/bullseye/tags @@ -1 +1 @@ -13-3.4-bullseye 13-3.4.0-bullseye +13-3.4-bullseye 13-3.4.1-bullseye diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile index e6725981d..51e4d3490 100644 --- a/14-3.4/bookworm/Dockerfile +++ b/14-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags index 1ddd86881..c6327df75 100644 --- a/14-3.4/bookworm/tags +++ b/14-3.4/bookworm/tags @@ -1 +1 @@ -14-3.4-bookworm 14-3.4.0-bookworm 14-3.4 +14-3.4-bookworm 14-3.4.1-bookworm 14-3.4 diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile index b7bf80958..2bd7f64e5 100644 --- a/14-3.4/bullseye/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags index a6ef03031..30fbb178d 100644 --- a/14-3.4/bullseye/tags +++ b/14-3.4/bullseye/tags @@ -1 +1 @@ -14-3.4-bullseye 14-3.4.0-bullseye +14-3.4-bullseye 14-3.4.1-bullseye diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 821e6ba1f..2ba2771c5 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=96f81a3106683f186f091ad88339c8c223f4363c ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index 38cd245b5..e0e7780e2 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 +15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile index 6269101ba..66eff9c8b 100644 --- a/15-3.4/bookworm/Dockerfile +++ b/15-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index d4dfc3cce..313c8e211 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 +15-3.4-bookworm 15-3.4.1-bookworm 15-3.4 diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile index 5b9055c97..b9756b32a 100644 --- a/15-3.4/bullseye/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags index e359ed582..50732a7e6 100644 --- a/15-3.4/bullseye/tags +++ b/15-3.4/bullseye/tags @@ -1 +1 @@ -15-3.4-bullseye 15-3.4.0-bullseye +15-3.4-bullseye 15-3.4.1-bullseye diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index c99bdf8b8..c4e16546d 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=f0643233c02e31ff98de3b8ec6c4b9670500ce06 -ARG PGIS1_GEOS_CHECKOUT=b3c6777b99fdec10a4cbdf26005697df0111f67d -ARG PGIS1_GDAL_CHECKOUT=994e40dbbf3dfd58ad66de02d87070afafd8da88 -ARG PGIS1_PROJ_CHECKOUT=f759fe597ae8302bb84663532921570b47b96ab7 -ARG PGIS1_SFCGAL_CHECKOUT=83dcde8ec703373775262a4032a7bf56a254c1fd -ARG PGIS1_CGAL_CHECKOUT=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f0643233c02e31ff98de3b8ec6c4b9670500ce06 -ARG PGIS1_GEOS_CHECKOUT_SHA1=b3c6777b99fdec10a4cbdf26005697df0111f67d -ARG PGIS1_GDAL_CHECKOUT_SHA1=994e40dbbf3dfd58ad66de02d87070afafd8da88 -ARG PGIS1_PROJ_CHECKOUT_SHA1=f759fe597ae8302bb84663532921570b47b96ab7 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=83dcde8ec703373775262a4032a7bf56a254c1fd -ARG PGIS1_CGAL_CHECKOUT_SHA1=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 +ARG PGIS1_POSTGIS_CHECKOUT=4338f0b59c47d651347564c74003598b4c55b8c1 +ARG PGIS1_GEOS_CHECKOUT=b3d6d20a94fdbe6a8401d176668a6d7d76465673 +ARG PGIS1_GDAL_CHECKOUT=187217953752a7ba4e39c9ad37b5f37cdfa77989 +ARG PGIS1_PROJ_CHECKOUT=167e99d2b9f12178de6e2038e86a553f6130aea8 +ARG PGIS1_SFCGAL_CHECKOUT=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 +ARG PGIS1_CGAL_CHECKOUT=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4338f0b59c47d651347564c74003598b4c55b8c1 +ARG PGIS1_GEOS_CHECKOUT_SHA1=b3d6d20a94fdbe6a8401d176668a6d7d76465673 +ARG PGIS1_GDAL_CHECKOUT_SHA1=187217953752a7ba4e39c9ad37b5f37cdfa77989 +ARG PGIS1_PROJ_CHECKOUT_SHA1=167e99d2b9f12178de6e2038e86a553f6130aea8 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 +ARG PGIS1_CGAL_CHECKOUT_SHA1=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 71fb7f09b..2bea053c8 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,15 +17,15 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc -ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_GDAL_CHECKOUT_SHA1=5dd68b5db794f9703bc3df6dd2aaee492ec39231 +ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 34c548669..2ba56558a 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index e8d572ae8..ae08c82ec 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=96f81a3106683f186f091ad88339c8c223f4363c ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 1fe9762e2..0ea0c66f4 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0 +16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0 diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile index 5688c1f86..a40c2bb6b 100644 --- a/16-3.4/bookworm/Dockerfile +++ b/16-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index 099c9151e..a9c12e7a9 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest +16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile index 16d59af98..a0e436112 100644 --- a/16-3.4/bullseye/Dockerfile +++ b/16-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ @@ -22,6 +22,7 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags index bc470fbcb..83171dda1 100644 --- a/16-3.4/bullseye/tags +++ b/16-3.4/bullseye/tags @@ -1 +1 @@ -16-3.4-bullseye 16-3.4.0-bullseye +16-3.4-bullseye 16-3.4.1-bullseye diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a53f70318..f51e5afe6 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=f0643233c02e31ff98de3b8ec6c4b9670500ce06 -ARG PGIS1_GEOS_CHECKOUT=b3c6777b99fdec10a4cbdf26005697df0111f67d -ARG PGIS1_GDAL_CHECKOUT=994e40dbbf3dfd58ad66de02d87070afafd8da88 -ARG PGIS1_PROJ_CHECKOUT=f759fe597ae8302bb84663532921570b47b96ab7 -ARG PGIS1_SFCGAL_CHECKOUT=83dcde8ec703373775262a4032a7bf56a254c1fd -ARG PGIS1_CGAL_CHECKOUT=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f0643233c02e31ff98de3b8ec6c4b9670500ce06 -ARG PGIS1_GEOS_CHECKOUT_SHA1=b3c6777b99fdec10a4cbdf26005697df0111f67d -ARG PGIS1_GDAL_CHECKOUT_SHA1=994e40dbbf3dfd58ad66de02d87070afafd8da88 -ARG PGIS1_PROJ_CHECKOUT_SHA1=f759fe597ae8302bb84663532921570b47b96ab7 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=83dcde8ec703373775262a4032a7bf56a254c1fd -ARG PGIS1_CGAL_CHECKOUT_SHA1=b6d9c444f887f4c03edb05d5ee3bd75b35d67130 +ARG PGIS1_POSTGIS_CHECKOUT=4338f0b59c47d651347564c74003598b4c55b8c1 +ARG PGIS1_GEOS_CHECKOUT=b3d6d20a94fdbe6a8401d176668a6d7d76465673 +ARG PGIS1_GDAL_CHECKOUT=187217953752a7ba4e39c9ad37b5f37cdfa77989 +ARG PGIS1_PROJ_CHECKOUT=167e99d2b9f12178de6e2038e86a553f6130aea8 +ARG PGIS1_SFCGAL_CHECKOUT=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 +ARG PGIS1_CGAL_CHECKOUT=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4338f0b59c47d651347564c74003598b4c55b8c1 +ARG PGIS1_GEOS_CHECKOUT_SHA1=b3d6d20a94fdbe6a8401d176668a6d7d76465673 +ARG PGIS1_GDAL_CHECKOUT_SHA1=187217953752a7ba4e39c9ad37b5f37cdfa77989 +ARG PGIS1_PROJ_CHECKOUT_SHA1=167e99d2b9f12178de6e2038e86a553f6130aea8 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 +ARG PGIS1_CGAL_CHECKOUT_SHA1=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 0b2c30d2d..4ff0123dc 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,15 +17,15 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=c46fe7e20e33925735ae4b785752795af72823bc -ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_GDAL_CHECKOUT_SHA1=5dd68b5db794f9703bc3df6dd2aaee492ec39231 +ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index fc0f1d47f..fa1c1931f 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent diff --git a/Dockerfile.debian.template b/Dockerfile.debian.template index 067c9b0f4..4800d1616 100644 --- a/Dockerfile.debian.template +++ b/Dockerfile.debian.template @@ -17,6 +17,11 @@ RUN set -eux \ \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ +{{ if env.version | startswith("11") then ( -}} + # \ +{{ ) else ( -}} + postgis \ +{{ ) end -}} && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. diff --git a/README.md b/README.md index a5f6c95af..b107f9854 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ # 🐳🐘🌍 postgis/postgis [![Build Status](https://github.com/imresamu/docker-postgis/workflows/Build%20PostGIS%20images/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +**Important:** _Please note that this README document is larger than the 25,000 character limit set by Docker Hub. As a result, the version available on Docker Hub will be trimmed and not complete._ +_For the complete and untrimmed version of the README, it is recommended to visit the project GitHub page:_ https://github.com/ImreSamu/docker-postgis/blob/master/README.md + The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -27,7 +30,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-11-20) +## Versions (2023-12-03) We provide multi-platform image support for the following architectures: @@ -61,11 +64,11 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`11-3.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.1 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.1 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.1 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.1 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | ### 📘Debian - bullseye @@ -79,21 +82,25 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`11-3.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.0 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.0 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.0 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.0 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.0 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.1 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.1 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.1 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.1 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.1 | ### 🧪Recent ( experimental ) +* These images are similar to the debian-based `*-master` images ( same Dockerfile template ) However, for every build, we use the latest released tag from each library (such as postgis, geos, proj, gdal, cgal, sfcgal). +* These images are ideal for testing purposes, but expanding them is not straightforward. +* The specific versions of the libraries used (like postgis, geos, proj, gdal, cgal, sfcgal) can be found in the tags of the image or in the Dockerfile. + | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | ..recent: latest tagged postgis, geos, proj, gdal | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | ..recent: latest tagged postgis, geos, proj, gdal | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | ### 🧪Debian Geo Bundle ( experimental ) @@ -106,8 +113,8 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.1 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | ### ⛰️Alpine based @@ -132,13 +139,13 @@ Please note that the included package list is subject to change as we continue t - We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. - The template for the `*-master` images is updated manually, which might lead to a delay of a few weeks sometimes. -- The ~master SFCGAL version is 1.4 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). +- The ~master SFCGAL version is 1.5 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal | -| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal | +| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | ## 🚀Usage @@ -212,12 +219,35 @@ It's crucial to be aware that in a cloud environment, with default settings, the - Note that ports which are not bound to the host (i.e., `-p 5432:5432` instead of `-p 127.0.0.1:5432:5432`) will be accessible from the outside. This also applies if you configured UFW to block this specific port, as Docker manages its own iptables rules. ( [Read More](https://docs.docker.com/network/iptables/) ) -Recomendations: +#### Recomendations: - You can add options for using SSL ( [see postgres example](https://github.com/docker-library/postgres/issues/989#issuecomment-1222648067) ) - `-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key` - Or you can use [SSH Tunnels](https://www.postgresql.org/docs/15/ssh-tunnels.html) with `-p 127.0.0.1:5432:5432` +#### Security scanner information: + +- Scan the base `postgres` docker Image: +It's important to also scan the base `postgres` Docker image for potential security issues. If your security scanner reports vulnerabilities (known as CVEs) in the image, you may wonder why. To get a better understanding, please read the Docker Library FAQ, especially the section titled ["Why does my security scanner show that an image has CVEs?"](https://github.com/docker-library/faq#why-does-my-security-scanner-show-that-an-image-has-cves) +For more specific issues related to the postgres docker image, you can search using these links: + - [search for repo:docker-library/postgres trivy](https://github.com/search?q=repo%3Adocker-library%2Fpostgres+trivy&type=issues) + - [search for repo:docker-library/postgres CVE](https://github.com/search?q=repo%3Adocker-library%2Fpostgres+CVE&type=issues) + +- Optimizing Security Scans: +It's advisable to focus on scanning and fixing issues that can be resolved. +Use this command to scan for fixable issues only: + * `trivy image --ignore-unfixed postgis/postgis:16-3.4-alpine` + * `trivy image --ignore-unfixed postgres:16-alpine` +For more details, you can read this article: https://pythonspeed.com/articles/docker-security-scanner/ + +#### Limitations on Updates: +Unfortunately, we don't have control over updates to Debian and Alpine distributions or the upstream `postgres` image. +Because of this, there might be some issues that we cannot fix right away. +On the positive side, the `postgis/postgis` images are regenerated every Monday. This process is to ensure they include the latest changes and improvements. As a result, these images are consistently kept up-to-date. + +#### Suggestions Welcome: +We are always open to suggestions to enhance security. If you have any ideas, please let us know. + ## ❗Known Issues / Errors When You encouter errors due to PostGIS update `OperationalError: could not access file "$libdir/postgis-X.X`, run: @@ -238,4 +268,3 @@ NOTICE: version "X.X.X" of extension "postgis_topology" is already installed NOTICE: version "X.X.X" of extension "postgis_tiger_geocoder" is already installed ALTER EXTENSION ``` - diff --git a/apply-readme.sh b/apply-readme.sh index 282a75924..ea5cae621 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -30,9 +30,17 @@ for version in $versions; do arch=$(jq -r ".\"$version\".\"$variant\".arch" "$input_file") if [[ "$postgis" == "master" ]]; then - POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal" + POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal, cgal, sfcgal" elif [[ "$postgis" == "recent" ]]; then - POSTGIS_DOC_VERSION="..recent: latest tagged postgis, geos, proj, gdal" + + POSTGIS_TAG=$(jq -r ".\"$version\".\"$variant\".POSTGIS_CHECKOUT" "$input_file") + PROJ_TAG=$(jq -r ".\"$version\".\"$variant\".PROJ_CHECKOUT" "$input_file") + GDAL_TAG=$(jq -r ".\"$version\".\"$variant\".GDAL_CHECKOUT" "$input_file") + GEOS_TAG=$(jq -r ".\"$version\".\"$variant\".GEOS_CHECKOUT" "$input_file") + CGAL_TAG=$(jq -r ".\"$version\".\"$variant\".CGAL_CHECKOUT" "$input_file") + SFCGAL_TAG=$(jq -r ".\"$version\".\"$variant\".SFCGAL_CHECKOUT" "$input_file") + + POSTGIS_DOC_VERSION="postgis=${POSTGIS_TAG}, geos=${GEOS_TAG}, proj=${PROJ_TAG}, gdal=${GDAL_TAG}, cgal=${CGAL_TAG}, sfcgal=${SFCGAL_TAG}" else POSTGIS_DOC_VERSION=$(echo "$POSTGIS_VERSION" | awk -F'[+-]' '{print $1}') fi diff --git a/manifest.sh b/manifest.sh index 775450513..c0f59c942 100755 --- a/manifest.sh +++ b/manifest.sh @@ -94,11 +94,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ --target ${dockername}:12-3.4-bookworm || true -echo "manifest: ${dockername}:12-3.4.0-bookworm" +echo "manifest: ${dockername}:12-3.4.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.0-bookworm \ - --target ${dockername}:12-3.4.0-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.4.1-bookworm \ + --target ${dockername}:12-3.4.1-bookworm || true echo "manifest: ${dockername}:12-3.4" manifest-tool push from-args \ @@ -114,11 +114,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ --target ${dockername}:12-3.4-bullseye || true -echo "manifest: ${dockername}:12-3.4.0-bullseye" +echo "manifest: ${dockername}:12-3.4.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.0-bullseye \ - --target ${dockername}:12-3.4.0-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.4.1-bullseye \ + --target ${dockername}:12-3.4.1-bullseye || true # ----- 13-3.4-alpine3.18 ----- @@ -148,11 +148,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ --target ${dockername}:13-3.4-bookworm || true -echo "manifest: ${dockername}:13-3.4.0-bookworm" +echo "manifest: ${dockername}:13-3.4.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.0-bookworm \ - --target ${dockername}:13-3.4.0-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.4.1-bookworm \ + --target ${dockername}:13-3.4.1-bookworm || true echo "manifest: ${dockername}:13-3.4" manifest-tool push from-args \ @@ -168,11 +168,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ --target ${dockername}:13-3.4-bullseye || true -echo "manifest: ${dockername}:13-3.4.0-bullseye" +echo "manifest: ${dockername}:13-3.4.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.0-bullseye \ - --target ${dockername}:13-3.4.0-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.4.1-bullseye \ + --target ${dockername}:13-3.4.1-bullseye || true # ----- 14-3.4-alpine3.18 ----- @@ -202,11 +202,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ --target ${dockername}:14-3.4-bookworm || true -echo "manifest: ${dockername}:14-3.4.0-bookworm" +echo "manifest: ${dockername}:14-3.4.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.0-bookworm \ - --target ${dockername}:14-3.4.0-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4.1-bookworm \ + --target ${dockername}:14-3.4.1-bookworm || true echo "manifest: ${dockername}:14-3.4" manifest-tool push from-args \ @@ -222,11 +222,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ --target ${dockername}:14-3.4-bullseye || true -echo "manifest: ${dockername}:14-3.4.0-bullseye" +echo "manifest: ${dockername}:14-3.4.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.0-bullseye \ - --target ${dockername}:14-3.4.0-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.4.1-bullseye \ + --target ${dockername}:14-3.4.1-bullseye || true # ----- 15-3.4-alpine3.18 ----- @@ -256,11 +256,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ --target ${dockername}:15-3.4-bookworm || true -echo "manifest: ${dockername}:15-3.4.0-bookworm" +echo "manifest: ${dockername}:15-3.4.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.0-bookworm \ - --target ${dockername}:15-3.4.0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.1-bookworm \ + --target ${dockername}:15-3.4.1-bookworm || true echo "manifest: ${dockername}:15-3.4" manifest-tool push from-args \ @@ -276,11 +276,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ --target ${dockername}:15-3.4-bullseye || true -echo "manifest: ${dockername}:15-3.4.0-bullseye" +echo "manifest: ${dockername}:15-3.4.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.0-bullseye \ - --target ${dockername}:15-3.4.0-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.4.1-bullseye \ + --target ${dockername}:15-3.4.1-bullseye || true # ----- 15-3.4-bundle0-bookworm ----- @@ -290,11 +290,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ --target ${dockername}:15-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4.0-bundle0-bookworm" +echo "manifest: ${dockername}:15-3.4.1-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.0-bundle0-bookworm \ - --target ${dockername}:15-3.4.0-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.1-bundle0-bookworm \ + --target ${dockername}:15-3.4.1-bundle0-bookworm || true echo "manifest: ${dockername}:15-3.4-bundle0" manifest-tool push from-args \ @@ -324,6 +324,18 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true +echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 \ + --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 || true + +echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ + --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true + echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -364,11 +376,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ --target ${dockername}:16-3.4-bookworm || true -echo "manifest: ${dockername}:16-3.4.0-bookworm" +echo "manifest: ${dockername}:16-3.4.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.0-bookworm \ - --target ${dockername}:16-3.4.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.1-bookworm \ + --target ${dockername}:16-3.4.1-bookworm || true echo "manifest: ${dockername}:16-3.4" manifest-tool push from-args \ @@ -390,11 +402,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ --target ${dockername}:16-3.4-bullseye || true -echo "manifest: ${dockername}:16-3.4.0-bullseye" +echo "manifest: ${dockername}:16-3.4.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.0-bullseye \ - --target ${dockername}:16-3.4.0-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.4.1-bullseye \ + --target ${dockername}:16-3.4.1-bullseye || true # ----- 16-3.4-bundle0-bookworm ----- @@ -404,11 +416,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ --target ${dockername}:16-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4.0-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.4.1-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.0-bundle0-bookworm \ - --target ${dockername}:16-3.4.0-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.1-bundle0-bookworm \ + --target ${dockername}:16-3.4.1-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.4-bundle0" manifest-tool push from-args \ @@ -444,8 +456,26 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true +echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 \ + --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 || true + +echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ + --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true + echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template ${dockername}-ARCHVARIANT:16-recent \ --target ${dockername}:16-recent || true + +echo "manifest: ${dockername}:recent" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:recent \ + --target ${dockername}:recent || true diff --git a/versions.json b/versions.json index 13790da42..419f743e0 100644 --- a/versions.json +++ b/versions.json @@ -38,7 +38,7 @@ }, "12-3.4": { "bullseye": { - "tags": "12-3.4-bullseye 12-3.4.0-bullseye", + "tags": "12-3.4-bullseye 12-3.4.1-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "12", @@ -46,10 +46,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.4-bookworm 12-3.4.0-bookworm 12-3.4", + "tags": "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "12", @@ -57,7 +57,7 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", @@ -75,7 +75,7 @@ }, "13-3.4": { "bullseye": { - "tags": "13-3.4-bullseye 13-3.4.0-bullseye", + "tags": "13-3.4-bullseye 13-3.4.1-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "13", @@ -83,10 +83,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.4-bookworm 13-3.4.0-bookworm 13-3.4", + "tags": "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -94,7 +94,7 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", @@ -112,7 +112,7 @@ }, "14-3.4": { "bullseye": { - "tags": "14-3.4-bullseye 14-3.4.0-bullseye", + "tags": "14-3.4-bullseye 14-3.4.1-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "14", @@ -120,10 +120,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", + "tags": "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -131,7 +131,7 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", @@ -149,7 +149,7 @@ }, "15-3.4": { "bullseye": { - "tags": "15-3.4-bullseye 15-3.4.0-bullseye", + "tags": "15-3.4-bullseye 15-3.4.1-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "15", @@ -157,10 +157,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", + "tags": "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -168,7 +168,7 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", @@ -186,7 +186,7 @@ }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", + "tags": "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "15", @@ -199,12 +199,12 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", + "TIMESCALEDB_CHECKOUT": "tags/2.13.0", + "TIMESCALEDB_CHECKOUT_SHA1": "96f81a3106683f186f091ad88339c8c223f4363c", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" } }, "15-master": { @@ -216,24 +216,24 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", - "POSTGIS_CHECKOUT_SHA1": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", - "CGAL_CHECKOUT": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", - "CGAL_CHECKOUT_SHA1": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", - "SFCGAL_CHECKOUT": "83dcde8ec703373775262a4032a7bf56a254c1fd", - "SFCGAL_CHECKOUT_SHA1": "83dcde8ec703373775262a4032a7bf56a254c1fd", - "PROJ_CHECKOUT": "f759fe597ae8302bb84663532921570b47b96ab7", - "PROJ_CHECKOUT_SHA1": "f759fe597ae8302bb84663532921570b47b96ab7", - "GDAL_CHECKOUT": "994e40dbbf3dfd58ad66de02d87070afafd8da88", - "GDAL_CHECKOUT_SHA1": "994e40dbbf3dfd58ad66de02d87070afafd8da88", - "GEOS_CHECKOUT": "b3c6777b99fdec10a4cbdf26005697df0111f67d", - "GEOS_CHECKOUT_SHA1": "b3c6777b99fdec10a4cbdf26005697df0111f67d", + "POSTGIS_CHECKOUT": "4338f0b59c47d651347564c74003598b4c55b8c1", + "POSTGIS_CHECKOUT_SHA1": "4338f0b59c47d651347564c74003598b4c55b8c1", + "CGAL_CHECKOUT": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", + "CGAL_CHECKOUT_SHA1": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", + "SFCGAL_CHECKOUT": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", + "SFCGAL_CHECKOUT_SHA1": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", + "PROJ_CHECKOUT": "167e99d2b9f12178de6e2038e86a553f6130aea8", + "PROJ_CHECKOUT_SHA1": "167e99d2b9f12178de6e2038e86a553f6130aea8", + "GDAL_CHECKOUT": "187217953752a7ba4e39c9ad37b5f37cdfa77989", + "GDAL_CHECKOUT_SHA1": "187217953752a7ba4e39c9ad37b5f37cdfa77989", + "GEOS_CHECKOUT": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", + "GEOS_CHECKOUT_SHA1": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", "BOOST_VERSION": "1.74.0" } }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -242,10 +242,10 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", - "PROJ_CHECKOUT": "tags/9.3.0", - "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0", - "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", + "PROJ_CHECKOUT": "tags/9.3.1", + "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "GDAL_CHECKOUT": "tags/v3.8.1", + "GDAL_CHECKOUT_SHA1": "5dd68b5db794f9703bc3df6dd2aaee492ec39231", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", @@ -257,7 +257,7 @@ }, "16-3.4": { "bullseye": { - "tags": "16-3.4-bullseye 16-3.4.0-bullseye", + "tags": "16-3.4-bullseye 16-3.4.1-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "16", @@ -265,10 +265,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", + "tags": "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -276,7 +276,7 @@ "arch": "amd64 arm64", "template": "Dockerfile.debian.template", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", @@ -294,7 +294,7 @@ }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", + "tags": "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -307,12 +307,12 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.12.2", - "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", + "TIMESCALEDB_CHECKOUT": "tags/2.13.0", + "TIMESCALEDB_CHECKOUT_SHA1": "96f81a3106683f186f091ad88339c8c223f4363c", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" } }, "16-master": { @@ -324,24 +324,24 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", - "POSTGIS_CHECKOUT_SHA1": "f0643233c02e31ff98de3b8ec6c4b9670500ce06", - "CGAL_CHECKOUT": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", - "CGAL_CHECKOUT_SHA1": "b6d9c444f887f4c03edb05d5ee3bd75b35d67130", - "SFCGAL_CHECKOUT": "83dcde8ec703373775262a4032a7bf56a254c1fd", - "SFCGAL_CHECKOUT_SHA1": "83dcde8ec703373775262a4032a7bf56a254c1fd", - "PROJ_CHECKOUT": "f759fe597ae8302bb84663532921570b47b96ab7", - "PROJ_CHECKOUT_SHA1": "f759fe597ae8302bb84663532921570b47b96ab7", - "GDAL_CHECKOUT": "994e40dbbf3dfd58ad66de02d87070afafd8da88", - "GDAL_CHECKOUT_SHA1": "994e40dbbf3dfd58ad66de02d87070afafd8da88", - "GEOS_CHECKOUT": "b3c6777b99fdec10a4cbdf26005697df0111f67d", - "GEOS_CHECKOUT_SHA1": "b3c6777b99fdec10a4cbdf26005697df0111f67d", + "POSTGIS_CHECKOUT": "4338f0b59c47d651347564c74003598b4c55b8c1", + "POSTGIS_CHECKOUT_SHA1": "4338f0b59c47d651347564c74003598b4c55b8c1", + "CGAL_CHECKOUT": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", + "CGAL_CHECKOUT_SHA1": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", + "SFCGAL_CHECKOUT": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", + "SFCGAL_CHECKOUT_SHA1": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", + "PROJ_CHECKOUT": "167e99d2b9f12178de6e2038e86a553f6130aea8", + "PROJ_CHECKOUT_SHA1": "167e99d2b9f12178de6e2038e86a553f6130aea8", + "GDAL_CHECKOUT": "187217953752a7ba4e39c9ad37b5f37cdfa77989", + "GDAL_CHECKOUT_SHA1": "187217953752a7ba4e39c9ad37b5f37cdfa77989", + "GEOS_CHECKOUT": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", + "GEOS_CHECKOUT_SHA1": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", "BOOST_VERSION": "1.74.0" } }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -350,10 +350,10 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", - "PROJ_CHECKOUT": "tags/9.3.0", - "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0", - "GDAL_CHECKOUT_SHA1": "c46fe7e20e33925735ae4b785752795af72823bc", + "PROJ_CHECKOUT": "tags/9.3.1", + "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "GDAL_CHECKOUT": "tags/v3.8.1", + "GDAL_CHECKOUT_SHA1": "5dd68b5db794f9703bc3df6dd2aaee492ec39231", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", diff --git a/versions.sh b/versions.sh index a84936ad2..a05df1770 100755 --- a/versions.sh +++ b/versions.sh @@ -504,19 +504,36 @@ for version in "${versions[@]}"; do fi tags="${mainTags}${bundleTypeTags}-${variant}" + if [[ "recent" == "$postgisVersion" ]]; then + lastversion_postgis_tag=${lastversion_postgis#tags/} + lastversion_postgis_tag=${lastversion_postgis_tag#v} + lastversion_proj_tag=${lastversion_proj#tags/} + lastversion_proj_tag=${lastversion_proj_tag#v} + lastversion_geos_tag=${lastversion_geos#tags/} + lastversion_geos_tag=${lastversion_geos_tag#v} + lastversion_gdal_tag=${lastversion_gdal#tags/} + lastversion_gdal_tag=${lastversion_gdal_tag#v} + lastversion_cgal_tag=${lastversion_cgal#tags/} + lastversion_cgal_tag=${lastversion_cgal_tag#v} + lastversion_sfcgal_tag=${lastversion_sfcgal#tags/} + lastversion_sfcgal_tag=${lastversion_sfcgal_tag#v} + tags+=" ${mainTags}-postgis${lastversion_postgis_tag}-geos${lastversion_geos_tag}-proj${lastversion_proj_tag}-gdal${lastversion_gdal_tag}-cgal${lastversion_cgal_tag}-sfcgal${lastversion_sfcgal_tag}" + tags+=" ${mainTags}-postgis${lastversion_postgis_tag}-geos${lastversion_geos_tag}-proj${lastversion_proj_tag}-gdal${lastversion_gdal_tag}-cgal${lastversion_cgal_tag}-sfcgal${lastversion_sfcgal_tag}-${variant}" + fi + if [[ "master" != "$postgisVersion" && "recent" != "$postgisVersion" && "${postgisDocSrc[$variant]}" != "${postgisDockerTag}" ]]; then tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisDocSrc[$variant]}${bundleTypeTags}-${variant}" fi if [[ "$variant" == "$debian_latest" ]]; then tags+=" ${postgresLastMainTags[$postgresVersion]}-${postgisDockerTag}${bundleTypeTags}" if [[ "${postgis_latest}" == "${postgisDockerTag}" && "${postgres_latest}" == "${postgresLastMainTags[$postgresVersion]}" ]]; then - if [ -n "$bundleType" ]; then tags+=" $bundleType" else tags+=" latest" fi - + elif [[ "recent" == "${postgisDockerTag}" && "${postgres_latest}" == "${postgresLastMainTags[$postgresVersion]}" ]]; then + tags+=" recent" fi fi From e0d82e364494c2fddb52a494f32d9fe1e6851fa5 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 3 Dec 2023 19:47:48 +0100 Subject: [PATCH 026/167] only Warning if README.md size >= 25000 char --- apply-readme.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apply-readme.sh b/apply-readme.sh index ea5cae621..0fddbeecd 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -88,10 +88,10 @@ file_size=$(stat --format=%s "README.md") echo " " echo "README.md size is $file_size bytes ( max limit $README_SIZE_LIMIT bytes )" if [[ $file_size -ge $README_SIZE_LIMIT ]]; then - echo "Error: README.md is too large ($file_size bytes). " + echo "WARNING: README.md is too large ($file_size bytes). " echo " Must be less than $README_SIZE_LIMIT bytes!" echo " The github API automatically truncates README.md files to $README_SIZE_LIMIT bytes." - exit 1 + echo " " fi echo " " From 63e614fc716b9bcc2d7078ee2b7ad7c5e11a2f62 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 18 Dec 2023 02:38:27 +0100 Subject: [PATCH 027/167] remove PG 11 EOL --- .circleci/config.yml | 3 - .github/workflows/main.yml | 3 - 11-3.3/alpine3.18/Dockerfile | 135 ---------------------------- 11-3.3/alpine3.18/initdb-postgis.sh | 25 ------ 11-3.3/alpine3.18/tags | 1 - 11-3.3/alpine3.18/update-postgis.sh | 28 ------ 11-3.3/bookworm/Dockerfile | 39 -------- 11-3.3/bookworm/initdb-postgis.sh | 25 ------ 11-3.3/bookworm/tags | 1 - 11-3.3/bookworm/update-postgis.sh | 28 ------ 11-3.3/bullseye/Dockerfile | 39 -------- 11-3.3/bullseye/initdb-postgis.sh | 25 ------ 11-3.3/bullseye/tags | 1 - 11-3.3/bullseye/update-postgis.sh | 28 ------ 15-master/bookworm/Dockerfile | 26 +++--- 16-master/bookworm/Dockerfile | 26 +++--- README.md | 5 +- manifest.sh | 54 ----------- versions.json | 85 +++++------------- 19 files changed, 51 insertions(+), 526 deletions(-) delete mode 100644 11-3.3/alpine3.18/Dockerfile delete mode 100644 11-3.3/alpine3.18/initdb-postgis.sh delete mode 100644 11-3.3/alpine3.18/tags delete mode 100755 11-3.3/alpine3.18/update-postgis.sh delete mode 100644 11-3.3/bookworm/Dockerfile delete mode 100644 11-3.3/bookworm/initdb-postgis.sh delete mode 100644 11-3.3/bookworm/tags delete mode 100755 11-3.3/bookworm/update-postgis.sh delete mode 100644 11-3.3/bullseye/Dockerfile delete mode 100644 11-3.3/bullseye/initdb-postgis.sh delete mode 100644 11-3.3/bullseye/tags delete mode 100755 11-3.3/bullseye/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 71abcec52..91ba5501c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,9 +92,6 @@ workflows: # hence they must be generated within the bundle JOB. # #circleci-targets-start - "11-3.3-alpine3.18", - "11-3.3-bookworm", - "11-3.3-bullseye", "12-3.4-alpine3.18", "12-3.4-bookworm", "12-3.4-bullseye", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 527e2e251..2e032d052 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,9 +24,6 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "11-3.3", variant: "alpine3.18", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine", readme_group: "alpine3.18" } - - { version: "11-3.3", variant: "bookworm", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", readme_group: "bookworm" } - - { version: "11-3.3", variant: "bullseye", postgres: "11", postgis: "3.3", arch: "amd64 arm64", tags: "11-3.3-bullseye 11-3.3.4-bullseye", readme_group: "bullseye" } - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } diff --git a/11-3.3/alpine3.18/Dockerfile b/11-3.3/alpine3.18/Dockerfile deleted file mode 100644 index f228770ae..000000000 --- a/11-3.3/alpine3.18/Dockerfile +++ /dev/null @@ -1,135 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:11-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 11 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pcre2-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre2 \ - protobuf-c \ - \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/11-3.3/alpine3.18/initdb-postgis.sh b/11-3.3/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/11-3.3/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/11-3.3/alpine3.18/tags b/11-3.3/alpine3.18/tags deleted file mode 100644 index f7deab421..000000000 --- a/11-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine diff --git a/11-3.3/alpine3.18/update-postgis.sh b/11-3.3/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/11-3.3/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/11-3.3/bookworm/Dockerfile b/11-3.3/bookworm/Dockerfile deleted file mode 100644 index e26c7683a..000000000 --- a/11-3.3/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:11-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 11 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - # \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/11-3.3/bookworm/initdb-postgis.sh b/11-3.3/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/11-3.3/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/11-3.3/bookworm/tags b/11-3.3/bookworm/tags deleted file mode 100644 index d3c4a0105..000000000 --- a/11-3.3/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -11-3.3-bookworm 11-3.3.4-bookworm 11-3.3 diff --git a/11-3.3/bookworm/update-postgis.sh b/11-3.3/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/11-3.3/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/11-3.3/bullseye/Dockerfile b/11-3.3/bullseye/Dockerfile deleted file mode 100644 index a41701357..000000000 --- a/11-3.3/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:11-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 11 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - # \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/11-3.3/bullseye/initdb-postgis.sh b/11-3.3/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/11-3.3/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/11-3.3/bullseye/tags b/11-3.3/bullseye/tags deleted file mode 100644 index 4fd3ed8b6..000000000 --- a/11-3.3/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -11-3.3-bullseye 11-3.3.4-bullseye diff --git a/11-3.3/bullseye/update-postgis.sh b/11-3.3/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/11-3.3/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index c4e16546d..3b8b39552 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=4338f0b59c47d651347564c74003598b4c55b8c1 -ARG PGIS1_GEOS_CHECKOUT=b3d6d20a94fdbe6a8401d176668a6d7d76465673 -ARG PGIS1_GDAL_CHECKOUT=187217953752a7ba4e39c9ad37b5f37cdfa77989 -ARG PGIS1_PROJ_CHECKOUT=167e99d2b9f12178de6e2038e86a553f6130aea8 -ARG PGIS1_SFCGAL_CHECKOUT=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 -ARG PGIS1_CGAL_CHECKOUT=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4338f0b59c47d651347564c74003598b4c55b8c1 -ARG PGIS1_GEOS_CHECKOUT_SHA1=b3d6d20a94fdbe6a8401d176668a6d7d76465673 -ARG PGIS1_GDAL_CHECKOUT_SHA1=187217953752a7ba4e39c9ad37b5f37cdfa77989 -ARG PGIS1_PROJ_CHECKOUT_SHA1=167e99d2b9f12178de6e2038e86a553f6130aea8 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 -ARG PGIS1_CGAL_CHECKOUT_SHA1=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 +ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a +ARG PGIS1_GDAL_CHECKOUT=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 +ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_CGAL_CHECKOUT=32da8399fb6edb9a7b31127e3a7c20d552e9e68e + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a +ARG PGIS1_GDAL_CHECKOUT_SHA1=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_CGAL_CHECKOUT_SHA1=32da8399fb6edb9a7b31127e3a7c20d552e9e68e ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index f51e5afe6..141d02d8d 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=4338f0b59c47d651347564c74003598b4c55b8c1 -ARG PGIS1_GEOS_CHECKOUT=b3d6d20a94fdbe6a8401d176668a6d7d76465673 -ARG PGIS1_GDAL_CHECKOUT=187217953752a7ba4e39c9ad37b5f37cdfa77989 -ARG PGIS1_PROJ_CHECKOUT=167e99d2b9f12178de6e2038e86a553f6130aea8 -ARG PGIS1_SFCGAL_CHECKOUT=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 -ARG PGIS1_CGAL_CHECKOUT=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4338f0b59c47d651347564c74003598b4c55b8c1 -ARG PGIS1_GEOS_CHECKOUT_SHA1=b3d6d20a94fdbe6a8401d176668a6d7d76465673 -ARG PGIS1_GDAL_CHECKOUT_SHA1=187217953752a7ba4e39c9ad37b5f37cdfa77989 -ARG PGIS1_PROJ_CHECKOUT_SHA1=167e99d2b9f12178de6e2038e86a553f6130aea8 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=aa1194bb946460b6ec5a29d31d6a19e9694b3df7 -ARG PGIS1_CGAL_CHECKOUT_SHA1=d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5 +ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a +ARG PGIS1_GDAL_CHECKOUT=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 +ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_CGAL_CHECKOUT=32da8399fb6edb9a7b31127e3a7c20d552e9e68e + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a +ARG PGIS1_GDAL_CHECKOUT_SHA1=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_CGAL_CHECKOUT_SHA1=32da8399fb6edb9a7b31127e3a7c20d552e9e68e ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/README.md b/README.md index b107f9854..088afb22e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-03) +## Versions (2023-12-18) We provide multi-platform image support for the following architectures: @@ -63,7 +63,6 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bookworm), [`11-3.3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bookworm), [`11-3.3`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bookworm/Dockerfile) | amd64 arm64 | bookworm | 11 | 3.3.4 | | [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.1 | | [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.1 | | [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.1 | @@ -81,7 +80,6 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-bullseye), [`11-3.3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.4-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/bullseye/Dockerfile) | amd64 arm64 | bullseye | 11 | 3.3.4 | | [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.1 | | [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.1 | | [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.1 | @@ -127,7 +125,6 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`11-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine3.18), [`11-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3.5-alpine3.18), [`11-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=11-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/11-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 11 | 3.3.5 | | [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | | [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | | [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | diff --git a/manifest.sh b/manifest.sh index c0f59c942..50fbfb0f7 100755 --- a/manifest.sh +++ b/manifest.sh @@ -12,60 +12,6 @@ source tools/environment_init.sh # PLEASE DO NOT EDIT IT DIRECTLY. # -# ----- 11-3.3-alpine3.18 ----- - -echo "manifest: ${dockername}:11-3.3-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3-alpine3.18 \ - --target ${dockername}:11-3.3-alpine3.18 || true - -echo "manifest: ${dockername}:11-3.3.5-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3.5-alpine3.18 \ - --target ${dockername}:11-3.3.5-alpine3.18 || true - -echo "manifest: ${dockername}:11-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3-alpine \ - --target ${dockername}:11-3.3-alpine || true - -# ----- 11-3.3-bookworm ----- - -echo "manifest: ${dockername}:11-3.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3-bookworm \ - --target ${dockername}:11-3.3-bookworm || true - -echo "manifest: ${dockername}:11-3.3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3.4-bookworm \ - --target ${dockername}:11-3.3.4-bookworm || true - -echo "manifest: ${dockername}:11-3.3" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3 \ - --target ${dockername}:11-3.3 || true - -# ----- 11-3.3-bullseye ----- - -echo "manifest: ${dockername}:11-3.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3-bullseye \ - --target ${dockername}:11-3.3-bullseye || true - -echo "manifest: ${dockername}:11-3.3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:11-3.3.4-bullseye \ - --target ${dockername}:11-3.3.4-bullseye || true - # ----- 12-3.4-alpine3.18 ----- echo "manifest: ${dockername}:12-3.4-alpine3.18" diff --git a/versions.json b/versions.json index 419f743e0..c292c9833 100644 --- a/versions.json +++ b/versions.json @@ -1,41 +1,4 @@ { - "11-3.3": { - "bullseye": { - "tags": "11-3.3-bullseye 11-3.3.4-bullseye", - "postgis": "3.3", - "readme_group": "bullseye", - "PG_MAJOR": "11", - "PG_DOCKER": "11", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.3.4+dfsg-1.pgdg110+1" - }, - "bookworm": { - "tags": "11-3.3-bookworm 11-3.3.4-bookworm 11-3.3", - "postgis": "3.3", - "readme_group": "bookworm", - "PG_MAJOR": "11", - "PG_DOCKER": "11", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.3.4+dfsg-1.pgdg120+1" - }, - "alpine3.18": { - "tags": "11-3.3-alpine3.18 11-3.3.5-alpine3.18 11-3.3-alpine", - "readme_group": "alpine3.18", - "postgis": "3.3", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "PG_MAJOR": "11", - "PG_DOCKER": "11", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" - } - }, "12-3.4": { "bullseye": { "tags": "12-3.4-bullseye 12-3.4.1-bullseye", @@ -216,18 +179,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "4338f0b59c47d651347564c74003598b4c55b8c1", - "POSTGIS_CHECKOUT_SHA1": "4338f0b59c47d651347564c74003598b4c55b8c1", - "CGAL_CHECKOUT": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", - "CGAL_CHECKOUT_SHA1": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", - "SFCGAL_CHECKOUT": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", - "SFCGAL_CHECKOUT_SHA1": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", - "PROJ_CHECKOUT": "167e99d2b9f12178de6e2038e86a553f6130aea8", - "PROJ_CHECKOUT_SHA1": "167e99d2b9f12178de6e2038e86a553f6130aea8", - "GDAL_CHECKOUT": "187217953752a7ba4e39c9ad37b5f37cdfa77989", - "GDAL_CHECKOUT_SHA1": "187217953752a7ba4e39c9ad37b5f37cdfa77989", - "GEOS_CHECKOUT": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", - "GEOS_CHECKOUT_SHA1": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", + "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "CGAL_CHECKOUT": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "CGAL_CHECKOUT_SHA1": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", + "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", + "GDAL_CHECKOUT": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GDAL_CHECKOUT_SHA1": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", + "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" } }, @@ -324,18 +287,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "4338f0b59c47d651347564c74003598b4c55b8c1", - "POSTGIS_CHECKOUT_SHA1": "4338f0b59c47d651347564c74003598b4c55b8c1", - "CGAL_CHECKOUT": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", - "CGAL_CHECKOUT_SHA1": "d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5", - "SFCGAL_CHECKOUT": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", - "SFCGAL_CHECKOUT_SHA1": "aa1194bb946460b6ec5a29d31d6a19e9694b3df7", - "PROJ_CHECKOUT": "167e99d2b9f12178de6e2038e86a553f6130aea8", - "PROJ_CHECKOUT_SHA1": "167e99d2b9f12178de6e2038e86a553f6130aea8", - "GDAL_CHECKOUT": "187217953752a7ba4e39c9ad37b5f37cdfa77989", - "GDAL_CHECKOUT_SHA1": "187217953752a7ba4e39c9ad37b5f37cdfa77989", - "GEOS_CHECKOUT": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", - "GEOS_CHECKOUT_SHA1": "b3d6d20a94fdbe6a8401d176668a6d7d76465673", + "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "CGAL_CHECKOUT": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "CGAL_CHECKOUT_SHA1": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", + "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", + "GDAL_CHECKOUT": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GDAL_CHECKOUT_SHA1": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", + "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" } }, From c7bdb50cbf2dc416f6a297b42e4e9059db80478e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 18 Dec 2023 03:34:33 +0100 Subject: [PATCH 028/167] change to ISO week starts on a Monday; ISO 8601 --- .circleci/config.yml | 5 ++ .github/workflows/main.yml | 15 ++-- 12-3.4/alpine3.18/tags | 2 +- 12-3.4/alpine3.19/Dockerfile | 135 ++++++++++++++++++++++++++++ 12-3.4/alpine3.19/initdb-postgis.sh | 25 ++++++ 12-3.4/alpine3.19/tags | 1 + 12-3.4/alpine3.19/update-postgis.sh | 28 ++++++ 13-3.4/alpine3.18/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 135 ++++++++++++++++++++++++++++ 13-3.4/alpine3.19/initdb-postgis.sh | 25 ++++++ 13-3.4/alpine3.19/tags | 1 + 13-3.4/alpine3.19/update-postgis.sh | 28 ++++++ 14-3.4/alpine3.18/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 135 ++++++++++++++++++++++++++++ 14-3.4/alpine3.19/initdb-postgis.sh | 25 ++++++ 14-3.4/alpine3.19/tags | 1 + 14-3.4/alpine3.19/update-postgis.sh | 28 ++++++ 15-3.4/alpine3.18/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 135 ++++++++++++++++++++++++++++ 15-3.4/alpine3.19/initdb-postgis.sh | 25 ++++++ 15-3.4/alpine3.19/tags | 1 + 15-3.4/alpine3.19/update-postgis.sh | 28 ++++++ 16-3.4/alpine3.18/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 135 ++++++++++++++++++++++++++++ 16-3.4/alpine3.19/initdb-postgis.sh | 25 ++++++ 16-3.4/alpine3.19/tags | 1 + 16-3.4/alpine3.19/update-postgis.sh | 28 ++++++ README.md | 33 ++++--- manifest.sh | 70 +++++++++++++++ tools/environment_init.sh | 2 +- versions.json | 75 ++++++++++++++-- versions.sh | 6 +- 32 files changed, 1132 insertions(+), 29 deletions(-) create mode 100644 12-3.4/alpine3.19/Dockerfile create mode 100644 12-3.4/alpine3.19/initdb-postgis.sh create mode 100644 12-3.4/alpine3.19/tags create mode 100755 12-3.4/alpine3.19/update-postgis.sh create mode 100644 13-3.4/alpine3.19/Dockerfile create mode 100644 13-3.4/alpine3.19/initdb-postgis.sh create mode 100644 13-3.4/alpine3.19/tags create mode 100755 13-3.4/alpine3.19/update-postgis.sh create mode 100644 14-3.4/alpine3.19/Dockerfile create mode 100644 14-3.4/alpine3.19/initdb-postgis.sh create mode 100644 14-3.4/alpine3.19/tags create mode 100755 14-3.4/alpine3.19/update-postgis.sh create mode 100644 15-3.4/alpine3.19/Dockerfile create mode 100644 15-3.4/alpine3.19/initdb-postgis.sh create mode 100644 15-3.4/alpine3.19/tags create mode 100755 15-3.4/alpine3.19/update-postgis.sh create mode 100644 16-3.4/alpine3.19/Dockerfile create mode 100644 16-3.4/alpine3.19/initdb-postgis.sh create mode 100644 16-3.4/alpine3.19/tags create mode 100755 16-3.4/alpine3.19/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 91ba5501c..1de9cf16c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,21 +93,26 @@ workflows: # #circleci-targets-start "12-3.4-alpine3.18", + "12-3.4-alpine3.19", "12-3.4-bookworm", "12-3.4-bullseye", "13-3.4-alpine3.18", + "13-3.4-alpine3.19", "13-3.4-bookworm", "13-3.4-bullseye", "14-3.4-alpine3.18", + "14-3.4-alpine3.19", "14-3.4-bookworm", "14-3.4-bullseye", "15-3.4-alpine3.18", + "15-3.4-alpine3.19", # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! "15-3.4-bullseye", "15-3.4-bundle0-bookworm", "15-master-bookworm", "15-recent-bookworm", "16-3.4-alpine3.18", + "16-3.4-alpine3.19", # --skip-- "16-3.4-bookworm", --> generated with the related bundle job! "16-3.4-bullseye", "16-3.4-bundle0-bookworm", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e032d052..422a06b0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,22 +24,27 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", readme_group: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", readme_group: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18", readme_group: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent", readme_group: "recent" } - - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } diff --git a/12-3.4/alpine3.18/tags b/12-3.4/alpine3.18/tags index 106282d13..4b741d6a5 100644 --- a/12-3.4/alpine3.18/tags +++ b/12-3.4/alpine3.18/tags @@ -1 +1 @@ -12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine +12-3.4-alpine3.18 12-3.4.1-alpine3.18 diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile new file mode 100644 index 000000000..da976fdf8 --- /dev/null +++ b/12-3.4/alpine3.19/Dockerfile @@ -0,0 +1,135 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/alpine3.19/initdb-postgis.sh b/12-3.4/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.4/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags new file mode 100644 index 000000000..22b7bc045 --- /dev/null +++ b/12-3.4/alpine3.19/tags @@ -0,0 +1 @@ +12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine diff --git a/12-3.4/alpine3.19/update-postgis.sh b/12-3.4/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.4/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.4/alpine3.18/tags b/13-3.4/alpine3.18/tags index 2fe60a890..43f154c28 100644 --- a/13-3.4/alpine3.18/tags +++ b/13-3.4/alpine3.18/tags @@ -1 +1 @@ -13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine +13-3.4-alpine3.18 13-3.4.1-alpine3.18 diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile new file mode 100644 index 000000000..e4d89ebce --- /dev/null +++ b/13-3.4/alpine3.19/Dockerfile @@ -0,0 +1,135 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/alpine3.19/initdb-postgis.sh b/13-3.4/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.4/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags new file mode 100644 index 000000000..6daeae935 --- /dev/null +++ b/13-3.4/alpine3.19/tags @@ -0,0 +1 @@ +13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine diff --git a/13-3.4/alpine3.19/update-postgis.sh b/13-3.4/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.4/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.4/alpine3.18/tags b/14-3.4/alpine3.18/tags index d2ca7f39d..0d17024f7 100644 --- a/14-3.4/alpine3.18/tags +++ b/14-3.4/alpine3.18/tags @@ -1 +1 @@ -14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine +14-3.4-alpine3.18 14-3.4.1-alpine3.18 diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile new file mode 100644 index 000000000..0a97509ba --- /dev/null +++ b/14-3.4/alpine3.19/Dockerfile @@ -0,0 +1,135 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/alpine3.19/initdb-postgis.sh b/14-3.4/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.4/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags new file mode 100644 index 000000000..9f6e9e269 --- /dev/null +++ b/14-3.4/alpine3.19/tags @@ -0,0 +1 @@ +14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine diff --git a/14-3.4/alpine3.19/update-postgis.sh b/14-3.4/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.4/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags index 2f00fec87..c310ae1c1 100644 --- a/15-3.4/alpine3.18/tags +++ b/15-3.4/alpine3.18/tags @@ -1 +1 @@ -15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine +15-3.4-alpine3.18 15-3.4.1-alpine3.18 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile new file mode 100644 index 000000000..f6771ff0f --- /dev/null +++ b/15-3.4/alpine3.19/Dockerfile @@ -0,0 +1,135 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4/alpine3.19/initdb-postgis.sh b/15-3.4/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.4/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags new file mode 100644 index 000000000..684b66dda --- /dev/null +++ b/15-3.4/alpine3.19/tags @@ -0,0 +1 @@ +15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine diff --git a/15-3.4/alpine3.19/update-postgis.sh b/15-3.4/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.4/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags index a766d120f..ecb98a842 100644 --- a/16-3.4/alpine3.18/tags +++ b/16-3.4/alpine3.18/tags @@ -1 +1 @@ -16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine +16-3.4-alpine3.18 16-3.4.1-alpine3.18 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile new file mode 100644 index 000000000..0b012cc31 --- /dev/null +++ b/16-3.4/alpine3.19/Dockerfile @@ -0,0 +1,135 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/alpine3.19/initdb-postgis.sh b/16-3.4/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.4/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags new file mode 100644 index 000000000..ad4e41137 --- /dev/null +++ b/16-3.4/alpine3.19/tags @@ -0,0 +1 @@ +16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine diff --git a/16-3.4/alpine3.19/update-postgis.sh b/16-3.4/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.4/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/README.md b/README.md index 088afb22e..d7a17a025 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ **Important:** _Please note that this README document is larger than the 25,000 character limit set by Docker Hub. As a result, the version available on Docker Hub will be trimmed and not complete._ _For the complete and untrimmed version of the README, it is recommended to visit the project GitHub page:_ https://github.com/ImreSamu/docker-postgis/blob/master/README.md -The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -58,7 +58,6 @@ For those new to PostGIS, we recommend the following image versions: - We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. - In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. - This version is easy to extend and has matured over time. -- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | @@ -75,7 +74,6 @@ For those new to PostGIS, we recommend the following image versions: - We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. - In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. - This version is easy to extend and has matured over time. -- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | @@ -115,23 +113,38 @@ Please note that the included package list is subject to change as we continue t | [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | -### ⛰️Alpine based +### ⛰️Alpine 3.18 based - The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). - In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4. - PostGIS is compiled from source, making it a bit more challenging to extend. -- PostgreSQL 11 is not compatible with PostGIS 3.4, so it remains on PostGIS 3.3. Please note that after November 9, 2023, PostgreSQL 11 will reach its [end-of-life (EOL)](https://www.postgresql.org/support/versioning/) and will no longer receive support. | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.1 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.1 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.1 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.1 | +### ⛰️Alpine 3.19 based + +- The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). +- In the Alpine 3.19 version, the package versions are: geos=3.12.1, gdal=3.8.1, proj=9.3.1, and sfcgal=1.5.0 +- PostGIS is compiled from source, making it a bit more challenging to extend. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.19), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.1 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.19), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.1 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.19), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.1 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.19), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.1 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.19), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.1 | + + ### 📋Test images - We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. diff --git a/manifest.sh b/manifest.sh index 50fbfb0f7..84580f4ad 100755 --- a/manifest.sh +++ b/manifest.sh @@ -26,6 +26,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.1-alpine3.18 \ --target ${dockername}:12-3.4.1-alpine3.18 || true +# ----- 12-3.4-alpine3.19 ----- + +echo "manifest: ${dockername}:12-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ + --target ${dockername}:12-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:12-3.4.1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.1-alpine3.19 \ + --target ${dockername}:12-3.4.1-alpine3.19 || true + echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -80,6 +94,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.1-alpine3.18 \ --target ${dockername}:13-3.4.1-alpine3.18 || true +# ----- 13-3.4-alpine3.19 ----- + +echo "manifest: ${dockername}:13-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ + --target ${dockername}:13-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:13-3.4.1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.1-alpine3.19 \ + --target ${dockername}:13-3.4.1-alpine3.19 || true + echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -134,6 +162,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.1-alpine3.18 \ --target ${dockername}:14-3.4.1-alpine3.18 || true +# ----- 14-3.4-alpine3.19 ----- + +echo "manifest: ${dockername}:14-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ + --target ${dockername}:14-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:14-3.4.1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.1-alpine3.19 \ + --target ${dockername}:14-3.4.1-alpine3.19 || true + echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -188,6 +230,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.1-alpine3.18 \ --target ${dockername}:15-3.4.1-alpine3.18 || true +# ----- 15-3.4-alpine3.19 ----- + +echo "manifest: ${dockername}:15-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ + --target ${dockername}:15-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:15-3.4.1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.1-alpine3.19 \ + --target ${dockername}:15-3.4.1-alpine3.19 || true + echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -302,6 +358,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.1-alpine3.18 \ --target ${dockername}:16-3.4.1-alpine3.18 || true +# ----- 16-3.4-alpine3.19 ----- + +echo "manifest: ${dockername}:16-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ + --target ${dockername}:16-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:16-3.4.1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.1-alpine3.19 \ + --target ${dockername}:16-3.4.1-alpine3.19 || true + echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ diff --git a/tools/environment_init.sh b/tools/environment_init.sh index 30e1a6d0f..ee70add4b 100644 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -58,7 +58,7 @@ if [[ "${ENABLE_IMAGE_VERSION_ID:-}" == "true" ]]; then # Note: Make sure to keep this synchronized with the corresponding section in Makefile COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y%m%d) COMMIT_HASH=$(git log -1 --pretty=format:%h) - BUILD_WEEK=$(date '+%Yw%U') + BUILD_WEEK=$(date '+%Yw%V') IMAGE_VERSION_ID="-ver${COMMIT_DATE}-${COMMIT_HASH}-${BUILD_WEEK}" fi export IMAGE_VERSION_ID diff --git a/versions.json b/versions.json index c292c9833..b029dc3ba 100644 --- a/versions.json +++ b/versions.json @@ -23,7 +23,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "12-3.4-alpine3.18 12-3.4.1-alpine3.18 12-3.4-alpine", + "tags": "12-3.4-alpine3.18 12-3.4.1-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -34,6 +34,19 @@ "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + }, + "alpine3.19": { + "tags": "12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine", + "readme_group": "alpine3.19", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "13-3.4": { @@ -60,7 +73,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "13-3.4-alpine3.18 13-3.4.1-alpine3.18 13-3.4-alpine", + "tags": "13-3.4-alpine3.18 13-3.4.1-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -71,6 +84,19 @@ "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + }, + "alpine3.19": { + "tags": "13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine", + "readme_group": "alpine3.19", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "14-3.4": { @@ -97,7 +123,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "14-3.4-alpine3.18 14-3.4.1-alpine3.18 14-3.4-alpine", + "tags": "14-3.4-alpine3.18 14-3.4.1-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -108,6 +134,19 @@ "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + }, + "alpine3.19": { + "tags": "14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine", + "readme_group": "alpine3.19", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "15-3.4": { @@ -134,7 +173,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "15-3.4-alpine3.18 15-3.4.1-alpine3.18 15-3.4-alpine", + "tags": "15-3.4-alpine3.18 15-3.4.1-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -145,6 +184,19 @@ "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + }, + "alpine3.19": { + "tags": "15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine", + "readme_group": "alpine3.19", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "15-3.4-bundle0": { @@ -242,7 +294,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "16-3.4-alpine3.18 16-3.4.1-alpine3.18 16-3.4-alpine alpine", + "tags": "16-3.4-alpine3.18 16-3.4.1-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -253,6 +305,19 @@ "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + }, + "alpine3.19": { + "tags": "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", + "readme_group": "alpine3.19", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "POSTGIS_VERSION": "3.4.1", + "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", + "POSTGIS_CHECKOUT": "tags/3.4.1", + "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, "16-3.4-bundle0": { diff --git a/versions.sh b/versions.sh index a05df1770..447795a09 100755 --- a/versions.sh +++ b/versions.sh @@ -17,11 +17,11 @@ source tools/environment_init.sh api_preference="github" #api_preference="osgeo" -- not working yet -alpine_variants=" alpine3.18 " +alpine_variants=" alpine3.18 alpine3.19 " debian_variants=" bullseye bookworm " debian_latest="bookworm" -alpine_latest="alpine3.18" +alpine_latest="alpine3.19" postgis_latest="3.4" postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" @@ -47,8 +47,8 @@ declare -A postgisDebPkgNameVersionSuffixes=( declare -A boostVersion=( ["bullseye"]="1.74.0" ["bookworm"]="1.74.0" # 1.81.0 is not yet optimal. The current bookworm packages mixed use of 1.74.0 and 1.81.0 - ["alpine3.17"]="1.80.0" ["alpine3.18"]="1.82.0" + ["alpine3.19"]="1.82.0" ) # function get_tag_hash() { From 482833f1994c44ef4a6ef3f348ca351be1abcb11 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 03:55:56 +0100 Subject: [PATCH 029/167] fix workflows .. --- .circleci/config.yml | 13 ++----- .github/workflows/localtest.yml | 13 +++---- .github/workflows/main.yml | 60 +++++++++----------------------- .github/workflows/shellcheck.yml | 2 +- 15-master/bookworm/Dockerfile | 8 ++--- 16-master/bookworm/Dockerfile | 8 ++--- README.md | 2 +- tools/install_manifest-tool.sh | 27 ++++++++++++++ versions.json | 16 ++++----- 9 files changed, 68 insertions(+), 81 deletions(-) create mode 100755 tools/install_manifest-tool.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 1de9cf16c..9be7bb4cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,16 +32,9 @@ 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: pip3 install lastversion - - run: source tools/environment_init.sh + - run: pip install lastversion --upgrade + - run: tools/install_manifest-tool.sh + - run: tools/environment_init.sh - run: make check_version - run: name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index 1a46d84fa..5dae404a0 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -9,17 +9,12 @@ on: jobs: localtest: name: "testing ./localtest.sh ( update.sh and build test and push to local registry )" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - run: docker ps -a - - name: Install manifest-tool - run: | - 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-amd64 /usr/local/bin/manifest-tool - manifest-tool -v - - run: pip install lastversion + - run: pip install lastversion --upgrade + - run: tools/install_manifest-tool.sh + - run: tools/environment_init.sh - run: ./localtest.sh - run: docker images diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 422a06b0b..0a0f5a4d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,18 +64,9 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Install manifest-tool - run: | - 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-amd64 /usr/local/bin/manifest-tool - manifest-tool -v - - - run: pip install lastversion - - - name: Environment init - run: source tools/environment_init.sh + - run: pip install lastversion --upgrade + - run: tools/install_manifest-tool.sh + - run: tools/environment_init.sh - run: make check_version @@ -97,31 +88,30 @@ jobs: echo "DOCKERHUB_ACCESS_TOKEN is set" fi - - name: Source the check_image_exists function - run: source tools/environment_init.sh + - name: Login to dockerhub + uses: docker/login-action@v3 + if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - name: Check if image exists id: check-image run: | - if check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then + source tools/environment_init.sh && \ + echo "IMAGE_VERSION_ID=${IMAGE_VERSION_ID}" >> $GITHUB_ENV && \ + if check_image_exists "${{ matrix.version }}-${{ matrix.variant }}${IMAGE_VERSION_ID}"; then echo "IMAGE_EXISTS=true" >> $GITHUB_ENV else echo "IMAGE_EXISTS=false" >> $GITHUB_ENV fi - - name: Exit if image exists + - name: Weekly image exists -> exit if: env.IMAGE_EXISTS == 'true' run: | echo "weekly build exists; no need to re-build. STOP" exit 0 - - name: Login to dockerhub - uses: docker/login-action@v2 - if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - - name: "verify: make -n test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" if: env.IMAGE_EXISTS == 'false' run: make -n test-${{ matrix.version }}-${{ matrix.variant }} @@ -141,7 +131,6 @@ jobs: make push-${{ matrix.version }}-${{ matrix.variant }} make manifest-${{ matrix.version }}-${{ matrix.variant }} - make-manifest: name: update manifest needs: make-docker-images @@ -155,25 +144,13 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Install manifest-tool - run: | - 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-amd64 /usr/local/bin/manifest-tool - manifest-tool -v - - - run: pip install lastversion - - - name: Environment init - run: source tools/environment_init.sh + - name: setup & init + run: tools/install_manifest-tool.sh && pip install lastversion --upgrade && source tools/environment_init.sh - run: make check_version -# - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds - - name: Login to dockerhub - uses: docker/login-action@v2 + uses: docker/login-action@v3 if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} with: username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -185,8 +162,3 @@ jobs: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} run: make push-readme - -# - name: Update docker manifest -# if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} -# run: ./manifest.sh - diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index a2e20bc94..d4a2ca4a3 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -7,7 +7,7 @@ on: jobs: shellcheck: name: Shellcheck - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Run ShellCheck diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 3b8b39552..364d9ee99 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,17 +17,17 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_GDAL_CHECKOUT=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed -ARG PGIS1_CGAL_CHECKOUT=32da8399fb6edb9a7b31127e3a7c20d552e9e68e +ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_GDAL_CHECKOUT_SHA1=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed -ARG PGIS1_CGAL_CHECKOUT_SHA1=32da8399fb6edb9a7b31127e3a7c20d552e9e68e +ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 141d02d8d..bc49efcc9 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,17 +17,17 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_GDAL_CHECKOUT=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed -ARG PGIS1_CGAL_CHECKOUT=32da8399fb6edb9a7b31127e3a7c20d552e9e68e +ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4 +ARG PGIS1_GDAL_CHECKOUT_SHA1=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed -ARG PGIS1_CGAL_CHECKOUT_SHA1=32da8399fb6edb9a7b31127e3a7c20d552e9e68e +ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/README.md b/README.md index d7a17a025..3e719fb94 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-18) +## Versions (2023-12-19) We provide multi-platform image support for the following architectures: diff --git a/tools/install_manifest-tool.sh b/tools/install_manifest-tool.sh new file mode 100755 index 000000000..b39b404d7 --- /dev/null +++ b/tools/install_manifest-tool.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -Eeuo pipefail + +# https://github.com/estesp/manifest-tool +version="2.1.5" + +# Determine IMAGE_ARCH based on the machine architecture +if [[ "$(uname -m)" == "x86_64" ]]; then + IMAGE_ARCH=amd64 +elif [[ "$(uname -m)" == "aarch64" ]]; then + IMAGE_ARCH=arm64 +else + echo "Architecture not supported: $(uname -m)" + exit 1 +fi +export IMAGE_ARCH + +# Download manifest-tool +wget https://github.com/estesp/manifest-tool/releases/download/v${version}/binaries-manifest-tool-${version}.tar.gz +mkdir -p manifest-tool +tar -xvzf binaries-manifest-tool-${version}.tar.gz -C manifest-tool +sudo mv manifest-tool/manifest-tool-linux-${IMAGE_ARCH} /usr/local/bin/manifest-tool +rm -f binaries-manifest-tool-${version}.tar.gz +rm -rf ./manifest-tool/manifest-tool-* # remove other archs + +# Check manifest-tool version +manifest-tool -v diff --git a/versions.json b/versions.json index b029dc3ba..970cbb20f 100644 --- a/versions.json +++ b/versions.json @@ -233,14 +233,14 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", - "CGAL_CHECKOUT": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", - "CGAL_CHECKOUT_SHA1": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", + "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", - "GDAL_CHECKOUT_SHA1": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GDAL_CHECKOUT": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", + "GDAL_CHECKOUT_SHA1": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -354,14 +354,14 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", - "CGAL_CHECKOUT": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", - "CGAL_CHECKOUT_SHA1": "32da8399fb6edb9a7b31127e3a7c20d552e9e68e", + "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", + "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", - "GDAL_CHECKOUT_SHA1": "b5d004fb9e3fb576b3ccf5f9740531b0bfa87ef4", + "GDAL_CHECKOUT": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", + "GDAL_CHECKOUT_SHA1": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" From 36e793d40cee580301f99983d5005df928f38563 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 04:05:58 +0100 Subject: [PATCH 030/167] fix CI/CD workflow --- .circleci/config.yml | 3 ++- .github/workflows/localtest.yml | 7 ++++--- .github/workflows/main.yml | 13 +++++++------ .github/workflows/shellcheck.yml | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9be7bb4cd..e016f666b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,8 @@ jobs: - run: uname -a - run: docker --version - run: docker info - - run: pip install lastversion --upgrade + - run: pip3 install --upgrade pip + - run: pip3 install --upgrade lastversion - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - run: make check_version diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index 5dae404a0..573c29c29 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -9,12 +9,13 @@ on: jobs: localtest: name: "testing ./localtest.sh ( update.sh and build test and push to local registry )" - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - run: docker ps -a - - run: pip install lastversion --upgrade - - run: tools/install_manifest-tool.sh + - run: pip3 install --upgrade pip + - run: pip3 install --upgrade lastversion + - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - run: ./localtest.sh - run: docker images diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a0f5a4d2..dca34cdee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,10 +64,10 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - run: pip install lastversion --upgrade - - run: tools/install_manifest-tool.sh + - run: pip3 install --upgrade pip + - run: pip3 install --upgrade lastversion + - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - - run: make check_version - name: Check if DOCKERHUB_USERNAME exists @@ -144,9 +144,10 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: setup & init - run: tools/install_manifest-tool.sh && pip install lastversion --upgrade && source tools/environment_init.sh - + - run: pip3 install --upgrade pip + - run: pip3 install --upgrade lastversion + - run: tools/install_manifest-tool.sh + - run: tools/environment_init.sh - run: make check_version - name: Login to dockerhub diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index d4a2ca4a3..aca5fb60f 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -7,7 +7,7 @@ on: jobs: shellcheck: name: Shellcheck - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Run ShellCheck From dcde12169066f54e8a9f5a668171859ec32cfa3d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 04:07:32 +0100 Subject: [PATCH 031/167] fix CI/CD workflow --- tools/environment_init.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/environment_init.sh diff --git a/tools/environment_init.sh b/tools/environment_init.sh old mode 100644 new mode 100755 From c43ac53726e7d7f6a001b0b3742dbd3e7eae8a89 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 07:14:46 +0100 Subject: [PATCH 032/167] add manifest insecure options to connect locahost registy --- Makefile | 4 +++- tools/environment_init.sh | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 190887a2d..be71c7f74 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,9 @@ manifest-$(1)-$(2): $(if $(filter 2,$(shell echo $(1) | grep -o '-' | wc -l)),ma @echo '::Manifest $(1)/$(2)' $(foreach tag,$(shell cat $(1)/$(2)/tags), \ echo " --> manifest: $(1)/$(2):$(tag) " && \ - manifest-tool push from-args \ + manifest-tool \ + $(if $(findstring localhost,$(REGISTRY)),--insecure --plain-http) \ + push from-args \ --platforms linux/amd64,linux/arm64 \ --template $(REGISTRY)/$(REPO_NAME)/$(PUBLIC_IMAGE_NAME)-ARCHVARIANT:$(tag) \ --target $(REGISTRY)/$(REPO_NAME)/$(PUBLIC_IMAGE_NAME):$(tag) || true; \ diff --git a/tools/environment_init.sh b/tools/environment_init.sh index ee70add4b..000488489 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -101,8 +101,18 @@ fi function check_image_exists() { local image_name="${dockername}:$1" local output + local secure_opt="" + + # Check if dockername contains 'localhost:5000' + if [[ $dockername == *"localhost:5000"* ]]; then + echo "The name contains 'localhost:5000' ; insecure and plain-http mode is enabled !" + secure_opt=" --insecure --plain-http " + else + secure_opt="" + fi + # Attempt to inspect the image using manifest-tool. Capture the output, including any errors. - output=$(manifest-tool inspect "$image_name" 2>&1 || true) + output=$(manifest-tool ${secure_opt} inspect "$image_name" 2>&1 || true) # Check the output for a "not found" message, which indicates the image does not exist. if echo "$output" | grep -q "not found"; then echo "The Docker image '$image_name' does not exist." From 6ebd717c9d20223b54e16f0e2aff867ea930d451 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 07:45:59 +0100 Subject: [PATCH 033/167] fix lint error --- tools/environment_init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/environment_init.sh b/tools/environment_init.sh index 000488489..de0b6cd07 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -112,7 +112,7 @@ function check_image_exists() { fi # Attempt to inspect the image using manifest-tool. Capture the output, including any errors. - output=$(manifest-tool ${secure_opt} inspect "$image_name" 2>&1 || true) + output=$(manifest-tool "${secure_opt}" inspect "$image_name" 2>&1 || true) # Check the output for a "not found" message, which indicates the image does not exist. if echo "$output" | grep -q "not found"; then echo "The Docker image '$image_name' does not exist." From 642a5ecbeb289cd2cf6ae0582b436af2670528fc Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 09:21:20 +0100 Subject: [PATCH 034/167] improve recent tags --- .github/workflows/main.yml | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/tags | 2 +- README.md | 4 ++-- manifest.sh | 24 ++++++++++++------------ versions.json | 4 ++-- versions.sh | 21 ++++++++++++++++++++- 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dca34cdee..5bcc85ae7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,14 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 2ba56558a..9c669e331 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index fa1c1931f..a1831489c 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 3e719fb94..333c3c37a 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,8 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 84580f4ad..1cbcf6c56 100755 --- a/manifest.sh +++ b/manifest.sh @@ -326,18 +326,18 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 \ - --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 || true - echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true +echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -472,18 +472,18 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 \ - --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 || true - echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true +echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ diff --git a/versions.json b/versions.json index 970cbb20f..9c2a8c701 100644 --- a/versions.json +++ b/versions.json @@ -248,7 +248,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -369,7 +369,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", diff --git a/versions.sh b/versions.sh index 447795a09..11b37a6d6 100755 --- a/versions.sh +++ b/versions.sh @@ -67,6 +67,16 @@ function get_tag_hash() { awk '{print $1}' } +# extracts a version number and limits it to up to two segments (digits separated by dots). +function extract_version_up_to_two_digits() { + local input_version=$1 + if [[ $input_version =~ ^([0-9]+(\.[0-9]+)?) ]]; then + echo "${BASH_REMATCH[1]}" + else + echo "" + fi +} + # Convert YAML input to pretty-printed JSON format. function yaml2json_pretty { python3 -c 'import sys, yaml, json; print(json.dumps(yaml.safe_load(sys.stdin.read()), indent=2, sort_keys=False))' @@ -517,8 +527,17 @@ for version in "${versions[@]}"; do lastversion_cgal_tag=${lastversion_cgal_tag#v} lastversion_sfcgal_tag=${lastversion_sfcgal#tags/} lastversion_sfcgal_tag=${lastversion_sfcgal_tag#v} - tags+=" ${mainTags}-postgis${lastversion_postgis_tag}-geos${lastversion_geos_tag}-proj${lastversion_proj_tag}-gdal${lastversion_gdal_tag}-cgal${lastversion_cgal_tag}-sfcgal${lastversion_sfcgal_tag}" + tags+=" ${mainTags}-postgis${lastversion_postgis_tag}-geos${lastversion_geos_tag}-proj${lastversion_proj_tag}-gdal${lastversion_gdal_tag}-cgal${lastversion_cgal_tag}-sfcgal${lastversion_sfcgal_tag}-${variant}" + + lastversion_postgis_tag2d=$(extract_version_up_to_two_digits "$lastversion_postgis_tag") + lastversion_proj_tag2d=$(extract_version_up_to_two_digits "$lastversion_proj_tag") + lastversion_geos_tag2d=$(extract_version_up_to_two_digits "$lastversion_geos_tag") + lastversion_gdal_tag2d=$(extract_version_up_to_two_digits "$lastversion_gdal_tag") + lastversion_cgal_tag2d=$(extract_version_up_to_two_digits "$lastversion_cgal_tag") + lastversion_sfcgal_tag2d=$(extract_version_up_to_two_digits "$lastversion_sfcgal_tag") + + tags+=" ${mainTags}-postgis${lastversion_postgis_tag2d}-geos${lastversion_geos_tag2d}-proj${lastversion_proj_tag2d}-gdal${lastversion_gdal_tag2d}-cgal${lastversion_cgal_tag2d}-sfcgal${lastversion_sfcgal_tag2d}-${variant}" fi if [[ "master" != "$postgisVersion" && "recent" != "$postgisVersion" && "${postgisDocSrc[$variant]}" != "${postgisDockerTag}" ]]; then From 4e4194da9f9f6f75f7935190d289a31c3bc2c46c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 19 Dec 2023 23:41:18 +0100 Subject: [PATCH 035/167] update .. --- 15-master/bookworm/Dockerfile | 8 ++++---- 16-master/bookworm/Dockerfile | 8 ++++---- versions.json | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 364d9ee99..a5c21f49f 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,16 +17,16 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec +ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec +ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index bc49efcc9..301495430 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,16 +17,16 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec +ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=e2e1d85d437a01cd7c281a08d75f0e1058bd98ec +ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=d60dc1334cbf7005b39e8b99e21fa5d9e7887fed +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/versions.json b/versions.json index 9c2a8c701..82a409698 100644 --- a/versions.json +++ b/versions.json @@ -235,12 +235,12 @@ "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", - "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", - "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", + "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", - "GDAL_CHECKOUT_SHA1": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", + "GDAL_CHECKOUT": "13047ac734448a89f613dc6df99a0165ea985e5b", + "GDAL_CHECKOUT_SHA1": "13047ac734448a89f613dc6df99a0165ea985e5b", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -356,12 +356,12 @@ "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", - "SFCGAL_CHECKOUT": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", - "SFCGAL_CHECKOUT_SHA1": "d60dc1334cbf7005b39e8b99e21fa5d9e7887fed", + "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", + "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", - "GDAL_CHECKOUT_SHA1": "e2e1d85d437a01cd7c281a08d75f0e1058bd98ec", + "GDAL_CHECKOUT": "13047ac734448a89f613dc6df99a0165ea985e5b", + "GDAL_CHECKOUT_SHA1": "13047ac734448a89f613dc6df99a0165ea985e5b", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" From dce0a9101553ee8d6921dcd46fc37ce5ce7e6055 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 20 Dec 2023 04:42:23 +0100 Subject: [PATCH 036/167] add update_dockerfile workflow --- .github/workflows/update.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/update.yml diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 000000000..8058be271 --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,26 @@ +name: "update_dockerfiles" +# updating the image code and pushing to the local registry +on: + schedule: + - cron: '15 8 * * 1' + +jobs: + update_dockerfiles: + name: "update_dockerfiles" + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - run: docker ps -a + - name: Login to dockerhub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - run: pip3 install --upgrade pip + - run: pip3 install --upgrade lastversion + - run: tools/install_manifest-tool.sh + - run: tools/environment_init.sh + - run: ./update.sh + - run: git status + - run: git diff + - run: git diff versions.json From 0c18154219ba8769657f1a5e44bccfa63d60fcdc Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 20 Dec 2023 04:43:06 +0100 Subject: [PATCH 037/167] update --- 15-master/bookworm/Dockerfile | 4 ++-- 16-master/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index a5c21f49f..2ca4ca144 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,14 +15,14 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_POSTGIS_CHECKOUT=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 301495430..e0a7e80e5 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,14 +15,14 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_POSTGIS_CHECKOUT=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=f36874a448e9256aa231e01d44334c1278ebf7a6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 diff --git a/README.md b/README.md index 333c3c37a..9cb753b81 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-19) +## Versions (2023-12-20) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 82a409698..793212a79 100644 --- a/versions.json +++ b/versions.json @@ -231,8 +231,8 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", - "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "POSTGIS_CHECKOUT": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", + "POSTGIS_CHECKOUT_SHA1": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", @@ -352,8 +352,8 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "f36874a448e9256aa231e01d44334c1278ebf7a6", - "POSTGIS_CHECKOUT_SHA1": "f36874a448e9256aa231e01d44334c1278ebf7a6", + "POSTGIS_CHECKOUT": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", + "POSTGIS_CHECKOUT_SHA1": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", From 429de55ea4ee82c2e7c3d151a6f65f13af9f4007 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 20 Dec 2023 05:41:46 +0100 Subject: [PATCH 038/167] CI fix --- .github/workflows/localtest.yml | 8 ++++---- .github/workflows/update.yml | 6 ++++-- tools/environment_init.sh | 20 +++++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index 573c29c29..96fe531e8 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -1,10 +1,10 @@ name: "Localtest" # testing the workflow on: - push: - pull_request: - schedule: - - cron: '15 5 * * 1' + push: + pull_request: + schedule: + - cron: '15 5 * * 1' jobs: localtest: diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 8058be271..92d43df3b 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -1,8 +1,10 @@ name: "update_dockerfiles" # updating the image code and pushing to the local registry on: - schedule: - - cron: '15 8 * * 1' + push: + pull_request: + schedule: + - cron: '15 8 * * 1' jobs: update_dockerfiles: diff --git a/tools/environment_init.sh b/tools/environment_init.sh index de0b6cd07..e7bbeef15 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -106,20 +106,30 @@ function check_image_exists() { # Check if dockername contains 'localhost:5000' if [[ $dockername == *"localhost:5000"* ]]; then echo "The name contains 'localhost:5000' ; insecure and plain-http mode is enabled !" - secure_opt=" --insecure --plain-http " + secure_opt=(--insecure --plain-http) else - secure_opt="" + secure_opt=() fi # Attempt to inspect the image using manifest-tool. Capture the output, including any errors. - output=$(manifest-tool "${secure_opt}" inspect "$image_name" 2>&1 || true) + output=$(manifest-tool "${secure_opt[@]}" inspect "$image_name" 2>&1 || true) + + echo "" + echo "--[ manifest-tool inspect $image_name ]---" + echo "$output" + echo "--[ manifest-tool inspect $image_name ]---" + echo "" + # Check the output for a "not found" message, which indicates the image does not exist. if echo "$output" | grep -q "not found"; then echo "The Docker image '$image_name' does not exist." return 1 # Return an exit code of 1 to signify the image does not exist. - else + elif echo "$output" | grep -q "digest"; then echo "The Docker image '$image_name' exists." - return 0 # # Return an exit code of 0 to signify the image exists. + return 0 + else + echo "unknow error" + return 1 fi } From 89ce4f79cb3baa69c3ef448343ad943e4ef38fdb Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 20 Dec 2023 16:31:29 +0100 Subject: [PATCH 039/167] update --- .github/workflows/main.yml | 4 ++-- 15-master/bookworm/Dockerfile | 8 ++++---- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-master/bookworm/Dockerfile | 8 ++++---- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 4 ++-- manifest.sh | 12 ++++++------ versions.json | 28 ++++++++++++++-------------- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5bcc85ae7..29a17d246 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,14 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 2ca4ca144..bfe254d1e 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 +ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b +ARG PGIS1_GDAL_CHECKOUT=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b +ARG PGIS1_GDAL_CHECKOUT_SHA1=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 2bea053c8..885eadc62 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=5dd68b5db794f9703bc3df6dd2aaee492ec39231 +ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 9c669e331..ed6c48ab7 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index e0a7e80e5..c4913da2f 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 +ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=13047ac734448a89f613dc6df99a0165ea985e5b +ARG PGIS1_GDAL_CHECKOUT=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=3a2bfd938224dd7a01efb2d73fa5ace120df4ce3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=13047ac734448a89f613dc6df99a0165ea985e5b +ARG PGIS1_GDAL_CHECKOUT_SHA1=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 4ff0123dc..717dd28d5 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=5dd68b5db794f9703bc3df6dd2aaee492ec39231 +ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index a1831489c..b14e7bc22 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 9cb753b81..08ac3fe46 100644 --- a/README.md +++ b/README.md @@ -95,8 +95,8 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.1, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 1cbcf6c56..d2cdd0061 100755 --- a/manifest.sh +++ b/manifest.sh @@ -326,11 +326,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ - --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm \ + --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -472,11 +472,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm \ - --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm \ + --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 793212a79..8ba23832f 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", - "POSTGIS_CHECKOUT_SHA1": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", + "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", + "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "13047ac734448a89f613dc6df99a0165ea985e5b", - "GDAL_CHECKOUT_SHA1": "13047ac734448a89f613dc6df99a0165ea985e5b", + "GDAL_CHECKOUT": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", + "GDAL_CHECKOUT_SHA1": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -248,7 +248,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -259,8 +259,8 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", - "GDAL_CHECKOUT": "tags/v3.8.1", - "GDAL_CHECKOUT_SHA1": "5dd68b5db794f9703bc3df6dd2aaee492ec39231", + "GDAL_CHECKOUT": "tags/v3.8.2", + "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", - "POSTGIS_CHECKOUT_SHA1": "3a2bfd938224dd7a01efb2d73fa5ace120df4ce3", + "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", + "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "13047ac734448a89f613dc6df99a0165ea985e5b", - "GDAL_CHECKOUT_SHA1": "13047ac734448a89f613dc6df99a0165ea985e5b", + "GDAL_CHECKOUT": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", + "GDAL_CHECKOUT_SHA1": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -369,7 +369,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.1-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -380,8 +380,8 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", - "GDAL_CHECKOUT": "tags/v3.8.1", - "GDAL_CHECKOUT_SHA1": "5dd68b5db794f9703bc3df6dd2aaee492ec39231", + "GDAL_CHECKOUT": "tags/v3.8.2", + "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.0", From 64715b8af7bd7262346dacea25e0847416c54554 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 22 Dec 2023 13:02:39 +0100 Subject: [PATCH 040/167] update; sfcgal 1.5.1 --- .github/workflows/main.yml | 4 ++-- 15-master/bookworm/Dockerfile | 12 ++++++------ 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-master/bookworm/Dockerfile | 12 ++++++------ 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 36 +++++++++++++++++------------------ 10 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29a17d246..aa83520b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,14 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index bfe254d1e..7555b342a 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,16 +17,16 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 -ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 +ARG PGIS1_GDAL_CHECKOUT=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 -ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 885eadc62..a535b3ecd 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -19,14 +19,14 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index ed6c48ab7..ee5b229d4 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index c4913da2f..f2f497ff6 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,16 +17,16 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 -ARG PGIS1_PROJ_CHECKOUT=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT=973013298b08752d3d5646ba0b7bdf7dc80647b9 +ARG PGIS1_GDAL_CHECKOUT=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21 -ARG PGIS1_PROJ_CHECKOUT_SHA1=657c69c6937c8f7601daf995a0f75207ecaa4fc1 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=973013298b08752d3d5646ba0b7bdf7dc80647b9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 717dd28d5..2b86580ea 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,14 +19,14 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index b14e7bc22..7fd9b011e 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 08ac3fe46..e151b448f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-20) +## Versions (2023-12-22) We provide multi-platform image support for the following architectures: @@ -95,8 +95,8 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.0 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index d2cdd0061..3857a620d 100755 --- a/manifest.sh +++ b/manifest.sh @@ -326,11 +326,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm \ - --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -472,11 +472,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm \ - --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 8ba23832f..a648347eb 100644 --- a/versions.json +++ b/versions.json @@ -235,12 +235,12 @@ "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", - "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", - "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", - "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", - "GDAL_CHECKOUT_SHA1": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", + "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", + "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", + "GDAL_CHECKOUT": "62c1489feab9312d0468abde0ad13d7b35ce27f7", + "GDAL_CHECKOUT_SHA1": "62c1489feab9312d0468abde0ad13d7b35ce27f7", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -248,7 +248,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -263,8 +263,8 @@ "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", - "SFCGAL_CHECKOUT": "tags/v1.5.0", - "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT": "tags/v1.5.1", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "CGAL_CHECKOUT": "tags/v5.6", "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" @@ -356,12 +356,12 @@ "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", - "SFCGAL_CHECKOUT": "973013298b08752d3d5646ba0b7bdf7dc80647b9", - "SFCGAL_CHECKOUT_SHA1": "973013298b08752d3d5646ba0b7bdf7dc80647b9", - "PROJ_CHECKOUT": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "PROJ_CHECKOUT_SHA1": "657c69c6937c8f7601daf995a0f75207ecaa4fc1", - "GDAL_CHECKOUT": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", - "GDAL_CHECKOUT_SHA1": "0d9f2b2780bc2ce815aeb30dc5a2e78bb6f4de21", + "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", + "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", + "GDAL_CHECKOUT": "62c1489feab9312d0468abde0ad13d7b35ce27f7", + "GDAL_CHECKOUT_SHA1": "62c1489feab9312d0468abde0ad13d7b35ce27f7", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -369,7 +369,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.0-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -384,8 +384,8 @@ "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", - "SFCGAL_CHECKOUT": "tags/v1.5.0", - "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", + "SFCGAL_CHECKOUT": "tags/v1.5.1", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "CGAL_CHECKOUT": "tags/v5.6", "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" From 03974b18a6700a00347a2df8dd51c70f666612d8 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 24 Dec 2023 00:05:33 +0100 Subject: [PATCH 041/167] update .. --- 15-master/bookworm/Dockerfile | 8 ++++---- 16-master/bookworm/Dockerfile | 8 ++++---- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 7555b342a..719a4e601 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,17 +17,17 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_GDAL_CHECKOUT=11c0775272859cdd2649cfa98b5bbb57c70b096e ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d +ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_GDAL_CHECKOUT_SHA1=11c0775272859cdd2649cfa98b5bbb57c70b096e ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d +ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index f2f497ff6..7662a061c 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,17 +17,17 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_GDAL_CHECKOUT=11c0775272859cdd2649cfa98b5bbb57c70b096e ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=ee1fa58406704032e96d2d196f07693549e0f10d +ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=62c1489feab9312d0468abde0ad13d7b35ce27f7 +ARG PGIS1_GDAL_CHECKOUT_SHA1=11c0775272859cdd2649cfa98b5bbb57c70b096e ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=ee1fa58406704032e96d2d196f07693549e0f10d +ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/README.md b/README.md index e151b448f..280e22093 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-22) +## Versions (2023-12-24) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index a648347eb..ea537d1f3 100644 --- a/versions.json +++ b/versions.json @@ -233,14 +233,14 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", - "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", - "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", + "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", + "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "GDAL_CHECKOUT": "62c1489feab9312d0468abde0ad13d7b35ce27f7", - "GDAL_CHECKOUT_SHA1": "62c1489feab9312d0468abde0ad13d7b35ce27f7", + "GDAL_CHECKOUT": "11c0775272859cdd2649cfa98b5bbb57c70b096e", + "GDAL_CHECKOUT_SHA1": "11c0775272859cdd2649cfa98b5bbb57c70b096e", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -354,14 +354,14 @@ "template": "Dockerfile.master.template", "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", - "CGAL_CHECKOUT": "ee1fa58406704032e96d2d196f07693549e0f10d", - "CGAL_CHECKOUT_SHA1": "ee1fa58406704032e96d2d196f07693549e0f10d", + "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", + "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "GDAL_CHECKOUT": "62c1489feab9312d0468abde0ad13d7b35ce27f7", - "GDAL_CHECKOUT_SHA1": "62c1489feab9312d0468abde0ad13d7b35ce27f7", + "GDAL_CHECKOUT": "11c0775272859cdd2649cfa98b5bbb57c70b096e", + "GDAL_CHECKOUT_SHA1": "11c0775272859cdd2649cfa98b5bbb57c70b096e", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" From 5be1cc8c129c0d4080a8fd8926fbf6d3c28e3491 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 1 Jan 2024 13:20:52 +0100 Subject: [PATCH 042/167] update --- 15-master/bookworm/Dockerfile | 12 ++++++------ 16-master/bookworm/Dockerfile | 12 ++++++------ README.md | 2 +- versions.json | 24 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 719a4e601..7553e9956 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b +ARG PGIS1_POSTGIS_CHECKOUT=6aedb1434727fa1eba29620a7d3fd0bfca49e94a ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=11c0775272859cdd2649cfa98b5bbb57c70b096e -ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_GDAL_CHECKOUT=1df855eb676e17278c337e9b14774d1bb298df90 +ARG PGIS1_PROJ_CHECKOUT=b302a91ace4493a3e15b84d73b567b5f3a93451d ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=6aedb1434727fa1eba29620a7d3fd0bfca49e94a ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=11c0775272859cdd2649cfa98b5bbb57c70b096e -ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_GDAL_CHECKOUT_SHA1=1df855eb676e17278c337e9b14774d1bb298df90 +ARG PGIS1_PROJ_CHECKOUT_SHA1=b302a91ace4493a3e15b84d73b567b5f3a93451d ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 7662a061c..7bdfac255 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b +ARG PGIS1_POSTGIS_CHECKOUT=6aedb1434727fa1eba29620a7d3fd0bfca49e94a ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=11c0775272859cdd2649cfa98b5bbb57c70b096e -ARG PGIS1_PROJ_CHECKOUT=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_GDAL_CHECKOUT=1df855eb676e17278c337e9b14774d1bb298df90 +ARG PGIS1_PROJ_CHECKOUT=b302a91ace4493a3e15b84d73b567b5f3a93451d ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=6aedb1434727fa1eba29620a7d3fd0bfca49e94a ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=11c0775272859cdd2649cfa98b5bbb57c70b096e -ARG PGIS1_PROJ_CHECKOUT_SHA1=f743ac7f4f8eb5251a58e714429bafc7027e0a7f +ARG PGIS1_GDAL_CHECKOUT_SHA1=1df855eb676e17278c337e9b14774d1bb298df90 +ARG PGIS1_PROJ_CHECKOUT_SHA1=b302a91ace4493a3e15b84d73b567b5f3a93451d ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 diff --git a/README.md b/README.md index 280e22093..f1e069bd5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-12-24) +## Versions (2024-01-01) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index ea537d1f3..c390b703c 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", - "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", + "POSTGIS_CHECKOUT": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", + "POSTGIS_CHECKOUT_SHA1": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "GDAL_CHECKOUT": "11c0775272859cdd2649cfa98b5bbb57c70b096e", - "GDAL_CHECKOUT_SHA1": "11c0775272859cdd2649cfa98b5bbb57c70b096e", + "PROJ_CHECKOUT": "b302a91ace4493a3e15b84d73b567b5f3a93451d", + "PROJ_CHECKOUT_SHA1": "b302a91ace4493a3e15b84d73b567b5f3a93451d", + "GDAL_CHECKOUT": "1df855eb676e17278c337e9b14774d1bb298df90", + "GDAL_CHECKOUT_SHA1": "1df855eb676e17278c337e9b14774d1bb298df90", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", - "POSTGIS_CHECKOUT_SHA1": "bfc8cd7e619153504cd7bd0e0ab4c0717c33a29b", + "POSTGIS_CHECKOUT": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", + "POSTGIS_CHECKOUT_SHA1": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "PROJ_CHECKOUT_SHA1": "f743ac7f4f8eb5251a58e714429bafc7027e0a7f", - "GDAL_CHECKOUT": "11c0775272859cdd2649cfa98b5bbb57c70b096e", - "GDAL_CHECKOUT_SHA1": "11c0775272859cdd2649cfa98b5bbb57c70b096e", + "PROJ_CHECKOUT": "b302a91ace4493a3e15b84d73b567b5f3a93451d", + "PROJ_CHECKOUT_SHA1": "b302a91ace4493a3e15b84d73b567b5f3a93451d", + "GDAL_CHECKOUT": "1df855eb676e17278c337e9b14774d1bb298df90", + "GDAL_CHECKOUT_SHA1": "1df855eb676e17278c337e9b14774d1bb298df90", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" From 140194e2b07d9ac3989a58151bfb5884c7052b2c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 5 Jan 2024 14:25:55 +0100 Subject: [PATCH 043/167] fix ... --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index be71c7f74..09d60d0f8 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ ifeq ($(ENABLE_IMAGE_VERSION_ID),true) # Note: Make sure to keep this synchronized with the corresponding section in ./tools/environment_init.sh COMMIT_DATE=$(shell git log -1 --format=%cd --date=format:%Y%m%d) COMMIT_HASH=$(shell git log -1 --pretty=format:%h) - BUILD_WEEK=$(shell date '+%Yw%U') + BUILD_WEEK=$(shell date '+%Yw%V') IMAGE_VERSION_ID=-ver$(COMMIT_DATE)-$(COMMIT_HASH)-$(BUILD_WEEK) endif From 23edd00d199e8446cb622fce5576f5ca96dcc6ec Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 5 Jan 2024 14:36:53 +0100 Subject: [PATCH 044/167] add run time: perl to alpine versions --- Dockerfile.alpine.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 552d2734d..d53819a57 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -111,6 +111,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ From 5c0110f51b5e32fec895a72f9291937cb1e5456c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 5 Jan 2024 14:55:32 +0100 Subject: [PATCH 045/167] update.sh --- 12-3.4/alpine3.18/Dockerfile | 2 ++ 12-3.4/alpine3.19/Dockerfile | 2 ++ 13-3.4/alpine3.18/Dockerfile | 2 ++ 13-3.4/alpine3.19/Dockerfile | 2 ++ 14-3.4/alpine3.18/Dockerfile | 2 ++ 14-3.4/alpine3.19/Dockerfile | 2 ++ 15-3.4/alpine3.18/Dockerfile | 2 ++ 15-3.4/alpine3.19/Dockerfile | 2 ++ 15-master/bookworm/Dockerfile | 12 ++++++------ 16-3.4/alpine3.18/Dockerfile | 2 ++ 16-3.4/alpine3.19/Dockerfile | 2 ++ 16-master/bookworm/Dockerfile | 12 ++++++------ README.md | 2 +- versions.json | 24 ++++++++++++------------ 14 files changed, 45 insertions(+), 25 deletions(-) diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index 64df67dc5..e87ecdfa9 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index da976fdf8..b25908fe2 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index aac7e9145..3dfe4940d 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index e4d89ebce..c5ed2de90 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 2c2a6e2db..6f8b4b3f7 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 0a97509ba..8707555b7 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index f0d0bb48f..65e93f0f8 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index f6771ff0f..842d5cc35 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 7553e9956..1da15988c 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6aedb1434727fa1eba29620a7d3fd0bfca49e94a +ARG PGIS1_POSTGIS_CHECKOUT=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=1df855eb676e17278c337e9b14774d1bb298df90 -ARG PGIS1_PROJ_CHECKOUT=b302a91ace4493a3e15b84d73b567b5f3a93451d +ARG PGIS1_GDAL_CHECKOUT=491a5f84c47c38ff36b1ac3b6aeea0628674883b +ARG PGIS1_PROJ_CHECKOUT=ef276d39d982611ebbd3b3c715f4cbdec6d28976 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=6aedb1434727fa1eba29620a7d3fd0bfca49e94a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=1df855eb676e17278c337e9b14774d1bb298df90 -ARG PGIS1_PROJ_CHECKOUT_SHA1=b302a91ace4493a3e15b84d73b567b5f3a93451d +ARG PGIS1_GDAL_CHECKOUT_SHA1=491a5f84c47c38ff36b1ac3b6aeea0628674883b +ARG PGIS1_PROJ_CHECKOUT_SHA1=ef276d39d982611ebbd3b3c715f4cbdec6d28976 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index 378a553a7..ed374cf73 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index 0b012cc31..9a1a31833 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -116,6 +116,8 @@ RUN set -eux \ pcre2 \ protobuf-c \ \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ # ca-certificates: for accessing remote raster files # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 7bdfac255..bc793ac66 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6aedb1434727fa1eba29620a7d3fd0bfca49e94a +ARG PGIS1_POSTGIS_CHECKOUT=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=1df855eb676e17278c337e9b14774d1bb298df90 -ARG PGIS1_PROJ_CHECKOUT=b302a91ace4493a3e15b84d73b567b5f3a93451d +ARG PGIS1_GDAL_CHECKOUT=491a5f84c47c38ff36b1ac3b6aeea0628674883b +ARG PGIS1_PROJ_CHECKOUT=ef276d39d982611ebbd3b3c715f4cbdec6d28976 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=6aedb1434727fa1eba29620a7d3fd0bfca49e94a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=1df855eb676e17278c337e9b14774d1bb298df90 -ARG PGIS1_PROJ_CHECKOUT_SHA1=b302a91ace4493a3e15b84d73b567b5f3a93451d +ARG PGIS1_GDAL_CHECKOUT_SHA1=491a5f84c47c38ff36b1ac3b6aeea0628674883b +ARG PGIS1_PROJ_CHECKOUT_SHA1=ef276d39d982611ebbd3b3c715f4cbdec6d28976 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 diff --git a/README.md b/README.md index f1e069bd5..0f2ddbbd5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-01) +## Versions (2024-01-05) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index c390b703c..e156eabae 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", - "POSTGIS_CHECKOUT_SHA1": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", + "POSTGIS_CHECKOUT": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", + "POSTGIS_CHECKOUT_SHA1": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "b302a91ace4493a3e15b84d73b567b5f3a93451d", - "PROJ_CHECKOUT_SHA1": "b302a91ace4493a3e15b84d73b567b5f3a93451d", - "GDAL_CHECKOUT": "1df855eb676e17278c337e9b14774d1bb298df90", - "GDAL_CHECKOUT_SHA1": "1df855eb676e17278c337e9b14774d1bb298df90", + "PROJ_CHECKOUT": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", + "PROJ_CHECKOUT_SHA1": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", + "GDAL_CHECKOUT": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", + "GDAL_CHECKOUT_SHA1": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", - "POSTGIS_CHECKOUT_SHA1": "6aedb1434727fa1eba29620a7d3fd0bfca49e94a", + "POSTGIS_CHECKOUT": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", + "POSTGIS_CHECKOUT_SHA1": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "b302a91ace4493a3e15b84d73b567b5f3a93451d", - "PROJ_CHECKOUT_SHA1": "b302a91ace4493a3e15b84d73b567b5f3a93451d", - "GDAL_CHECKOUT": "1df855eb676e17278c337e9b14774d1bb298df90", - "GDAL_CHECKOUT_SHA1": "1df855eb676e17278c337e9b14774d1bb298df90", + "PROJ_CHECKOUT": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", + "PROJ_CHECKOUT_SHA1": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", + "GDAL_CHECKOUT": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", + "GDAL_CHECKOUT_SHA1": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", "BOOST_VERSION": "1.74.0" From 80865624dc009596bc94eb2ff8a6ef8772db9b8c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 12 Jan 2024 23:29:11 +0100 Subject: [PATCH 046/167] update.sh, small fixes in the bundle0 --- .github/workflows/main.yml | 4 +- 15-3.4-bundle0/bookworm/Dockerfile | 37 ++++----------- 15-master/bookworm/Dockerfile | 20 ++++---- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 75 +++++++++++++++++------------- 16-master/bookworm/Dockerfile | 20 ++++---- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- Dockerfile.bundle0.template | 53 +++------------------ README.md | 6 +-- manifest.sh | 12 ++--- versions.json | 60 ++++++++++++------------ 13 files changed, 126 insertions(+), 173 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa83520b1..a1436d4d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,14 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 2ba2771c5..bb161a58f 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=96f81a3106683f186f091ad88339c8c223f4363c +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=27398c44085ee4341e373351776e0052bd25bbc2 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 @@ -153,8 +153,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install - - FROM builder as builder-mobilitydb ARG PGIS1_MOBILITYDB_REPOSITORY @@ -202,21 +200,13 @@ RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw -#TODO -# add https://github.com/bosth/geofdw -# RUN pgxn install --verbose plv8 # todo: need to fix build -# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check -# RUN pgxn install --verbose pg_bm25 # need rust -# RUN pgxn install --verbose orafce : todo check -# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - FROM builder as builder-other ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 -# add add https://github.com/hydradatabase/hydra +# Add hydradatabase RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ @@ -282,10 +272,6 @@ RUN set -eux \ \ postgis \ postgresql \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgvector \ postgresql-client-common \ postgresql-common \ postgresql-contrib \ @@ -301,6 +287,7 @@ RUN set -eux \ pspg \ vip-manager \ \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -312,6 +299,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-ogr-fdw \ postgresql-$PG_MAJOR-partman \ postgresql-$PG_MAJOR-periods \ postgresql-$PG_MAJOR-pg-fact-loader \ @@ -319,16 +307,19 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ -# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ @@ -336,9 +327,6 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-pointcloud \ - # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ # MeCab based tokenizer for pgdg-pgroonga @@ -348,13 +336,6 @@ RUN set -eux \ # pgsodium libsodium23 \ \ -# && pip3 install --upgrade pip \ - \ -# && pipx install geopy \ -# && pipx install plpygis \ -# && pipx install pygml \ -# && pipx install shapely \ - \ && rm -Rf /root/.cache/pip \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 1da15988c..895fb7a9a 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a -ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=491a5f84c47c38ff36b1ac3b6aeea0628674883b -ARG PGIS1_PROJ_CHECKOUT=ef276d39d982611ebbd3b3c715f4cbdec6d28976 +ARG PGIS1_POSTGIS_CHECKOUT=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 +ARG PGIS1_GDAL_CHECKOUT=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 +ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a -ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=491a5f84c47c38ff36b1ac3b6aeea0628674883b -ARG PGIS1_PROJ_CHECKOUT_SHA1=ef276d39d982611ebbd3b3c715f4cbdec6d28976 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 +ARG PGIS1_GDAL_CHECKOUT_SHA1=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 +ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index a535b3ecd..0cbe761f1 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 +ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index ee5b229d4..c92d90d17 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index ae08c82ec..036bbe02d 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=96f81a3106683f186f091ad88339c8c223f4363c +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=27398c44085ee4341e373351776e0052bd25bbc2 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 @@ -127,8 +127,31 @@ ARG PGIS1_TIMESCALEDB_REPOSITORY ARG PGIS1_TIMESCALEDB_CHECKOUT ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 -# Timescaledb not supported on pg16 yet - +# Install TimescaleDB; no Arm64 apt support, so build from source +RUN set -eux \ + && mkdir -p /timescaledb \ + && cd timescaledb \ + && git init \ + && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_timescaledb_last_commit.txt \ + && ./bootstrap \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ + \ + -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ + -DREGRESS_CHECKS=OFF \ + -DSEND_TELEMETRY_DEFAULT=NO \ + -DTAP_CHECKS=OFF \ + -DWARNINGS_AS_ERRORS=OFF \ + -DENABLE_DEBUG_UTILS=OFF \ + && cd build \ + && make -j$(nproc) \ + && make install FROM builder as builder-mobilitydb @@ -177,21 +200,20 @@ RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw -#TODO -# add https://github.com/bosth/geofdw -# RUN pgxn install --verbose plv8 # todo: need to fix build -# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check -# RUN pgxn install --verbose pg_bm25 # need rust -# RUN pgxn install --verbose orafce : todo check -# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - FROM builder as builder-other ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 -# PG16 + hydra not supperted https://github.com/hydradatabase/hydra +# Add hydradatabase +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && cd hydra/columnar \ + && git checkout main \ + && ./configure \ + && make -j$(nproc) \ + && make install # install pg_hint_plan RUN set -eux \ @@ -250,10 +272,6 @@ RUN set -eux \ \ postgis \ postgresql \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgvector \ postgresql-client-common \ postgresql-common \ postgresql-contrib \ @@ -269,6 +287,7 @@ RUN set -eux \ pspg \ vip-manager \ \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -280,6 +299,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-ogr-fdw \ postgresql-$PG_MAJOR-partman \ postgresql-$PG_MAJOR-periods \ postgresql-$PG_MAJOR-pg-fact-loader \ @@ -287,16 +307,19 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ -# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ @@ -304,11 +327,6 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ -# -# not yet available for 16 -# postgresql-$PG_MAJOR-pointcloud \ -# postgresql-$PG_MAJOR-age \ - # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ # MeCab based tokenizer for pgdg-pgroonga @@ -318,13 +336,6 @@ RUN set -eux \ # pgsodium libsodium23 \ \ -# && pip3 install --upgrade pip \ - \ -# && pipx install geopy \ -# && pipx install plpygis \ -# && pipx install pygml \ -# && pipx install shapely \ - \ && rm -Rf /root/.cache/pip \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -364,8 +375,8 @@ RUN set -eux \ # add MobilityDB requirements RUN set -eux \ && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ - # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index bc793ac66..da5eda6fc 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a -ARG PGIS1_GEOS_CHECKOUT=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT=491a5f84c47c38ff36b1ac3b6aeea0628674883b -ARG PGIS1_PROJ_CHECKOUT=ef276d39d982611ebbd3b3c715f4cbdec6d28976 +ARG PGIS1_POSTGIS_CHECKOUT=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 +ARG PGIS1_GDAL_CHECKOUT=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=eb659137e681eeac48c26d151374f4dfcbabdfa6 +ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a -ARG PGIS1_GEOS_CHECKOUT_SHA1=0aef713ac930e7247c50a1ae720c36f0f0bf790a -ARG PGIS1_GDAL_CHECKOUT_SHA1=491a5f84c47c38ff36b1ac3b6aeea0628674883b -ARG PGIS1_PROJ_CHECKOUT_SHA1=ef276d39d982611ebbd3b3c715f4cbdec6d28976 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 +ARG PGIS1_GDAL_CHECKOUT_SHA1=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=eb659137e681eeac48c26d151374f4dfcbabdfa6 +ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 2b86580ea..b4950b0a8 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=f0925c2197c5c84786759ee00b2d82858e8c3f19 +ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 7fd9b011e..503a1fa9e 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index 7d61218dc..b05251095 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -122,9 +122,6 @@ ARG PGIS1_TIMESCALEDB_REPOSITORY ARG PGIS1_TIMESCALEDB_CHECKOUT ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 -{{ if env.version | startswith("16") then ( -}} -# Timescaledb not supported on pg16 yet -{{ ) else ( -}} # Install TimescaleDB; no Arm64 apt support, so build from source RUN set -eux \ && mkdir -p /timescaledb \ @@ -151,9 +148,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -{{ ) end -}} - - FROM builder as builder-mobilitydb ARG PGIS1_MOBILITYDB_REPOSITORY @@ -201,24 +195,13 @@ RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks RUN USE_PGXS=1 pgxn install sqlite_fdw -#TODO -# add https://github.com/bosth/geofdw -# RUN pgxn install --verbose plv8 # todo: need to fix build -# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check -# RUN pgxn install --verbose pg_bm25 # need rust -# RUN pgxn install --verbose orafce : todo check -# add?? libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c - FROM builder as builder-other ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 -{{ if env.version | startswith("16") then ( -}} -# PG16 + hydra not supperted https://github.com/hydradatabase/hydra -{{ ) else ( -}} -# add add https://github.com/hydradatabase/hydra +# Add hydradatabase RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ @@ -226,7 +209,6 @@ RUN set -eux \ && ./configure \ && make -j$(nproc) \ && make install -{{ ) end -}} # install pg_hint_plan RUN set -eux \ @@ -285,10 +267,6 @@ RUN set -eux \ \ postgis \ postgresql \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgvector \ postgresql-client-common \ postgresql-common \ postgresql-contrib \ @@ -304,6 +282,7 @@ RUN set -eux \ pspg \ vip-manager \ \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ postgresql-$PG_MAJOR-decoderbufs \ @@ -315,6 +294,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-ogr-fdw \ postgresql-$PG_MAJOR-partman \ postgresql-$PG_MAJOR-periods \ postgresql-$PG_MAJOR-pg-fact-loader \ @@ -322,16 +302,19 @@ RUN set -eux \ postgresql-$PG_MAJOR-pg-stat-kcache \ postgresql-$PG_MAJOR-pg-wait-sampling \ postgresql-$PG_MAJOR-pgaudit \ -# postgresql-$PG_MAJOR-pgdg-pgroonga \ # todo: check postgresql-$PG_MAJOR-pgl-ddl-deploy \ postgresql-$PG_MAJOR-pglogical \ postgresql-$PG_MAJOR-pgmp \ postgresql-$PG_MAJOR-pgpcre \ postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ postgresql-$PG_MAJOR-prefix \ postgresql-$PG_MAJOR-prioritize \ postgresql-$PG_MAJOR-q3c \ @@ -339,16 +322,6 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ -{{ if env.version | startswith("16") then ( -}} -# -# not yet available for 16 -# postgresql-$PG_MAJOR-pointcloud \ -# postgresql-$PG_MAJOR-age \ -{{ ) else ( -}} - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-pointcloud \ -{{ ) end -}} - # # add MobilityDb missing dependency from libgsl-dev libgsl27 \ # MeCab based tokenizer for pgdg-pgroonga @@ -358,13 +331,6 @@ RUN set -eux \ # pgsodium libsodium23 \ \ -# && pip3 install --upgrade pip \ - \ -# && pipx install geopy \ -# && pipx install plpygis \ -# && pipx install pygml \ -# && pipx install shapely \ - \ && rm -Rf /root/.cache/pip \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -404,13 +370,8 @@ RUN set -eux \ # add MobilityDB requirements RUN set -eux \ && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ -{{ if env.version | startswith("16") then ( -}} - # add MobilityDB requirements; ( TimescaleDB not yet supported on pg16 ) - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ -{{ ) else ( -}} # add MobilityDB and TimescaleDB requirements echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ -{{ ) end -}} # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/README.md b/README.md index 0f2ddbbd5..373ed477b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-05) +## Versions (2024-01-12) We provide multi-platform image support for the following architectures: @@ -95,8 +95,8 @@ For those new to PostGIS, we recommend the following image versions: | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.2, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 3857a620d..175d42623 100755 --- a/manifest.sh +++ b/manifest.sh @@ -326,11 +326,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -472,11 +472,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index e156eabae..4d269bc9b 100644 --- a/versions.json +++ b/versions.json @@ -214,8 +214,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0", - "TIMESCALEDB_CHECKOUT_SHA1": "96f81a3106683f186f091ad88339c8c223f4363c", + "TIMESCALEDB_CHECKOUT": "tags/2.13.1", + "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -231,24 +231,24 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", - "POSTGIS_CHECKOUT_SHA1": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", - "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", - "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", + "POSTGIS_CHECKOUT": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "POSTGIS_CHECKOUT_SHA1": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", + "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", - "PROJ_CHECKOUT_SHA1": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", - "GDAL_CHECKOUT": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", - "GDAL_CHECKOUT_SHA1": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", - "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", - "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", + "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", + "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", + "GDAL_CHECKOUT": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GDAL_CHECKOUT_SHA1": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", + "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "BOOST_VERSION": "1.74.0" } }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -259,8 +259,8 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", - "GDAL_CHECKOUT": "tags/v3.8.2", - "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", + "GDAL_CHECKOUT": "tags/v3.8.3", + "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -335,8 +335,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0", - "TIMESCALEDB_CHECKOUT_SHA1": "96f81a3106683f186f091ad88339c8c223f4363c", + "TIMESCALEDB_CHECKOUT": "tags/2.13.1", + "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -352,24 +352,24 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", - "POSTGIS_CHECKOUT_SHA1": "5c7c2c3ee7c9d8f03c8c7ac1a1c3cc555400dd2a", - "CGAL_CHECKOUT": "eb659137e681eeac48c26d151374f4dfcbabdfa6", - "CGAL_CHECKOUT_SHA1": "eb659137e681eeac48c26d151374f4dfcbabdfa6", + "POSTGIS_CHECKOUT": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "POSTGIS_CHECKOUT_SHA1": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", + "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", - "PROJ_CHECKOUT_SHA1": "ef276d39d982611ebbd3b3c715f4cbdec6d28976", - "GDAL_CHECKOUT": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", - "GDAL_CHECKOUT_SHA1": "491a5f84c47c38ff36b1ac3b6aeea0628674883b", - "GEOS_CHECKOUT": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", - "GEOS_CHECKOUT_SHA1": "0aef713ac930e7247c50a1ae720c36f0f0bf790a", + "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", + "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", + "GDAL_CHECKOUT": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GDAL_CHECKOUT_SHA1": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", + "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "BOOST_VERSION": "1.74.0" } }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.2-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -380,8 +380,8 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", - "GDAL_CHECKOUT": "tags/v3.8.2", - "GDAL_CHECKOUT_SHA1": "f0925c2197c5c84786759ee00b2d82858e8c3f19", + "GDAL_CHECKOUT": "tags/v3.8.3", + "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", From 0c65c070972ccc27fe6aa927d4e3f63a4db9fa5e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 13 Jan 2024 22:21:37 +0100 Subject: [PATCH 047/167] add trivy and dive check --- .circleci/config.yml | 2 ++ .dockerignore | 4 +++- .github/workflows/main.yml | 8 ++++++++ .gitignore | 1 + Makefile | 30 ++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e016f666b..9f9e9172c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,6 +51,8 @@ jobs: - run: make -n test-<< parameters.target-version-variant >> - run: make test-<< parameters.target-version-variant >> + - run: make scan-<< parameters.target-version-variant >> || true + - run: make dive-<< parameters.target-version-variant >> || true - run: docker images - run: diff --git a/.dockerignore b/.dockerignore index d54c78ac4..6e7000d9b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,4 +15,6 @@ version.json Dockerfile.*.template localetest.sh -apply-*.sh \ No newline at end of file +apply-*.sh + +trivy_cache diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1436d4d2..786fe81f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -120,6 +120,14 @@ jobs: if: env.IMAGE_EXISTS == 'false' run: make test-${{ matrix.version }}-${{ matrix.variant }} + - name: "make scan-${{ matrix.version }}-${{ matrix.variant }}" + if: env.IMAGE_EXISTS == 'false' + run: make scan-${{ matrix.version }}-${{ matrix.variant }} || true + + - name: "make dive-${{ matrix.version }}-${{ matrix.variant }}" + if: env.IMAGE_EXISTS == 'false' + run: make dive-${{ matrix.version }}-${{ matrix.variant }} || true + - run: make dockerlist - name: Push docker image to dockerhub diff --git a/.gitignore b/.gitignore index 892bf50b3..c02e5a206 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .template-helper-functions.jq _* .vscode/ +trivy_cache diff --git a/Makefile b/Makefile index 09d60d0f8..cfb73354b 100644 --- a/Makefile +++ b/Makefile @@ -198,6 +198,30 @@ push-readme: -e README_FILEPATH="/workspace/README.md" $(DOCKERHUB_DESC_IMG); +#---------------------------------------------------------- +define scan-target +scan-$(1)-$(2): + $(DOCKER) run \ + --pull always --rm -v $$(pwd)/trivy_cache:/root/.cache/ \ + aquasec/trivy:latest image --ignore-unfixed \ + $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call scan-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# -------------------------------------------------- + +#---------------------------------------------------------- +define dive-target +dive-$(1)-$(2): + $(DOCKER) run \ + --pull always --rm -it \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e CI=true \ + wagoodman/dive:latest \ + $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) +endef +$(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call dive-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) +# -------------------------------------------------- + # -------------------------------------------------- # password: f62ba0 == echo -n "postgis" | md5sum | cut -c 1-6 @@ -304,6 +328,10 @@ help: check_variant @echo $(foreach version,$(VERSIONS),' manifest-$(version)') @echo $(foreach dir,$(DOCKERFILE_DIRS),' manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' + @echo ' [[ Scan the docker image, using aquasec/trivy ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' scan-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') + @echo ' [[ Dive the docker image, using wagoodman/dive ]]' + @echo $(foreach dir,$(DOCKERFILE_DIRS),' dive-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' [[ Start the docker image ]]' @echo $(foreach dir,$(DOCKERFILE_DIRS),' start-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' [[ Stop the docker image ]]' @@ -339,6 +367,8 @@ help: check_variant $(foreach dir,$(DOCKERFILE_DIRS),' push-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ $(foreach version,$(VERSIONS),' manifest-$(version)') \ $(foreach dir,$(DOCKERFILE_DIRS),' manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' scan-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ + $(foreach dir,$(DOCKERFILE_DIRS),' dive-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ $(foreach dir,$(DOCKERFILE_DIRS),' start-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ $(foreach dir,$(DOCKERFILE_DIRS),' stop-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ $(foreach dir,$(DOCKERFILE_DIRS),' psql-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ From 7845661f1635cb387b0bec634bd8192abfbf9255 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 13 Jan 2024 22:23:42 +0100 Subject: [PATCH 048/167] update.sh --- 15-master/bookworm/Dockerfile | 8 ++++---- 16-master/bookworm/Dockerfile | 8 ++++---- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 895fb7a9a..f0e04e3e8 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_GDAL_CHECKOUT=4daa3198862100f27a9180a7400e294c8c01fcdc ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT_SHA1=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_GDAL_CHECKOUT_SHA1=4daa3198862100f27a9180a7400e294c8c01fcdc ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index da5eda6fc..a92ceda20 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_GDAL_CHECKOUT=4daa3198862100f27a9180a7400e294c8c01fcdc ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=bf6be27c3ca640c21abfee118863d9bdb58bb02f +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT_SHA1=41bbd3bf4ec78295e787020a1d722bab16a384cf +ARG PGIS1_GDAL_CHECKOUT_SHA1=4daa3198862100f27a9180a7400e294c8c01fcdc ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/README.md b/README.md index 373ed477b..0185c8c1e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-12) +## Versions (2024-01-13) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 4d269bc9b..e4529d3d4 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", - "POSTGIS_CHECKOUT_SHA1": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "POSTGIS_CHECKOUT": "8619e4da76e068c94327613a3196c73911f82b0c", + "POSTGIS_CHECKOUT_SHA1": "8619e4da76e068c94327613a3196c73911f82b0c", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", - "GDAL_CHECKOUT": "41bbd3bf4ec78295e787020a1d722bab16a384cf", - "GDAL_CHECKOUT_SHA1": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GDAL_CHECKOUT": "4daa3198862100f27a9180a7400e294c8c01fcdc", + "GDAL_CHECKOUT_SHA1": "4daa3198862100f27a9180a7400e294c8c01fcdc", "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "BOOST_VERSION": "1.74.0" @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", - "POSTGIS_CHECKOUT_SHA1": "bf6be27c3ca640c21abfee118863d9bdb58bb02f", + "POSTGIS_CHECKOUT": "8619e4da76e068c94327613a3196c73911f82b0c", + "POSTGIS_CHECKOUT_SHA1": "8619e4da76e068c94327613a3196c73911f82b0c", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", - "GDAL_CHECKOUT": "41bbd3bf4ec78295e787020a1d722bab16a384cf", - "GDAL_CHECKOUT_SHA1": "41bbd3bf4ec78295e787020a1d722bab16a384cf", + "GDAL_CHECKOUT": "4daa3198862100f27a9180a7400e294c8c01fcdc", + "GDAL_CHECKOUT_SHA1": "4daa3198862100f27a9180a7400e294c8c01fcdc", "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", "BOOST_VERSION": "1.74.0" From f75ddf968e86326864abf5f1faccabc97e1b0c99 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 14 Jan 2024 00:47:43 +0100 Subject: [PATCH 049/167] fix ci --- .github/workflows/main.yml | 2 +- Makefile | 24 ++++++++++++------------ README.md | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 786fe81f9..34f5d3463 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -128,7 +128,7 @@ jobs: if: env.IMAGE_EXISTS == 'false' run: make dive-${{ matrix.version }}-${{ matrix.variant }} || true - - run: make dockerlist + - run: docker images - name: Push docker image to dockerhub if: ${{ (env.IMAGE_EXISTS == 'false') && (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} diff --git a/Makefile b/Makefile index cfb73354b..2f086f0fe 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,7 @@ $(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call scan-target,$(word 1,$(subst /, , define dive-target dive-$(1)-$(2): $(DOCKER) run \ - --pull always --rm -it \ + --pull always --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ -e CI=true \ wagoodman/dive:latest \ @@ -267,7 +267,7 @@ $(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call clean-target,$(word 1,$(subst /, all: check_variant update build test dockerlist: - docker images | grep "${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}" || true + docker images | grep "${REPO_NAME}/${IMAGE_NAME}" || true update: @echo '::Updating Dockerfiles' @@ -312,33 +312,33 @@ imageclean_${REPO_NAME}_${IMAGE_NAME}: help: check_variant @echo ' Available make targets:' @echo '------------------------------------ ' - @echo 'build : Build the docker image versions and variants' + @echo '# build : Build the docker image versions and variants' @echo $(foreach version,$(VERSIONS),' build-$(version)') @echo $(foreach dir,$(DOCKERFILE_DIRS),' build-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' - @echo 'test : Test the docker image versions and variants' + @echo '# test : Test the docker image versions and variants' @echo $(foreach version,$(VERSIONS),' test-$(version)') @echo $(foreach dir,$(DOCKERFILE_DIRS),' test-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' - @echo 'push : Push to the registry the docker image versions and variants' + @echo '# push : Push to the registry the docker image versions and variants' @echo $(foreach version,$(VERSIONS),' push-$(version)') @echo $(foreach dir,$(DOCKERFILE_DIRS),' push-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' - @echo 'manifest : Manifest registry the docker image versions and variants' + @echo '# manifest : Manifest registry the docker image versions and variants' @echo $(foreach version,$(VERSIONS),' manifest-$(version)') @echo $(foreach dir,$(DOCKERFILE_DIRS),' manifest-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' - @echo ' [[ Scan the docker image, using aquasec/trivy ]]' + @echo '# Scan the docker image, using aquasec/trivy' @echo $(foreach dir,$(DOCKERFILE_DIRS),' scan-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') - @echo ' [[ Dive the docker image, using wagoodman/dive ]]' + @echo '# Dive the docker image, using wagoodman/dive' @echo $(foreach dir,$(DOCKERFILE_DIRS),' dive-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') - @echo ' [[ Start the docker image ]]' + @echo '# Start the docker image' @echo $(foreach dir,$(DOCKERFILE_DIRS),' start-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') - @echo ' [[ Stop the docker image ]]' + @echo '# Stop the docker image' @echo $(foreach dir,$(DOCKERFILE_DIRS),' stop-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') - @echo ' [[ psql exec the docker image ]]' + @echo '# psql exec the docker image' @echo $(foreach dir,$(DOCKERFILE_DIRS),' psql-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') - @echo ' [[ clean docker image and volume ]]' + @echo '# clean docker image and volume' @echo $(foreach dir,$(DOCKERFILE_DIRS),' clean-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' @echo 'all : Local run: "update" "build" "test" (without push)' diff --git a/README.md b/README.md index 0185c8c1e..ddc044325 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-13) +## Versions (2024-01-14) We provide multi-platform image support for the following architectures: From 4e8f2d9cb57e2e1905824756464810a38dfa312f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 14 Jan 2024 02:13:27 +0100 Subject: [PATCH 050/167] refactor scan,dive --- .circleci/config.yml | 1 + .github/workflows/main.yml | 1 + Makefile | 10 +++------- tools/install_dive.sh | 29 +++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100755 tools/install_dive.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f9e9172c..1683f386e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,6 +35,7 @@ jobs: - run: pip3 install --upgrade pip - run: pip3 install --upgrade lastversion - run: tools/install_manifest-tool.sh + - run: tools/install_dive.sh - run: tools/environment_init.sh - run: make check_version - run: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34f5d3463..8edc73424 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,6 +67,7 @@ jobs: - run: pip3 install --upgrade pip - run: pip3 install --upgrade lastversion - run: tools/install_manifest-tool.sh + - run: tools/install_dive.sh - run: tools/environment_init.sh - run: make check_version diff --git a/Makefile b/Makefile index 2f086f0fe..040f3b2da 100644 --- a/Makefile +++ b/Makefile @@ -203,7 +203,7 @@ define scan-target scan-$(1)-$(2): $(DOCKER) run \ --pull always --rm -v $$(pwd)/trivy_cache:/root/.cache/ \ - aquasec/trivy:latest image --ignore-unfixed \ + ghcr.io/aquasecurity/trivy:latest image --ignore-unfixed \ $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) endef $(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call scan-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) @@ -212,12 +212,8 @@ $(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call scan-target,$(word 1,$(subst /, , #---------------------------------------------------------- define dive-target dive-$(1)-$(2): - $(DOCKER) run \ - --pull always --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e CI=true \ - wagoodman/dive:latest \ - $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) + CI=true tools/dive \ + $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME):$(shell cat $(1)/$(2)/tags | cut -d' ' -f1) endef $(foreach dir,$(DOCKERFILE_DIRS),$(eval $(call dive-target,$(word 1,$(subst /, ,$(dir))),$(word 2,$(subst /, ,$(dir)))))) # -------------------------------------------------- diff --git a/tools/install_dive.sh b/tools/install_dive.sh new file mode 100755 index 000000000..9476ac15c --- /dev/null +++ b/tools/install_dive.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -Eeuo pipefail + +# https://github.com/wagoodman/dive/releases/tag/v0.11.0 +version="0.11.0" + +# Determine IMAGE_ARCH based on the machine architecture +if [[ "$(uname -m)" == "x86_64" ]]; then + IMAGE_ARCH=amd64 + checksum="80835d3320292c4ab761d03c1fd33745ddb9b6064c035b65f77825f18f407d28 tools/dive_0.11.0_linux_amd64.tar.gz" +elif [[ "$(uname -m)" == "aarch64" ]]; then + IMAGE_ARCH=arm64 + checksum="656aa45f618c30f02a30fa256e429ba1afafd9e39e3757e52a30764494c71b7a tools/dive_0.11.0_linux_arm64.tar.gz" +else + echo "Architecture not supported: $(uname -m)" + exit 1 +fi + +# Download wagoodman/dive tool +rm -f "tools/dive" +rm -f "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" +wget https://github.com/wagoodman/dive/releases/download/v${version}/dive_${version}_linux_${IMAGE_ARCH}.tar.gz -O tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz +echo "${checksum}"| sha256sum --check +tar -xzf "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" -C "tools/" +chmod +x "tools/dive" +rm -f "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" + +# Check dive version +tools/dive -v From b747a079a3ca20ba07936d12790c31a20dd34ce7 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 16 Jan 2024 18:00:13 +0100 Subject: [PATCH 051/167] update.sh --- 15-master/bookworm/Dockerfile | 12 ++++++------ 16-master/bookworm/Dockerfile | 12 ++++++------ README.md | 2 +- versions.json | 24 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index f0e04e3e8..d1ba6df4c 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -16,16 +16,16 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c -ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT=4daa3198862100f27a9180a7400e294c8c01fcdc -ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 +ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 +ARG PGIS1_GDAL_CHECKOUT=4897bf235aa7c453ff34db846a8eb9855163c2b4 +ARG PGIS1_PROJ_CHECKOUT=dc8485e1f800f62bb5f84da1df038211546985e8 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c -ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT_SHA1=4daa3198862100f27a9180a7400e294c8c01fcdc -ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 +ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 +ARG PGIS1_GDAL_CHECKOUT_SHA1=4897bf235aa7c453ff34db846a8eb9855163c2b4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=dc8485e1f800f62bb5f84da1df038211546985e8 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a92ceda20..0c2d63cde 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -16,16 +16,16 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c -ARG PGIS1_GEOS_CHECKOUT=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT=4daa3198862100f27a9180a7400e294c8c01fcdc -ARG PGIS1_PROJ_CHECKOUT=a50673d196ebeddb83194801d723f5f52c754eb6 +ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 +ARG PGIS1_GDAL_CHECKOUT=4897bf235aa7c453ff34db846a8eb9855163c2b4 +ARG PGIS1_PROJ_CHECKOUT=dc8485e1f800f62bb5f84da1df038211546985e8 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c -ARG PGIS1_GEOS_CHECKOUT_SHA1=6f70b63a0d976ce31dd2952094bc1a39209f8a20 -ARG PGIS1_GDAL_CHECKOUT_SHA1=4daa3198862100f27a9180a7400e294c8c01fcdc -ARG PGIS1_PROJ_CHECKOUT_SHA1=a50673d196ebeddb83194801d723f5f52c754eb6 +ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 +ARG PGIS1_GDAL_CHECKOUT_SHA1=4897bf235aa7c453ff34db846a8eb9855163c2b4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=dc8485e1f800f62bb5f84da1df038211546985e8 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/README.md b/README.md index ddc044325..ebb014b17 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-14) +## Versions (2024-01-16) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index e4529d3d4..e93a83deb 100644 --- a/versions.json +++ b/versions.json @@ -237,12 +237,12 @@ "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", - "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", - "GDAL_CHECKOUT": "4daa3198862100f27a9180a7400e294c8c01fcdc", - "GDAL_CHECKOUT_SHA1": "4daa3198862100f27a9180a7400e294c8c01fcdc", - "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", - "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", + "PROJ_CHECKOUT": "dc8485e1f800f62bb5f84da1df038211546985e8", + "PROJ_CHECKOUT_SHA1": "dc8485e1f800f62bb5f84da1df038211546985e8", + "GDAL_CHECKOUT": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "GDAL_CHECKOUT_SHA1": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", + "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" } }, @@ -358,12 +358,12 @@ "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "a50673d196ebeddb83194801d723f5f52c754eb6", - "PROJ_CHECKOUT_SHA1": "a50673d196ebeddb83194801d723f5f52c754eb6", - "GDAL_CHECKOUT": "4daa3198862100f27a9180a7400e294c8c01fcdc", - "GDAL_CHECKOUT_SHA1": "4daa3198862100f27a9180a7400e294c8c01fcdc", - "GEOS_CHECKOUT": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", - "GEOS_CHECKOUT_SHA1": "6f70b63a0d976ce31dd2952094bc1a39209f8a20", + "PROJ_CHECKOUT": "dc8485e1f800f62bb5f84da1df038211546985e8", + "PROJ_CHECKOUT_SHA1": "dc8485e1f800f62bb5f84da1df038211546985e8", + "GDAL_CHECKOUT": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "GDAL_CHECKOUT_SHA1": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", + "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" } }, From b4d4d04f27e3907e9f78309bcc77278fa0adf5fa Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 18 Jan 2024 12:03:32 +0100 Subject: [PATCH 052/167] update.sh --- 15-master/bookworm/Dockerfile | 12 ++++++------ 16-master/bookworm/Dockerfile | 12 ++++++------ README.md | 2 +- versions.json | 24 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index d1ba6df4c..76ff6d81f 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c +ARG PGIS1_POSTGIS_CHECKOUT=8489655ed88134a4478121041dbdb9ead12f6868 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=4897bf235aa7c453ff34db846a8eb9855163c2b4 -ARG PGIS1_PROJ_CHECKOUT=dc8485e1f800f62bb5f84da1df038211546985e8 +ARG PGIS1_GDAL_CHECKOUT=a99ea67de54daed6547fed8bb9287eba5729d6bb +ARG PGIS1_PROJ_CHECKOUT=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8489655ed88134a4478121041dbdb9ead12f6868 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=4897bf235aa7c453ff34db846a8eb9855163c2b4 -ARG PGIS1_PROJ_CHECKOUT_SHA1=dc8485e1f800f62bb5f84da1df038211546985e8 +ARG PGIS1_GDAL_CHECKOUT_SHA1=a99ea67de54daed6547fed8bb9287eba5729d6bb +ARG PGIS1_PROJ_CHECKOUT_SHA1=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 0c2d63cde..da6dfe0b5 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=8619e4da76e068c94327613a3196c73911f82b0c +ARG PGIS1_POSTGIS_CHECKOUT=8489655ed88134a4478121041dbdb9ead12f6868 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=4897bf235aa7c453ff34db846a8eb9855163c2b4 -ARG PGIS1_PROJ_CHECKOUT=dc8485e1f800f62bb5f84da1df038211546985e8 +ARG PGIS1_GDAL_CHECKOUT=a99ea67de54daed6547fed8bb9287eba5729d6bb +ARG PGIS1_PROJ_CHECKOUT=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8619e4da76e068c94327613a3196c73911f82b0c +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8489655ed88134a4478121041dbdb9ead12f6868 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=4897bf235aa7c453ff34db846a8eb9855163c2b4 -ARG PGIS1_PROJ_CHECKOUT_SHA1=dc8485e1f800f62bb5f84da1df038211546985e8 +ARG PGIS1_GDAL_CHECKOUT_SHA1=a99ea67de54daed6547fed8bb9287eba5729d6bb +ARG PGIS1_PROJ_CHECKOUT_SHA1=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/README.md b/README.md index ebb014b17..01df24732 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-16) +## Versions (2024-01-18) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index e93a83deb..97d79a425 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "8619e4da76e068c94327613a3196c73911f82b0c", - "POSTGIS_CHECKOUT_SHA1": "8619e4da76e068c94327613a3196c73911f82b0c", + "POSTGIS_CHECKOUT": "8489655ed88134a4478121041dbdb9ead12f6868", + "POSTGIS_CHECKOUT_SHA1": "8489655ed88134a4478121041dbdb9ead12f6868", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "dc8485e1f800f62bb5f84da1df038211546985e8", - "PROJ_CHECKOUT_SHA1": "dc8485e1f800f62bb5f84da1df038211546985e8", - "GDAL_CHECKOUT": "4897bf235aa7c453ff34db846a8eb9855163c2b4", - "GDAL_CHECKOUT_SHA1": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "PROJ_CHECKOUT": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", + "PROJ_CHECKOUT_SHA1": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", + "GDAL_CHECKOUT": "a99ea67de54daed6547fed8bb9287eba5729d6bb", + "GDAL_CHECKOUT_SHA1": "a99ea67de54daed6547fed8bb9287eba5729d6bb", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "8619e4da76e068c94327613a3196c73911f82b0c", - "POSTGIS_CHECKOUT_SHA1": "8619e4da76e068c94327613a3196c73911f82b0c", + "POSTGIS_CHECKOUT": "8489655ed88134a4478121041dbdb9ead12f6868", + "POSTGIS_CHECKOUT_SHA1": "8489655ed88134a4478121041dbdb9ead12f6868", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "dc8485e1f800f62bb5f84da1df038211546985e8", - "PROJ_CHECKOUT_SHA1": "dc8485e1f800f62bb5f84da1df038211546985e8", - "GDAL_CHECKOUT": "4897bf235aa7c453ff34db846a8eb9855163c2b4", - "GDAL_CHECKOUT_SHA1": "4897bf235aa7c453ff34db846a8eb9855163c2b4", + "PROJ_CHECKOUT": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", + "PROJ_CHECKOUT_SHA1": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", + "GDAL_CHECKOUT": "a99ea67de54daed6547fed8bb9287eba5729d6bb", + "GDAL_CHECKOUT_SHA1": "a99ea67de54daed6547fed8bb9287eba5729d6bb", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" From d38ba7494fa0917951c1ac14e2216ab5c6a943c6 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 22 Jan 2024 18:48:47 +0100 Subject: [PATCH 053/167] update.sh --- 15-master/bookworm/Dockerfile | 12 ++++++------ 16-master/bookworm/Dockerfile | 12 ++++++------ README.md | 2 +- versions.json | 24 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 76ff6d81f..e73fa832b 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=8489655ed88134a4478121041dbdb9ead12f6868 +ARG PGIS1_POSTGIS_CHECKOUT=5b2ae9ff058387de2a0b015181190ded0b37b12a ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=a99ea67de54daed6547fed8bb9287eba5729d6bb -ARG PGIS1_PROJ_CHECKOUT=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 +ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c +ARG PGIS1_PROJ_CHECKOUT=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8489655ed88134a4478121041dbdb9ead12f6868 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5b2ae9ff058387de2a0b015181190ded0b37b12a ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=a99ea67de54daed6547fed8bb9287eba5729d6bb -ARG PGIS1_PROJ_CHECKOUT_SHA1=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 +ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c +ARG PGIS1_PROJ_CHECKOUT_SHA1=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index da6dfe0b5..a39621786 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=8489655ed88134a4478121041dbdb9ead12f6868 +ARG PGIS1_POSTGIS_CHECKOUT=5b2ae9ff058387de2a0b015181190ded0b37b12a ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=a99ea67de54daed6547fed8bb9287eba5729d6bb -ARG PGIS1_PROJ_CHECKOUT=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 +ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c +ARG PGIS1_PROJ_CHECKOUT=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=8489655ed88134a4478121041dbdb9ead12f6868 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5b2ae9ff058387de2a0b015181190ded0b37b12a ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=a99ea67de54daed6547fed8bb9287eba5729d6bb -ARG PGIS1_PROJ_CHECKOUT_SHA1=ac0b9fc0019c56fd6211cce0d19a3ac1e510b744 +ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c +ARG PGIS1_PROJ_CHECKOUT_SHA1=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/README.md b/README.md index 01df24732..1ebadbb6c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-18) +## Versions (2024-01-22) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 97d79a425..f83125d85 100644 --- a/versions.json +++ b/versions.json @@ -231,16 +231,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "8489655ed88134a4478121041dbdb9ead12f6868", - "POSTGIS_CHECKOUT_SHA1": "8489655ed88134a4478121041dbdb9ead12f6868", + "POSTGIS_CHECKOUT": "5b2ae9ff058387de2a0b015181190ded0b37b12a", + "POSTGIS_CHECKOUT_SHA1": "5b2ae9ff058387de2a0b015181190ded0b37b12a", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", - "PROJ_CHECKOUT_SHA1": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", - "GDAL_CHECKOUT": "a99ea67de54daed6547fed8bb9287eba5729d6bb", - "GDAL_CHECKOUT_SHA1": "a99ea67de54daed6547fed8bb9287eba5729d6bb", + "PROJ_CHECKOUT": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "PROJ_CHECKOUT_SHA1": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", + "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -352,16 +352,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "8489655ed88134a4478121041dbdb9ead12f6868", - "POSTGIS_CHECKOUT_SHA1": "8489655ed88134a4478121041dbdb9ead12f6868", + "POSTGIS_CHECKOUT": "5b2ae9ff058387de2a0b015181190ded0b37b12a", + "POSTGIS_CHECKOUT_SHA1": "5b2ae9ff058387de2a0b015181190ded0b37b12a", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", - "PROJ_CHECKOUT_SHA1": "ac0b9fc0019c56fd6211cce0d19a3ac1e510b744", - "GDAL_CHECKOUT": "a99ea67de54daed6547fed8bb9287eba5729d6bb", - "GDAL_CHECKOUT_SHA1": "a99ea67de54daed6547fed8bb9287eba5729d6bb", + "PROJ_CHECKOUT": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "PROJ_CHECKOUT_SHA1": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", + "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" From 91380669e70865ceb75fa03eb87ae3e0dac11a00 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 23 Jan 2024 01:38:43 +0100 Subject: [PATCH 054/167] update.sh --- 15-master/bookworm/Dockerfile | 8 ++++---- 16-master/bookworm/Dockerfile | 8 ++++---- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index e73fa832b..b2e97c624 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=5b2ae9ff058387de2a0b015181190ded0b37b12a +ARG PGIS1_POSTGIS_CHECKOUT=81381c6e5d313d6888bd3a880ddaef99783a0062 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 +ARG PGIS1_PROJ_CHECKOUT=5920e2998318189970c0fe1e2db60f643515b9ea ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5b2ae9ff058387de2a0b015181190ded0b37b12a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=81381c6e5d313d6888bd3a880ddaef99783a0062 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT_SHA1=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 +ARG PGIS1_PROJ_CHECKOUT_SHA1=5920e2998318189970c0fe1e2db60f643515b9ea ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a39621786..25230aa3c 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=5b2ae9ff058387de2a0b015181190ded0b37b12a +ARG PGIS1_POSTGIS_CHECKOUT=81381c6e5d313d6888bd3a880ddaef99783a0062 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 +ARG PGIS1_PROJ_CHECKOUT=5920e2998318189970c0fe1e2db60f643515b9ea ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=5b2ae9ff058387de2a0b015181190ded0b37b12a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=81381c6e5d313d6888bd3a880ddaef99783a0062 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT_SHA1=f377ffa7d62fddf18e9d1c5814c0051cfb35d994 +ARG PGIS1_PROJ_CHECKOUT_SHA1=5920e2998318189970c0fe1e2db60f643515b9ea ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 diff --git a/README.md b/README.md index 1ebadbb6c..ccd19b1c3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-22) +## Versions (2024-01-23) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index f83125d85..4729374a6 100644 --- a/versions.json +++ b/versions.json @@ -231,14 +231,14 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5b2ae9ff058387de2a0b015181190ded0b37b12a", - "POSTGIS_CHECKOUT_SHA1": "5b2ae9ff058387de2a0b015181190ded0b37b12a", + "POSTGIS_CHECKOUT": "81381c6e5d313d6888bd3a880ddaef99783a0062", + "POSTGIS_CHECKOUT_SHA1": "81381c6e5d313d6888bd3a880ddaef99783a0062", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", - "PROJ_CHECKOUT_SHA1": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "PROJ_CHECKOUT": "5920e2998318189970c0fe1e2db60f643515b9ea", + "PROJ_CHECKOUT_SHA1": "5920e2998318189970c0fe1e2db60f643515b9ea", "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", @@ -352,14 +352,14 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "5b2ae9ff058387de2a0b015181190ded0b37b12a", - "POSTGIS_CHECKOUT_SHA1": "5b2ae9ff058387de2a0b015181190ded0b37b12a", + "POSTGIS_CHECKOUT": "81381c6e5d313d6888bd3a880ddaef99783a0062", + "POSTGIS_CHECKOUT_SHA1": "81381c6e5d313d6888bd3a880ddaef99783a0062", "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", - "PROJ_CHECKOUT_SHA1": "f377ffa7d62fddf18e9d1c5814c0051cfb35d994", + "PROJ_CHECKOUT": "5920e2998318189970c0fe1e2db60f643515b9ea", + "PROJ_CHECKOUT_SHA1": "5920e2998318189970c0fe1e2db60f643515b9ea", "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", From 8c5c29bc3487f6b205c9a10e737cfcb0733ea3dc Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 28 Jan 2024 22:15:20 +0100 Subject: [PATCH 055/167] add locked, and old postgis-alpine versions --- .circleci/config.yml | 15 + .github/workflows/main.yml | 15 + 12-3.0/alpine3.18/Dockerfile | 137 ++++++ 12-3.0/alpine3.18/initdb-postgis.sh | 25 + 12-3.0/alpine3.18/tags | 1 + 12-3.0/alpine3.18/update-postgis.sh | 28 ++ 12-3.1/alpine3.18/Dockerfile | 137 ++++++ 12-3.1/alpine3.18/initdb-postgis.sh | 25 + 12-3.1/alpine3.18/tags | 1 + 12-3.1/alpine3.18/update-postgis.sh | 28 ++ 12-3.2/alpine3.18/Dockerfile | 137 ++++++ 12-3.2/alpine3.18/initdb-postgis.sh | 25 + 12-3.2/alpine3.18/tags | 1 + 12-3.2/alpine3.18/update-postgis.sh | 28 ++ 12-3.3/alpine3.18/Dockerfile | 137 ++++++ 12-3.3/alpine3.18/initdb-postgis.sh | 25 + 12-3.3/alpine3.18/tags | 1 + 12-3.3/alpine3.18/update-postgis.sh | 28 ++ 13-3.0/alpine3.18/Dockerfile | 137 ++++++ 13-3.0/alpine3.18/initdb-postgis.sh | 25 + 13-3.0/alpine3.18/tags | 1 + 13-3.0/alpine3.18/update-postgis.sh | 28 ++ 13-3.1/alpine3.18/Dockerfile | 137 ++++++ 13-3.1/alpine3.18/initdb-postgis.sh | 25 + 13-3.1/alpine3.18/tags | 1 + 13-3.1/alpine3.18/update-postgis.sh | 28 ++ 13-3.2/alpine3.18/Dockerfile | 137 ++++++ 13-3.2/alpine3.18/initdb-postgis.sh | 25 + 13-3.2/alpine3.18/tags | 1 + 13-3.2/alpine3.18/update-postgis.sh | 28 ++ 13-3.3/alpine3.18/Dockerfile | 137 ++++++ 13-3.3/alpine3.18/initdb-postgis.sh | 25 + 13-3.3/alpine3.18/tags | 1 + 13-3.3/alpine3.18/update-postgis.sh | 28 ++ 14-3.1/alpine3.18/Dockerfile | 137 ++++++ 14-3.1/alpine3.18/initdb-postgis.sh | 25 + 14-3.1/alpine3.18/tags | 1 + 14-3.1/alpine3.18/update-postgis.sh | 28 ++ 14-3.2/alpine3.18/Dockerfile | 137 ++++++ 14-3.2/alpine3.18/initdb-postgis.sh | 25 + 14-3.2/alpine3.18/tags | 1 + 14-3.2/alpine3.18/update-postgis.sh | 28 ++ 14-3.3/alpine3.18/Dockerfile | 137 ++++++ 14-3.3/alpine3.18/initdb-postgis.sh | 25 + 14-3.3/alpine3.18/tags | 1 + 14-3.3/alpine3.18/update-postgis.sh | 28 ++ 14-l3.1.9gcp/bookworm/Dockerfile | 592 ++++++++++++++++++++++++ 14-l3.1.9gcp/bookworm/initdb-postgis.sh | 25 + 14-l3.1.9gcp/bookworm/tags | 1 + 14-l3.1.9gcp/bookworm/update-postgis.sh | 28 ++ 15-3.2/alpine3.18/Dockerfile | 137 ++++++ 15-3.2/alpine3.18/initdb-postgis.sh | 25 + 15-3.2/alpine3.18/tags | 1 + 15-3.2/alpine3.18/update-postgis.sh | 28 ++ 15-3.3/alpine3.18/Dockerfile | 137 ++++++ 15-3.3/alpine3.18/initdb-postgis.sh | 25 + 15-3.3/alpine3.18/tags | 1 + 15-3.3/alpine3.18/update-postgis.sh | 28 ++ 15-master/bookworm/Dockerfile | 28 +- 15-recent/bookworm/Dockerfile | 12 +- 16-3.3/alpine3.18/Dockerfile | 137 ++++++ 16-3.3/alpine3.18/initdb-postgis.sh | 25 + 16-3.3/alpine3.18/tags | 1 + 16-3.3/alpine3.18/update-postgis.sh | 28 ++ 16-master/bookworm/Dockerfile | 28 +- 16-recent/bookworm/Dockerfile | 12 +- Dockerfile.master.template | 12 +- README.md | 26 +- apply-readme.sh | 8 +- locked.yml | 28 ++ manifest.sh | 210 +++++++++ versions.json | 267 ++++++++++- versions.sh | 10 + 73 files changed, 3929 insertions(+), 62 deletions(-) create mode 100644 12-3.0/alpine3.18/Dockerfile create mode 100644 12-3.0/alpine3.18/initdb-postgis.sh create mode 100644 12-3.0/alpine3.18/tags create mode 100755 12-3.0/alpine3.18/update-postgis.sh create mode 100644 12-3.1/alpine3.18/Dockerfile create mode 100644 12-3.1/alpine3.18/initdb-postgis.sh create mode 100644 12-3.1/alpine3.18/tags create mode 100755 12-3.1/alpine3.18/update-postgis.sh create mode 100644 12-3.2/alpine3.18/Dockerfile create mode 100644 12-3.2/alpine3.18/initdb-postgis.sh create mode 100644 12-3.2/alpine3.18/tags create mode 100755 12-3.2/alpine3.18/update-postgis.sh create mode 100644 12-3.3/alpine3.18/Dockerfile create mode 100644 12-3.3/alpine3.18/initdb-postgis.sh create mode 100644 12-3.3/alpine3.18/tags create mode 100755 12-3.3/alpine3.18/update-postgis.sh create mode 100644 13-3.0/alpine3.18/Dockerfile create mode 100644 13-3.0/alpine3.18/initdb-postgis.sh create mode 100644 13-3.0/alpine3.18/tags create mode 100755 13-3.0/alpine3.18/update-postgis.sh create mode 100644 13-3.1/alpine3.18/Dockerfile create mode 100644 13-3.1/alpine3.18/initdb-postgis.sh create mode 100644 13-3.1/alpine3.18/tags create mode 100755 13-3.1/alpine3.18/update-postgis.sh create mode 100644 13-3.2/alpine3.18/Dockerfile create mode 100644 13-3.2/alpine3.18/initdb-postgis.sh create mode 100644 13-3.2/alpine3.18/tags create mode 100755 13-3.2/alpine3.18/update-postgis.sh create mode 100644 13-3.3/alpine3.18/Dockerfile create mode 100644 13-3.3/alpine3.18/initdb-postgis.sh create mode 100644 13-3.3/alpine3.18/tags create mode 100755 13-3.3/alpine3.18/update-postgis.sh create mode 100644 14-3.1/alpine3.18/Dockerfile create mode 100644 14-3.1/alpine3.18/initdb-postgis.sh create mode 100644 14-3.1/alpine3.18/tags create mode 100755 14-3.1/alpine3.18/update-postgis.sh create mode 100644 14-3.2/alpine3.18/Dockerfile create mode 100644 14-3.2/alpine3.18/initdb-postgis.sh create mode 100644 14-3.2/alpine3.18/tags create mode 100755 14-3.2/alpine3.18/update-postgis.sh create mode 100644 14-3.3/alpine3.18/Dockerfile create mode 100644 14-3.3/alpine3.18/initdb-postgis.sh create mode 100644 14-3.3/alpine3.18/tags create mode 100755 14-3.3/alpine3.18/update-postgis.sh create mode 100644 14-l3.1.9gcp/bookworm/Dockerfile create mode 100644 14-l3.1.9gcp/bookworm/initdb-postgis.sh create mode 100644 14-l3.1.9gcp/bookworm/tags create mode 100755 14-l3.1.9gcp/bookworm/update-postgis.sh create mode 100644 15-3.2/alpine3.18/Dockerfile create mode 100644 15-3.2/alpine3.18/initdb-postgis.sh create mode 100644 15-3.2/alpine3.18/tags create mode 100755 15-3.2/alpine3.18/update-postgis.sh create mode 100644 15-3.3/alpine3.18/Dockerfile create mode 100644 15-3.3/alpine3.18/initdb-postgis.sh create mode 100644 15-3.3/alpine3.18/tags create mode 100755 15-3.3/alpine3.18/update-postgis.sh create mode 100644 16-3.3/alpine3.18/Dockerfile create mode 100644 16-3.3/alpine3.18/initdb-postgis.sh create mode 100644 16-3.3/alpine3.18/tags create mode 100755 16-3.3/alpine3.18/update-postgis.sh create mode 100644 locked.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 1683f386e..98f4a5026 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,18 +89,32 @@ workflows: # hence they must be generated within the bundle JOB. # #circleci-targets-start + "12-3.0-alpine3.18", + "12-3.1-alpine3.18", + "12-3.2-alpine3.18", + "12-3.3-alpine3.18", "12-3.4-alpine3.18", "12-3.4-alpine3.19", "12-3.4-bookworm", "12-3.4-bullseye", + "13-3.0-alpine3.18", + "13-3.1-alpine3.18", + "13-3.2-alpine3.18", + "13-3.3-alpine3.18", "13-3.4-alpine3.18", "13-3.4-alpine3.19", "13-3.4-bookworm", "13-3.4-bullseye", + "14-3.1-alpine3.18", + "14-3.2-alpine3.18", + "14-3.3-alpine3.18", "14-3.4-alpine3.18", "14-3.4-alpine3.19", "14-3.4-bookworm", "14-3.4-bullseye", + "14-l3.1.9gcp-bookworm", + "15-3.2-alpine3.18", + "15-3.3-alpine3.18", "15-3.4-alpine3.18", "15-3.4-alpine3.19", # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! @@ -108,6 +122,7 @@ workflows: "15-3.4-bundle0-bookworm", "15-master-bookworm", "15-recent-bookworm", + "16-3.3-alpine3.18", "16-3.4-alpine3.18", "16-3.4-alpine3.19", # --skip-- "16-3.4-bookworm", --> generated with the related bundle job! diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8edc73424..0c1ba71ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,18 +24,32 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start + - { version: "12-3.0", variant: "alpine3.18", postgres: "12", postgis: "3.0", arch: "amd64 arm64", tags: "12-3.0-alpine3.18 12-3.0.10-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.1", variant: "alpine3.18", postgres: "12", postgis: "3.1", arch: "amd64 arm64", tags: "12-3.1-alpine3.18 12-3.1.10-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.2", variant: "alpine3.18", postgres: "12", postgis: "3.2", arch: "amd64 arm64", tags: "12-3.2-alpine3.18 12-3.2.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.3", variant: "alpine3.18", postgres: "12", postgis: "3.3", arch: "amd64 arm64", tags: "12-3.3-alpine3.18 12-3.3.5-alpine3.18", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "13-3.0", variant: "alpine3.18", postgres: "13", postgis: "3.0", arch: "amd64 arm64", tags: "13-3.0-alpine3.18 13-3.0.10-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.1", variant: "alpine3.18", postgres: "13", postgis: "3.1", arch: "amd64 arm64", tags: "13-3.1-alpine3.18 13-3.1.10-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.2", variant: "alpine3.18", postgres: "13", postgis: "3.2", arch: "amd64 arm64", tags: "13-3.2-alpine3.18 13-3.2.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.3", variant: "alpine3.18", postgres: "13", postgis: "3.3", arch: "amd64 arm64", tags: "13-3.3-alpine3.18 13-3.3.5-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "14-3.1", variant: "alpine3.18", postgres: "14", postgis: "3.1", arch: "amd64 arm64", tags: "14-3.1-alpine3.18 14-3.1.10-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.2", variant: "alpine3.18", postgres: "14", postgis: "3.2", arch: "amd64 arm64", tags: "14-3.2-alpine3.18 14-3.2.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.3", variant: "alpine3.18", postgres: "14", postgis: "3.3", arch: "amd64 arm64", tags: "14-3.3-alpine3.18 14-3.3.5-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "14-l3.1.9gcp", variant: "bookworm", postgres: "14", postgis: "l3.1.9gcp", arch: "amd64 arm64", tags: "14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm", readme_group: "locked" } + - { version: "15-3.2", variant: "alpine3.18", postgres: "15", postgis: "3.2", arch: "amd64 arm64", tags: "15-3.2-alpine3.18 15-3.2.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "15-3.3", variant: "alpine3.18", postgres: "15", postgis: "3.3", arch: "amd64 arm64", tags: "15-3.3-alpine3.18 15-3.3.5-alpine3.18", readme_group: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", readme_group: "bookworm" } @@ -43,6 +57,7 @@ jobs: - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.5-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } diff --git a/12-3.0/alpine3.18/Dockerfile b/12-3.0/alpine3.18/Dockerfile new file mode 100644 index 000000000..1d08bea7b --- /dev/null +++ b/12-3.0/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.10 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=87d347295e84f33a4b76d6a5412f72b91ef90635 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.0/alpine3.18/initdb-postgis.sh b/12-3.0/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.0/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.0/alpine3.18/tags b/12-3.0/alpine3.18/tags new file mode 100644 index 000000000..d15484997 --- /dev/null +++ b/12-3.0/alpine3.18/tags @@ -0,0 +1 @@ +12-3.0-alpine3.18 12-3.0.10-alpine3.18 diff --git a/12-3.0/alpine3.18/update-postgis.sh b/12-3.0/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.0/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/12-3.1/alpine3.18/Dockerfile b/12-3.1/alpine3.18/Dockerfile new file mode 100644 index 000000000..ed3450ca8 --- /dev/null +++ b/12-3.1/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.1/alpine3.18/initdb-postgis.sh b/12-3.1/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.1/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.1/alpine3.18/tags b/12-3.1/alpine3.18/tags new file mode 100644 index 000000000..e6392c88b --- /dev/null +++ b/12-3.1/alpine3.18/tags @@ -0,0 +1 @@ +12-3.1-alpine3.18 12-3.1.10-alpine3.18 diff --git a/12-3.1/alpine3.18/update-postgis.sh b/12-3.1/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.1/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/12-3.2/alpine3.18/Dockerfile b/12-3.2/alpine3.18/Dockerfile new file mode 100644 index 000000000..a63144f1a --- /dev/null +++ b/12-3.2/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.2/alpine3.18/initdb-postgis.sh b/12-3.2/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.2/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.2/alpine3.18/tags b/12-3.2/alpine3.18/tags new file mode 100644 index 000000000..4b021af63 --- /dev/null +++ b/12-3.2/alpine3.18/tags @@ -0,0 +1 @@ +12-3.2-alpine3.18 12-3.2.6-alpine3.18 diff --git a/12-3.2/alpine3.18/update-postgis.sh b/12-3.2/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.2/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/12-3.3/alpine3.18/Dockerfile b/12-3.3/alpine3.18/Dockerfile new file mode 100644 index 000000000..b59ea5c15 --- /dev/null +++ b/12-3.3/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.3/alpine3.18/initdb-postgis.sh b/12-3.3/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.3/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.3/alpine3.18/tags b/12-3.3/alpine3.18/tags new file mode 100644 index 000000000..15f4dc75c --- /dev/null +++ b/12-3.3/alpine3.18/tags @@ -0,0 +1 @@ +12-3.3-alpine3.18 12-3.3.5-alpine3.18 diff --git a/12-3.3/alpine3.18/update-postgis.sh b/12-3.3/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.3/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.0/alpine3.18/Dockerfile b/13-3.0/alpine3.18/Dockerfile new file mode 100644 index 000000000..76778c33f --- /dev/null +++ b/13-3.0/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.10 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=87d347295e84f33a4b76d6a5412f72b91ef90635 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.0/alpine3.18/initdb-postgis.sh b/13-3.0/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.0/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.0/alpine3.18/tags b/13-3.0/alpine3.18/tags new file mode 100644 index 000000000..2ec80b1e1 --- /dev/null +++ b/13-3.0/alpine3.18/tags @@ -0,0 +1 @@ +13-3.0-alpine3.18 13-3.0.10-alpine3.18 diff --git a/13-3.0/alpine3.18/update-postgis.sh b/13-3.0/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.0/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.1/alpine3.18/Dockerfile b/13-3.1/alpine3.18/Dockerfile new file mode 100644 index 000000000..c1c031f77 --- /dev/null +++ b/13-3.1/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.1/alpine3.18/initdb-postgis.sh b/13-3.1/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.1/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.1/alpine3.18/tags b/13-3.1/alpine3.18/tags new file mode 100644 index 000000000..966d8a80c --- /dev/null +++ b/13-3.1/alpine3.18/tags @@ -0,0 +1 @@ +13-3.1-alpine3.18 13-3.1.10-alpine3.18 diff --git a/13-3.1/alpine3.18/update-postgis.sh b/13-3.1/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.1/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.2/alpine3.18/Dockerfile b/13-3.2/alpine3.18/Dockerfile new file mode 100644 index 000000000..60f125a82 --- /dev/null +++ b/13-3.2/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.2/alpine3.18/initdb-postgis.sh b/13-3.2/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.2/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.2/alpine3.18/tags b/13-3.2/alpine3.18/tags new file mode 100644 index 000000000..f5e30c2f1 --- /dev/null +++ b/13-3.2/alpine3.18/tags @@ -0,0 +1 @@ +13-3.2-alpine3.18 13-3.2.6-alpine3.18 diff --git a/13-3.2/alpine3.18/update-postgis.sh b/13-3.2/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.2/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.3/alpine3.18/Dockerfile b/13-3.3/alpine3.18/Dockerfile new file mode 100644 index 000000000..c6d9bf214 --- /dev/null +++ b/13-3.3/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.3/alpine3.18/initdb-postgis.sh b/13-3.3/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.3/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.3/alpine3.18/tags b/13-3.3/alpine3.18/tags new file mode 100644 index 000000000..707885b1e --- /dev/null +++ b/13-3.3/alpine3.18/tags @@ -0,0 +1 @@ +13-3.3-alpine3.18 13-3.3.5-alpine3.18 diff --git a/13-3.3/alpine3.18/update-postgis.sh b/13-3.3/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.3/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.1/alpine3.18/Dockerfile b/14-3.1/alpine3.18/Dockerfile new file mode 100644 index 000000000..2b61027c3 --- /dev/null +++ b/14-3.1/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.1/alpine3.18/initdb-postgis.sh b/14-3.1/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.1/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.1/alpine3.18/tags b/14-3.1/alpine3.18/tags new file mode 100644 index 000000000..5fd1f4873 --- /dev/null +++ b/14-3.1/alpine3.18/tags @@ -0,0 +1 @@ +14-3.1-alpine3.18 14-3.1.10-alpine3.18 diff --git a/14-3.1/alpine3.18/update-postgis.sh b/14-3.1/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.1/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.2/alpine3.18/Dockerfile b/14-3.2/alpine3.18/Dockerfile new file mode 100644 index 000000000..9c1f016fd --- /dev/null +++ b/14-3.2/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.2/alpine3.18/initdb-postgis.sh b/14-3.2/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.2/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.2/alpine3.18/tags b/14-3.2/alpine3.18/tags new file mode 100644 index 000000000..81d62eb6d --- /dev/null +++ b/14-3.2/alpine3.18/tags @@ -0,0 +1 @@ +14-3.2-alpine3.18 14-3.2.6-alpine3.18 diff --git a/14-3.2/alpine3.18/update-postgis.sh b/14-3.2/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.2/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.3/alpine3.18/Dockerfile b/14-3.3/alpine3.18/Dockerfile new file mode 100644 index 000000000..799d2a68c --- /dev/null +++ b/14-3.3/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.3/alpine3.18/initdb-postgis.sh b/14-3.3/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.3/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.3/alpine3.18/tags b/14-3.3/alpine3.18/tags new file mode 100644 index 000000000..95c7673a6 --- /dev/null +++ b/14-3.3/alpine3.18/tags @@ -0,0 +1 @@ +14-3.3-alpine3.18 14-3.3.5-alpine3.18 diff --git a/14-3.3/alpine3.18/update-postgis.sh b/14-3.3/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.3/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile new file mode 100644 index 000000000..b9fe27ae9 --- /dev/null +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -0,0 +1,592 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:14-bookworm + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.9 +ARG PGIS1_GEOS_CHECKOUT=tags/3.6.6 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.6.4 +ARG PGIS1_PROJ_CHECKOUT=tags/6.3.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=95a641b1747721d7004c5f0133b918d034035319 +ARG PGIS1_GEOS_CHECKOUT_SHA1=36ea3034fb8719a639a7e7727e54ec8ab2e8a196 +ARG PGIS1_GDAL_CHECKOUT_SHA1=7ca88116f5a46d429251361634eb24629f315076 +ARG PGIS1_PROJ_CHECKOUT_SHA1=0e993d9744ecaa2f146bf62c43aecc61809a43ef +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 +ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f + +ARG PGIS1_BOOST_VERSION=1.74.0 + +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libkml-dev \ + liblz4-dev \ + liblzma-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 + # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_GEOTIFF=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 14-l3.1.9gcp spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # gdal+ + libblosc1 \ + libcfitsio10 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + netcdf-bin \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/14-l3.1.9gcp/bookworm/initdb-postgis.sh b/14-l3.1.9gcp/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-l3.1.9gcp/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-l3.1.9gcp/bookworm/tags b/14-l3.1.9gcp/bookworm/tags new file mode 100644 index 000000000..43c6f2788 --- /dev/null +++ b/14-l3.1.9gcp/bookworm/tags @@ -0,0 +1 @@ +14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm diff --git a/14-l3.1.9gcp/bookworm/update-postgis.sh b/14-l3.1.9gcp/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-l3.1.9gcp/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.2/alpine3.18/Dockerfile b/15-3.2/alpine3.18/Dockerfile new file mode 100644 index 000000000..66899a21a --- /dev/null +++ b/15-3.2/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.2/alpine3.18/initdb-postgis.sh b/15-3.2/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.2/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.2/alpine3.18/tags b/15-3.2/alpine3.18/tags new file mode 100644 index 000000000..515454787 --- /dev/null +++ b/15-3.2/alpine3.18/tags @@ -0,0 +1 @@ +15-3.2-alpine3.18 15-3.2.6-alpine3.18 diff --git a/15-3.2/alpine3.18/update-postgis.sh b/15-3.2/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.2/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.3/alpine3.18/Dockerfile b/15-3.3/alpine3.18/Dockerfile new file mode 100644 index 000000000..de2082fda --- /dev/null +++ b/15-3.3/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.3/alpine3.18/initdb-postgis.sh b/15-3.3/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.3/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.3/alpine3.18/tags b/15-3.3/alpine3.18/tags new file mode 100644 index 000000000..c22a57da1 --- /dev/null +++ b/15-3.3/alpine3.18/tags @@ -0,0 +1 @@ +15-3.3-alpine3.18 15-3.3.5-alpine3.18 diff --git a/15-3.3/alpine3.18/update-postgis.sh b/15-3.3/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.3/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index b2e97c624..b827db6f6 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=81381c6e5d313d6888bd3a880ddaef99783a0062 +ARG PGIS1_POSTGIS_CHECKOUT=77bede5e744a56569e63b0a22290a28518115a3d ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT=5920e2998318189970c0fe1e2db60f643515b9ea +ARG PGIS1_GDAL_CHECKOUT=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 +ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=81381c6e5d313d6888bd3a880ddaef99783a0062 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77bede5e744a56569e63b0a22290a28518115a3d ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT_SHA1=5920e2998318189970c0fe1e2db60f643515b9ea +ARG PGIS1_GDAL_CHECKOUT_SHA1=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 +ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 ARG PGIS1_BOOST_VERSION=1.74.0 @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ @@ -501,10 +501,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ # regress check && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 0cbe761f1..7581e4762 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ @@ -501,10 +501,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ # regress check && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ diff --git a/16-3.3/alpine3.18/Dockerfile b/16-3.3/alpine3.18/Dockerfile new file mode 100644 index 000000000..3232f51de --- /dev/null +++ b/16-3.3/alpine3.18/Dockerfile @@ -0,0 +1,137 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pcre2-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre2 \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.3/alpine3.18/initdb-postgis.sh b/16-3.3/alpine3.18/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.3/alpine3.18/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.3/alpine3.18/tags b/16-3.3/alpine3.18/tags new file mode 100644 index 000000000..3152676ae --- /dev/null +++ b/16-3.3/alpine3.18/tags @@ -0,0 +1 @@ +16-3.3-alpine3.18 16-3.3.5-alpine3.18 diff --git a/16-3.3/alpine3.18/update-postgis.sh b/16-3.3/alpine3.18/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.3/alpine3.18/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 25230aa3c..a0fd6c945 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=81381c6e5d313d6888bd3a880ddaef99783a0062 +ARG PGIS1_POSTGIS_CHECKOUT=77bede5e744a56569e63b0a22290a28518115a3d ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT=5920e2998318189970c0fe1e2db60f643515b9ea +ARG PGIS1_GDAL_CHECKOUT=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 +ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=81381c6e5d313d6888bd3a880ddaef99783a0062 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77bede5e744a56569e63b0a22290a28518115a3d ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=527b897e632fc83457c9cf0c6a8221a48519c23c -ARG PGIS1_PROJ_CHECKOUT_SHA1=5920e2998318189970c0fe1e2db60f643515b9ea +ARG PGIS1_GDAL_CHECKOUT_SHA1=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=11fc1943fbc75135d3ec5776cebab1f4aaa43fb6 +ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 ARG PGIS1_BOOST_VERSION=1.74.0 @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ @@ -501,10 +501,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ # regress check && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index b4950b0a8..6963e6fb7 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -281,7 +281,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ @@ -501,10 +501,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ # regress check && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index fa6e876db..928950aca 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -280,7 +280,7 @@ RUN set -eux \ set -eux \ && mkdir build \ && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ @@ -508,10 +508,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ # regress check && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ diff --git a/README.md b/README.md index ccd19b1c3..4bf977dd5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-23) +## Versions (2024-01-28) We provide multi-platform image support for the following architectures: @@ -122,10 +122,24 @@ Please note that the included package list is subject to change as we continue t | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.10 | +| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.10 | +| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.6 | +| [`12-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.18), [`12-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.3.5 | | [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | +| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.10 | +| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.10 | +| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.6 | +| [`13-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.18), [`13-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.3.5 | | [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | +| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.10 | +| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.6 | +| [`14-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.18), [`14-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.3.5 | | [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | +| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.6 | +| [`15-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.18), [`15-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.3.5 | | [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.1 | +| [`16-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.18), [`16-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.3.5 | | [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.1 | @@ -145,6 +159,16 @@ Please note that the included package list is subject to change as we continue t | [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.19), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.1 | +### 🧪Locked ( experimental ) + +* Locked old postgis versions for testing. + + +| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | null | + + ### 📋Test images - We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. diff --git a/apply-readme.sh b/apply-readme.sh index 0fddbeecd..e86978718 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -10,7 +10,7 @@ versions=$(jq 'keys[]' "$input_file") distinct_variants=$(jq -r 'to_entries[] | .value | keys[]' "$input_file" | sort -u) rm -f _dockerlists_*.md -for readme_group in $distinct_variants recent bundle0 test; do +for readme_group in $distinct_variants recent locked bundle0 test; do echo "init _dockerlists_${readme_group}.md" echo "| \`$dockername:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md echo "| ---- | :-: | :-: | :-: | :-: | :-: |" >>_dockerlists_"${readme_group}".md @@ -31,7 +31,7 @@ for version in $versions; do if [[ "$postgis" == "master" ]]; then POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal, cgal, sfcgal" - elif [[ "$postgis" == "recent" ]]; then + elif [[ "$postgis" == "recent" || "$postgis" == "locked" ]]; then POSTGIS_TAG=$(jq -r ".\"$version\".\"$variant\".POSTGIS_CHECKOUT" "$input_file") PROJ_TAG=$(jq -r ".\"$version\".\"$variant\".PROJ_CHECKOUT" "$input_file") @@ -62,7 +62,7 @@ echo "|-------------------------|" echo "|- Generated images -|" echo "|-------------------------|" -for readme_group in $distinct_variants recent bundle0 test; do +for readme_group in $distinct_variants recent locked bundle0 test; do echo " " echo "---- ${readme_group} ----" cat _dockerlists_"${readme_group}".md @@ -73,7 +73,7 @@ done TODAY=$(date +%Y-%m-%d) sed -i -r "s/(## Versions) \([0-9]{4}-[0-9]{2}-[0-9]{2}\)/\1 ($TODAY)/g" README.md # Replace content between the special comments in README.md for each readme_group -for readme_group in $distinct_variants recent bundle0 test; do +for readme_group in $distinct_variants recent locked bundle0 test; do echo "## ${readme_group} ##" awk -v readme_group="$readme_group" -v content="$(<_dockerlists_"${readme_group}".md)" ' $0 ~ "" {print; print content; f=1; next} diff --git a/locked.yml b/locked.yml new file mode 100644 index 000000000..5d1be1ef2 --- /dev/null +++ b/locked.yml @@ -0,0 +1,28 @@ + +# unique locked versions we want to build +# initialize directory with : touch 14-l3.1.9gcp/bookworm/Dockerfile +# this file will be append to version.json + +'14-l3.1.9gcp': + 'bookworm': + _comment: "source: ./locked.yml" + tags: '14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm' + postgis: 'l3.1.9gcp' + readme_group: 'locked' + PG_MAJOR: '14' + PG_DOCKER: '14' + arch: 'amd64 arm64' + template: 'Dockerfile.master.template' + POSTGIS_CHECKOUT: 'tags/3.1.9' + POSTGIS_CHECKOUT_SHA1: '95a641b1747721d7004c5f0133b918d034035319' + PROJ_CHECKOUT: 'tags/6.3.1' + PROJ_CHECKOUT_SHA1: '0e993d9744ecaa2f146bf62c43aecc61809a43ef' + GDAL_CHECKOUT: 'tags/v3.6.4' + GDAL_CHECKOUT_SHA1: '7ca88116f5a46d429251361634eb24629f315076' + GEOS_CHECKOUT: 'tags/3.6.6' + GEOS_CHECKOUT_SHA1: '36ea3034fb8719a639a7e7727e54ec8ab2e8a196' + SFCGAL_CHECKOUT: 'tags/v1.5.1' + SFCGAL_CHECKOUT_SHA1: '61f3b08ade49493b56c6bafa98c7c1f84addbc10' + CGAL_CHECKOUT: 'tags/v5.6' + CGAL_CHECKOUT_SHA1: 'de4fa0d7d57b5a997012f2804161386ff4bc0d0f' + BOOST_VERSION: '1.74.0' \ No newline at end of file diff --git a/manifest.sh b/manifest.sh index 175d42623..2f67c6672 100755 --- a/manifest.sh +++ b/manifest.sh @@ -12,6 +12,62 @@ source tools/environment_init.sh # PLEASE DO NOT EDIT IT DIRECTLY. # +# ----- 12-3.0-alpine3.18 ----- + +echo "manifest: ${dockername}:12-3.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.0-alpine3.18 \ + --target ${dockername}:12-3.0-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.0.10-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.0.10-alpine3.18 \ + --target ${dockername}:12-3.0.10-alpine3.18 || true + +# ----- 12-3.1-alpine3.18 ----- + +echo "manifest: ${dockername}:12-3.1-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.1-alpine3.18 \ + --target ${dockername}:12-3.1-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.1.10-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.1.10-alpine3.18 \ + --target ${dockername}:12-3.1.10-alpine3.18 || true + +# ----- 12-3.2-alpine3.18 ----- + +echo "manifest: ${dockername}:12-3.2-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.2-alpine3.18 \ + --target ${dockername}:12-3.2-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.2.6-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.2.6-alpine3.18 \ + --target ${dockername}:12-3.2.6-alpine3.18 || true + +# ----- 12-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:12-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.18 \ + --target ${dockername}:12-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:12-3.3.5-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.3.5-alpine3.18 \ + --target ${dockername}:12-3.3.5-alpine3.18 || true + # ----- 12-3.4-alpine3.18 ----- echo "manifest: ${dockername}:12-3.4-alpine3.18" @@ -80,6 +136,62 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.1-bullseye \ --target ${dockername}:12-3.4.1-bullseye || true +# ----- 13-3.0-alpine3.18 ----- + +echo "manifest: ${dockername}:13-3.0-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.0-alpine3.18 \ + --target ${dockername}:13-3.0-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.0.10-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.0.10-alpine3.18 \ + --target ${dockername}:13-3.0.10-alpine3.18 || true + +# ----- 13-3.1-alpine3.18 ----- + +echo "manifest: ${dockername}:13-3.1-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.1-alpine3.18 \ + --target ${dockername}:13-3.1-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.1.10-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.1.10-alpine3.18 \ + --target ${dockername}:13-3.1.10-alpine3.18 || true + +# ----- 13-3.2-alpine3.18 ----- + +echo "manifest: ${dockername}:13-3.2-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.2-alpine3.18 \ + --target ${dockername}:13-3.2-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.2.6-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.2.6-alpine3.18 \ + --target ${dockername}:13-3.2.6-alpine3.18 || true + +# ----- 13-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:13-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.18 \ + --target ${dockername}:13-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:13-3.3.5-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.3.5-alpine3.18 \ + --target ${dockername}:13-3.3.5-alpine3.18 || true + # ----- 13-3.4-alpine3.18 ----- echo "manifest: ${dockername}:13-3.4-alpine3.18" @@ -148,6 +260,48 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.1-bullseye \ --target ${dockername}:13-3.4.1-bullseye || true +# ----- 14-3.1-alpine3.18 ----- + +echo "manifest: ${dockername}:14-3.1-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.1-alpine3.18 \ + --target ${dockername}:14-3.1-alpine3.18 || true + +echo "manifest: ${dockername}:14-3.1.10-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.1.10-alpine3.18 \ + --target ${dockername}:14-3.1.10-alpine3.18 || true + +# ----- 14-3.2-alpine3.18 ----- + +echo "manifest: ${dockername}:14-3.2-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.2-alpine3.18 \ + --target ${dockername}:14-3.2-alpine3.18 || true + +echo "manifest: ${dockername}:14-3.2.6-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.2.6-alpine3.18 \ + --target ${dockername}:14-3.2.6-alpine3.18 || true + +# ----- 14-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:14-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.18 \ + --target ${dockername}:14-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:14-3.3.5-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.3.5-alpine3.18 \ + --target ${dockername}:14-3.3.5-alpine3.18 || true + # ----- 14-3.4-alpine3.18 ----- echo "manifest: ${dockername}:14-3.4-alpine3.18" @@ -216,6 +370,48 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.1-bullseye \ --target ${dockername}:14-3.4.1-bullseye || true +# ----- 14-l3.1.9gcp-bookworm ----- + +echo "manifest: ${dockername}:14-l3.1.9gcp-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-l3.1.9gcp-bookworm \ + --target ${dockername}:14-l3.1.9gcp-bookworm || true + +echo "manifest: ${dockername}:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm \ + --target ${dockername}:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm || true + +# ----- 15-3.2-alpine3.18 ----- + +echo "manifest: ${dockername}:15-3.2-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.2-alpine3.18 \ + --target ${dockername}:15-3.2-alpine3.18 || true + +echo "manifest: ${dockername}:15-3.2.6-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.2.6-alpine3.18 \ + --target ${dockername}:15-3.2.6-alpine3.18 || true + +# ----- 15-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:15-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.18 \ + --target ${dockername}:15-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:15-3.3.5-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.3.5-alpine3.18 \ + --target ${dockername}:15-3.3.5-alpine3.18 || true + # ----- 15-3.4-alpine3.18 ----- echo "manifest: ${dockername}:15-3.4-alpine3.18" @@ -344,6 +540,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent \ --target ${dockername}:15-recent || true +# ----- 16-3.3-alpine3.18 ----- + +echo "manifest: ${dockername}:16-3.3-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.18 \ + --target ${dockername}:16-3.3-alpine3.18 || true + +echo "manifest: ${dockername}:16-3.3.5-alpine3.18" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.3.5-alpine3.18 \ + --target ${dockername}:16-3.3.5-alpine3.18 || true + # ----- 16-3.4-alpine3.18 ----- echo "manifest: ${dockername}:16-3.4-alpine3.18" diff --git a/versions.json b/versions.json index 4729374a6..d6015a68d 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,64 @@ { + "12-3.0": { + "alpine3.18": { + "tags": "12-3.0-alpine3.18 12-3.0.10-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.0", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.0.10", + "POSTGIS_SHA256": "1823741d04f50a5aa0a4660df671ae0aae407d44eb680c7e3e8b40aef8b1a238", + "POSTGIS_CHECKOUT": "tags/3.0.10", + "POSTGIS_CHECKOUT_SHA1": "87d347295e84f33a4b76d6a5412f72b91ef90635" + } + }, + "12-3.1": { + "alpine3.18": { + "tags": "12-3.1-alpine3.18 12-3.1.10-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.1.10", + "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", + "POSTGIS_CHECKOUT": "tags/3.1.10", + "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + } + }, + "12-3.2": { + "alpine3.18": { + "tags": "12-3.2-alpine3.18 12-3.2.6-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.2", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.2.6", + "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", + "POSTGIS_CHECKOUT": "tags/3.2.6", + "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + } + }, + "12-3.3": { + "alpine3.18": { + "tags": "12-3.3-alpine3.18 12-3.3.5-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + } + }, "12-3.4": { "bullseye": { "tags": "12-3.4-bullseye 12-3.4.1-bullseye", @@ -49,6 +109,66 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, + "13-3.0": { + "alpine3.18": { + "tags": "13-3.0-alpine3.18 13-3.0.10-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.0", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.0.10", + "POSTGIS_SHA256": "1823741d04f50a5aa0a4660df671ae0aae407d44eb680c7e3e8b40aef8b1a238", + "POSTGIS_CHECKOUT": "tags/3.0.10", + "POSTGIS_CHECKOUT_SHA1": "87d347295e84f33a4b76d6a5412f72b91ef90635" + } + }, + "13-3.1": { + "alpine3.18": { + "tags": "13-3.1-alpine3.18 13-3.1.10-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.1.10", + "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", + "POSTGIS_CHECKOUT": "tags/3.1.10", + "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + } + }, + "13-3.2": { + "alpine3.18": { + "tags": "13-3.2-alpine3.18 13-3.2.6-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.2", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.2.6", + "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", + "POSTGIS_CHECKOUT": "tags/3.2.6", + "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + } + }, + "13-3.3": { + "alpine3.18": { + "tags": "13-3.3-alpine3.18 13-3.3.5-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + } + }, "13-3.4": { "bullseye": { "tags": "13-3.4-bullseye 13-3.4.1-bullseye", @@ -99,6 +219,51 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, + "14-3.1": { + "alpine3.18": { + "tags": "14-3.1-alpine3.18 14-3.1.10-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.1.10", + "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", + "POSTGIS_CHECKOUT": "tags/3.1.10", + "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + } + }, + "14-3.2": { + "alpine3.18": { + "tags": "14-3.2-alpine3.18 14-3.2.6-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.2", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.2.6", + "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", + "POSTGIS_CHECKOUT": "tags/3.2.6", + "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + } + }, + "14-3.3": { + "alpine3.18": { + "tags": "14-3.3-alpine3.18 14-3.3.5-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + } + }, "14-3.4": { "bullseye": { "tags": "14-3.4-bullseye 14-3.4.1-bullseye", @@ -149,6 +314,36 @@ "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" } }, + "15-3.2": { + "alpine3.18": { + "tags": "15-3.2-alpine3.18 15-3.2.6-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.2", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.2.6", + "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", + "POSTGIS_CHECKOUT": "tags/3.2.6", + "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + } + }, + "15-3.3": { + "alpine3.18": { + "tags": "15-3.3-alpine3.18 15-3.3.5-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + } + }, "15-3.4": { "bullseye": { "tags": "15-3.4-bullseye 15-3.4.1-bullseye", @@ -231,16 +426,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "81381c6e5d313d6888bd3a880ddaef99783a0062", - "POSTGIS_CHECKOUT_SHA1": "81381c6e5d313d6888bd3a880ddaef99783a0062", - "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", - "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", + "POSTGIS_CHECKOUT": "77bede5e744a56569e63b0a22290a28518115a3d", + "POSTGIS_CHECKOUT_SHA1": "77bede5e744a56569e63b0a22290a28518115a3d", + "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", + "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "5920e2998318189970c0fe1e2db60f643515b9ea", - "PROJ_CHECKOUT_SHA1": "5920e2998318189970c0fe1e2db60f643515b9ea", - "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", - "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", + "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", + "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", + "GDAL_CHECKOUT": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", + "GDAL_CHECKOUT_SHA1": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -270,6 +465,21 @@ "BOOST_VERSION": "1.74.0" } }, + "16-3.3": { + "alpine3.18": { + "tags": "16-3.3-alpine3.18 16-3.3.5-alpine3.18", + "readme_group": "alpine3.18", + "postgis": "3.3", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "POSTGIS_VERSION": "3.3.5", + "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", + "POSTGIS_CHECKOUT": "tags/3.3.5", + "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + } + }, "16-3.4": { "bullseye": { "tags": "16-3.4-bullseye 16-3.4.1-bullseye", @@ -352,16 +562,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "81381c6e5d313d6888bd3a880ddaef99783a0062", - "POSTGIS_CHECKOUT_SHA1": "81381c6e5d313d6888bd3a880ddaef99783a0062", - "CGAL_CHECKOUT": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", - "CGAL_CHECKOUT_SHA1": "11fc1943fbc75135d3ec5776cebab1f4aaa43fb6", + "POSTGIS_CHECKOUT": "77bede5e744a56569e63b0a22290a28518115a3d", + "POSTGIS_CHECKOUT_SHA1": "77bede5e744a56569e63b0a22290a28518115a3d", + "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", + "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "5920e2998318189970c0fe1e2db60f643515b9ea", - "PROJ_CHECKOUT_SHA1": "5920e2998318189970c0fe1e2db60f643515b9ea", - "GDAL_CHECKOUT": "527b897e632fc83457c9cf0c6a8221a48519c23c", - "GDAL_CHECKOUT_SHA1": "527b897e632fc83457c9cf0c6a8221a48519c23c", + "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", + "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", + "GDAL_CHECKOUT": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", + "GDAL_CHECKOUT_SHA1": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -390,5 +600,30 @@ "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" } + }, + "14-l3.1.9gcp": { + "bookworm": { + "_comment": "source: ./locked.yml", + "tags": "14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm", + "postgis": "l3.1.9gcp", + "readme_group": "locked", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "POSTGIS_CHECKOUT": "tags/3.1.9", + "POSTGIS_CHECKOUT_SHA1": "95a641b1747721d7004c5f0133b918d034035319", + "PROJ_CHECKOUT": "tags/6.3.1", + "PROJ_CHECKOUT_SHA1": "0e993d9744ecaa2f146bf62c43aecc61809a43ef", + "GDAL_CHECKOUT": "tags/v3.6.4", + "GDAL_CHECKOUT_SHA1": "7ca88116f5a46d429251361634eb24629f315076", + "GEOS_CHECKOUT": "tags/3.6.6", + "GEOS_CHECKOUT_SHA1": "36ea3034fb8719a639a7e7727e54ec8ab2e8a196", + "SFCGAL_CHECKOUT": "tags/v1.5.1", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "CGAL_CHECKOUT": "tags/v5.6", + "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", + "BOOST_VERSION": "1.74.0" + } } } diff --git a/versions.sh b/versions.sh index 11b37a6d6..6372cce72 100755 --- a/versions.sh +++ b/versions.sh @@ -396,6 +396,13 @@ for version in "${versions[@]}"; do fi echo " " + # if the first letter of "postgisVersion" is "l" then + # the version is locked and we use the definition from locked.yml + if [[ "${postgisVersion:0:1}" == "l" ]]; then + echo " ---> locked ; definition from locked.yml !" + continue + fi + if [[ "master" == "$postgisVersion" || "recent" == "$postgisVersion" ]]; then srcVersion="" srcSha256="" @@ -703,6 +710,9 @@ for version in "${versions[@]}"; do done done +# add locked configurations to _versions.yml file +cat locked.yml >> _versions.yml + # convert yaml to json yaml2json_pretty <./_versions.yml >./_versions.json From 7ece984efed02dad2bde7647970478ae0f2da82d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 29 Jan 2024 01:58:34 +0100 Subject: [PATCH 056/167] fix - alpine template --- 12-3.0/alpine3.18/Dockerfile | 3 +-- 12-3.1/alpine3.18/Dockerfile | 3 +-- 12-3.2/alpine3.18/Dockerfile | 3 +-- 13-3.0/alpine3.18/Dockerfile | 3 +-- 13-3.1/alpine3.18/Dockerfile | 3 +-- 13-3.2/alpine3.18/Dockerfile | 3 +-- 14-3.1/alpine3.18/Dockerfile | 3 +-- 14-3.2/alpine3.18/Dockerfile | 3 +-- 15-3.2/alpine3.18/Dockerfile | 3 +-- Dockerfile.alpine.template | 4 ++++ README.md | 2 +- 11 files changed, 14 insertions(+), 19 deletions(-) diff --git a/12-3.0/alpine3.18/Dockerfile b/12-3.0/alpine3.18/Dockerfile index 1d08bea7b..f6468f792 100644 --- a/12-3.0/alpine3.18/Dockerfile +++ b/12-3.0/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/12-3.1/alpine3.18/Dockerfile b/12-3.1/alpine3.18/Dockerfile index ed3450ca8..f80575bfe 100644 --- a/12-3.1/alpine3.18/Dockerfile +++ b/12-3.1/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/12-3.2/alpine3.18/Dockerfile b/12-3.2/alpine3.18/Dockerfile index a63144f1a..d321a7a91 100644 --- a/12-3.2/alpine3.18/Dockerfile +++ b/12-3.2/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/13-3.0/alpine3.18/Dockerfile b/13-3.0/alpine3.18/Dockerfile index 76778c33f..87e57ee4e 100644 --- a/13-3.0/alpine3.18/Dockerfile +++ b/13-3.0/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/13-3.1/alpine3.18/Dockerfile b/13-3.1/alpine3.18/Dockerfile index c1c031f77..cd3407f9c 100644 --- a/13-3.1/alpine3.18/Dockerfile +++ b/13-3.1/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/13-3.2/alpine3.18/Dockerfile b/13-3.2/alpine3.18/Dockerfile index 60f125a82..5e663873a 100644 --- a/13-3.2/alpine3.18/Dockerfile +++ b/13-3.2/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/14-3.1/alpine3.18/Dockerfile b/14-3.1/alpine3.18/Dockerfile index 2b61027c3..97bf4d594 100644 --- a/14-3.1/alpine3.18/Dockerfile +++ b/14-3.1/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/14-3.2/alpine3.18/Dockerfile b/14-3.2/alpine3.18/Dockerfile index 9c1f016fd..f43d11ff3 100644 --- a/14-3.2/alpine3.18/Dockerfile +++ b/14-3.2/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/15-3.2/alpine3.18/Dockerfile b/15-3.2/alpine3.18/Dockerfile index 66899a21a..3ec932344 100644 --- a/15-3.2/alpine3.18/Dockerfile +++ b/15-3.2/alpine3.18/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + # This is an older postgis versions; and we don't check the address_standardizer extension. && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index d53819a57..f9ac6972c 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -86,8 +86,12 @@ RUN set -eux \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ +{{ if (env.version | endswith("3.0")) or (env.version | endswith("3.1")) or (env.version | endswith("3.2")) then ( -}} + # This is an older postgis versions; and we don't check the address_standardizer extension. +{{ ) else ( -}} && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ +{{ ) end -}} && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ diff --git a/README.md b/README.md index 4bf977dd5..3bacae874 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-28) +## Versions (2024-01-29) We provide multi-platform image support for the following architectures: From 294fda3823bb1bc70d5c90bb3d1cd461e83f3f21 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 29 Jan 2024 12:48:43 +0100 Subject: [PATCH 057/167] fix alpine; update --- 12-3.0/alpine3.18/Dockerfile | 12 ++++++++---- 12-3.1/alpine3.18/Dockerfile | 12 ++++++++---- 12-3.2/alpine3.18/Dockerfile | 12 ++++++++---- 12-3.3/alpine3.18/Dockerfile | 9 ++++++--- 12-3.4/alpine3.18/Dockerfile | 9 ++++++--- 12-3.4/alpine3.19/Dockerfile | 9 ++++++--- 13-3.0/alpine3.18/Dockerfile | 12 ++++++++---- 13-3.1/alpine3.18/Dockerfile | 12 ++++++++---- 13-3.2/alpine3.18/Dockerfile | 12 ++++++++---- 13-3.3/alpine3.18/Dockerfile | 9 ++++++--- 13-3.4/alpine3.18/Dockerfile | 9 ++++++--- 13-3.4/alpine3.19/Dockerfile | 9 ++++++--- 14-3.1/alpine3.18/Dockerfile | 12 ++++++++---- 14-3.2/alpine3.18/Dockerfile | 12 ++++++++---- 14-3.3/alpine3.18/Dockerfile | 9 ++++++--- 14-3.4/alpine3.18/Dockerfile | 9 ++++++--- 14-3.4/alpine3.19/Dockerfile | 9 ++++++--- 15-3.2/alpine3.18/Dockerfile | 12 ++++++++---- 15-3.3/alpine3.18/Dockerfile | 9 ++++++--- 15-3.4/alpine3.18/Dockerfile | 9 ++++++--- 15-3.4/alpine3.19/Dockerfile | 9 ++++++--- 15-master/bookworm/Dockerfile | 8 ++++---- 16-3.3/alpine3.18/Dockerfile | 9 ++++++--- 16-3.4/alpine3.18/Dockerfile | 9 ++++++--- 16-3.4/alpine3.19/Dockerfile | 9 ++++++--- 16-master/bookworm/Dockerfile | 8 ++++---- Dockerfile.alpine.template | 13 ++++++------- versions.json | 16 ++++++++-------- 28 files changed, 184 insertions(+), 104 deletions(-) diff --git a/12-3.0/alpine3.18/Dockerfile b/12-3.0/alpine3.18/Dockerfile index f6468f792..753bc1b39 100644 --- a/12-3.0/alpine3.18/Dockerfile +++ b/12-3.0/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/12-3.1/alpine3.18/Dockerfile b/12-3.1/alpine3.18/Dockerfile index f80575bfe..6eb6cc424 100644 --- a/12-3.1/alpine3.18/Dockerfile +++ b/12-3.1/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/12-3.2/alpine3.18/Dockerfile b/12-3.2/alpine3.18/Dockerfile index d321a7a91..f19e19ae9 100644 --- a/12-3.2/alpine3.18/Dockerfile +++ b/12-3.2/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/12-3.3/alpine3.18/Dockerfile b/12-3.3/alpine3.18/Dockerfile index b59ea5c15..dbc24ff3d 100644 --- a/12-3.3/alpine3.18/Dockerfile +++ b/12-3.3/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index e87ecdfa9..dc20d855c 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index b25908fe2..f3bd7d14d 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.0/alpine3.18/Dockerfile b/13-3.0/alpine3.18/Dockerfile index 87e57ee4e..00284e74b 100644 --- a/13-3.0/alpine3.18/Dockerfile +++ b/13-3.0/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.1/alpine3.18/Dockerfile b/13-3.1/alpine3.18/Dockerfile index cd3407f9c..4df9baa03 100644 --- a/13-3.1/alpine3.18/Dockerfile +++ b/13-3.1/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.2/alpine3.18/Dockerfile b/13-3.2/alpine3.18/Dockerfile index 5e663873a..84a58873e 100644 --- a/13-3.2/alpine3.18/Dockerfile +++ b/13-3.2/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.3/alpine3.18/Dockerfile b/13-3.3/alpine3.18/Dockerfile index c6d9bf214..1c8b88455 100644 --- a/13-3.3/alpine3.18/Dockerfile +++ b/13-3.3/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index 3dfe4940d..632cc48c7 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index c5ed2de90..cb05e3428 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/14-3.1/alpine3.18/Dockerfile b/14-3.1/alpine3.18/Dockerfile index 97bf4d594..2fe3d4d60 100644 --- a/14-3.1/alpine3.18/Dockerfile +++ b/14-3.1/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/14-3.2/alpine3.18/Dockerfile b/14-3.2/alpine3.18/Dockerfile index f43d11ff3..044d4433e 100644 --- a/14-3.2/alpine3.18/Dockerfile +++ b/14-3.2/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/14-3.3/alpine3.18/Dockerfile b/14-3.3/alpine3.18/Dockerfile index 799d2a68c..f8faedda9 100644 --- a/14-3.3/alpine3.18/Dockerfile +++ b/14-3.3/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 6f8b4b3f7..d9ad38ed5 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 8707555b7..2eb4ea31b 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/15-3.2/alpine3.18/Dockerfile b/15-3.2/alpine3.18/Dockerfile index 3ec932344..aa5cf9c7d 100644 --- a/15-3.2/alpine3.18/Dockerfile +++ b/15-3.2/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,13 +88,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - # This is an older postgis versions; and we don't check the address_standardizer extension. + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/15-3.3/alpine3.18/Dockerfile b/15-3.3/alpine3.18/Dockerfile index de2082fda..82b544e86 100644 --- a/15-3.3/alpine3.18/Dockerfile +++ b/15-3.3/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 65e93f0f8..47b7a5365 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index 842d5cc35..f151b4557 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index b827db6f6..2a299dc38 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=77bede5e744a56569e63b0a22290a28518115a3d +ARG PGIS1_POSTGIS_CHECKOUT=77c04eddfffef86d6ae4c3b78bdb9471c021c562 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_GDAL_CHECKOUT=e826cc1ccd0ddb737245371d3a528609d2d08e7f ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77bede5e744a56569e63b0a22290a28518115a3d +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77c04eddfffef86d6ae4c3b78bdb9471c021c562 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_GDAL_CHECKOUT_SHA1=e826cc1ccd0ddb737245371d3a528609d2d08e7f ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 diff --git a/16-3.3/alpine3.18/Dockerfile b/16-3.3/alpine3.18/Dockerfile index 3232f51de..fdcf228d5 100644 --- a/16-3.3/alpine3.18/Dockerfile +++ b/16-3.3/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index ed374cf73..d260c3bd2 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index 9a1a31833..a0bc03d14 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -48,7 +48,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -85,7 +88,7 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -113,7 +116,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a0fd6c945..6733c4833 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,16 +15,16 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=77bede5e744a56569e63b0a22290a28518115a3d +ARG PGIS1_POSTGIS_CHECKOUT=77c04eddfffef86d6ae4c3b78bdb9471c021c562 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_GDAL_CHECKOUT=e826cc1ccd0ddb737245371d3a528609d2d08e7f ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77bede5e744a56569e63b0a22290a28518115a3d +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77c04eddfffef86d6ae4c3b78bdb9471c021c562 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=a79a07ccef41519a9185a4b4cda8f469ccdf9c30 +ARG PGIS1_GDAL_CHECKOUT_SHA1=e826cc1ccd0ddb737245371d3a528609d2d08e7f ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index f9ac6972c..d24e58eca 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -43,7 +43,10 @@ RUN set -eux \ libxml2-dev \ libxml2-utils \ make \ - pcre2-dev \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ perl \ protobuf-c-dev \ \ @@ -80,18 +83,14 @@ RUN set -eux \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ -{{ if (env.version | endswith("3.0")) or (env.version | endswith("3.1")) or (env.version | endswith("3.2")) then ( -}} - # This is an older postgis versions; and we don't check the address_standardizer extension. -{{ ) else ( -}} && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ -{{ ) end -}} && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ @@ -112,7 +111,7 @@ RUN set -eux \ \ json-c \ libstdc++ \ - pcre2 \ + pcre \ protobuf-c \ \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 diff --git a/versions.json b/versions.json index d6015a68d..3bebbd4e0 100644 --- a/versions.json +++ b/versions.json @@ -426,16 +426,16 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "77bede5e744a56569e63b0a22290a28518115a3d", - "POSTGIS_CHECKOUT_SHA1": "77bede5e744a56569e63b0a22290a28518115a3d", + "POSTGIS_CHECKOUT": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", + "POSTGIS_CHECKOUT_SHA1": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "GDAL_CHECKOUT": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", - "GDAL_CHECKOUT_SHA1": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", + "GDAL_CHECKOUT": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", + "GDAL_CHECKOUT_SHA1": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -562,16 +562,16 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "77bede5e744a56569e63b0a22290a28518115a3d", - "POSTGIS_CHECKOUT_SHA1": "77bede5e744a56569e63b0a22290a28518115a3d", + "POSTGIS_CHECKOUT": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", + "POSTGIS_CHECKOUT_SHA1": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "GDAL_CHECKOUT": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", - "GDAL_CHECKOUT_SHA1": "a79a07ccef41519a9185a4b4cda8f469ccdf9c30", + "GDAL_CHECKOUT": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", + "GDAL_CHECKOUT_SHA1": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" From d0b0b410be7a838f2b1cf8453ba7ca950d379bdb Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 5 Feb 2024 11:14:45 +0100 Subject: [PATCH 058/167] small fixes,bundle update, fixing README, etc --- .dockerignore | 1 + .gitignore | 1 + 15-3.4-bundle0/bookworm/Dockerfile | 74 ++++++++++++++++++++-- 15-3.4-bundle0/bookworm/initdb-bundle0.sh | 9 +++ 15-master/bookworm/Dockerfile | 12 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 69 ++++++++++++++++++-- 16-3.4-bundle0/bookworm/initdb-bundle0.sh | 9 +++ 16-master/bookworm/Dockerfile | 12 ++-- Dockerfile.bundle0.template | 77 ++++++++++++++++++++++- README.md | 18 +++--- apply-readme.sh | 2 +- apply-templates.sh | 7 ++- initdb-bundle0.sh | 9 +++ locked.yml | 3 +- test/tests/postgis-bundle/run.sh | 13 ++++ tools/environment_init.sh | 4 ++ versions.json | 77 ++++++++++++++++++----- versions.sh | 10 +++ 18 files changed, 356 insertions(+), 51 deletions(-) create mode 100644 15-3.4-bundle0/bookworm/initdb-bundle0.sh create mode 100644 16-3.4-bundle0/bookworm/initdb-bundle0.sh create mode 100644 initdb-bundle0.sh diff --git a/.dockerignore b/.dockerignore index 6e7000d9b..6f46be0cc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,4 @@ localetest.sh apply-*.sh trivy_cache +tmp/ diff --git a/.gitignore b/.gitignore index c02e5a206..8d160c2d7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ _* .vscode/ trivy_cache +tmp/ \ No newline at end of file diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index bb161a58f..ce6d9b503 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=ce47e74d0afa2285997cb5f4b40f23da8fd4f191 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,8 +39,12 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.9.2 + FROM ${PGIS1_BASE_IMAGE} AS builder +ARG PGIS1_DUCKDB_CHECKOUT + RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ @@ -50,6 +54,7 @@ RUN set -eux \ bison \ build-essential \ cmake \ + curl \ g++ \ git \ make \ @@ -82,6 +87,21 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version FROM builder as builder-http-gzip @@ -207,14 +227,24 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase +# TODO hydradatabase version! RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ + && export COLUMNAR_O3=1 \ && ./configure \ && make -j$(nproc) \ && make install +# add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) +# TODO: add pg_quack version! +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ + && cd pg_quack \ + && make -j$(nproc) \ + && make install + # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ @@ -233,6 +263,11 @@ RUN set -eux \ && cd postgres_dba \ && rm -rf .git +RUN set -eux \ + && git clone --depth 1 https://github.com/dr-jts/pg_svg.git \ + && cd pg_svg \ + && rm -rf .git + #install: psql < /pg_svg/pg-svg-lib.sql FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm @@ -316,7 +351,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pgvector \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-pointcloud \ @@ -340,6 +375,34 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ARG PGIS1_DUCKDB_CHECKOUT +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + echo "DUCKDB_VERSION=${DUCKDB_VERSION}" && \ + echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version + +# install extensions +# https://duckdb.org/docs/extensions/overview.html +ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" +RUN for e in ${DUCKDB_EXTENSIONS} ; do \ + echo "Installing $e ..."; \ + duckdb -c "INSTALL $e;"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + done + # Install from stages COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib @@ -356,7 +419,8 @@ COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/ COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /pg_svg /pg_svg # check any missing dependencies RUN set -eux \ @@ -383,3 +447,5 @@ RUN set -eux \ # for postgres_dba Use ":dba" to see menu RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc + +COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh diff --git a/15-3.4-bundle0/bookworm/initdb-bundle0.sh b/15-3.4-bundle0/bookworm/initdb-bundle0.sh new file mode 100644 index 000000000..c3d3aa62b --- /dev/null +++ b/15-3.4-bundle0/bookworm/initdb-bundle0.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# install pg-svg-lib +"${psql[@]}" < /pg_svg/pg-svg-lib.sql diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 2a299dc38..be832658b 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=77c04eddfffef86d6ae4c3b78bdb9471c021c562 +ARG PGIS1_POSTGIS_CHECKOUT=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=e826cc1ccd0ddb737245371d3a528609d2d08e7f -ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a +ARG PGIS1_GDAL_CHECKOUT=24e151d1cb6281973714207afbbce3a59719fa6f +ARG PGIS1_PROJ_CHECKOUT=a3b225fc9e8ae4423449c2862833bf747a4573ad ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77c04eddfffef86d6ae4c3b78bdb9471c021c562 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=e826cc1ccd0ddb737245371d3a528609d2d08e7f -ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a +ARG PGIS1_GDAL_CHECKOUT_SHA1=24e151d1cb6281973714207afbbce3a59719fa6f +ARG PGIS1_PROJ_CHECKOUT_SHA1=a3b225fc9e8ae4423449c2862833bf747a4573ad ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 036bbe02d..3a1b97a67 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0-beta1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=641d0818542acbfadbfbb54b131a3af75f8dc809 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=ce47e74d0afa2285997cb5f4b40f23da8fd4f191 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,8 +39,12 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.9.2 + FROM ${PGIS1_BASE_IMAGE} AS builder +ARG PGIS1_DUCKDB_CHECKOUT + RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ @@ -50,6 +54,7 @@ RUN set -eux \ bison \ build-essential \ cmake \ + curl \ g++ \ git \ make \ @@ -82,6 +87,21 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version FROM builder as builder-http-gzip @@ -207,14 +227,19 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase +# TODO hydradatabase version! RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ + && export COLUMNAR_O3=1 \ && ./configure \ && make -j$(nproc) \ && make install +# pg_quack is not available for PG16 +# - https://github.com/hydradatabase/pg_quack/issues/3 + # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ @@ -233,6 +258,11 @@ RUN set -eux \ && cd postgres_dba \ && rm -rf .git +RUN set -eux \ + && git clone --depth 1 https://github.com/dr-jts/pg_svg.git \ + && cd pg_svg \ + && rm -rf .git + #install: psql < /pg_svg/pg-svg-lib.sql FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm @@ -316,7 +346,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pgvector \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-pointcloud \ @@ -340,6 +370,34 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ARG PGIS1_DUCKDB_CHECKOUT +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + echo "DUCKDB_VERSION=${DUCKDB_VERSION}" && \ + echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version + +# install extensions +# https://duckdb.org/docs/extensions/overview.html +ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" +RUN for e in ${DUCKDB_EXTENSIONS} ; do \ + echo "Installing $e ..."; \ + duckdb -c "INSTALL $e;"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + done + # Install from stages COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib @@ -356,7 +414,8 @@ COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/ COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /pg_svg /pg_svg # check any missing dependencies RUN set -eux \ @@ -383,3 +442,5 @@ RUN set -eux \ # for postgres_dba Use ":dba" to see menu RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc + +COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh diff --git a/16-3.4-bundle0/bookworm/initdb-bundle0.sh b/16-3.4-bundle0/bookworm/initdb-bundle0.sh new file mode 100644 index 000000000..c3d3aa62b --- /dev/null +++ b/16-3.4-bundle0/bookworm/initdb-bundle0.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# install pg-svg-lib +"${psql[@]}" < /pg_svg/pg-svg-lib.sql diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 6733c4833..9805da160 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,17 +15,17 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=77c04eddfffef86d6ae4c3b78bdb9471c021c562 +ARG PGIS1_POSTGIS_CHECKOUT=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=e826cc1ccd0ddb737245371d3a528609d2d08e7f -ARG PGIS1_PROJ_CHECKOUT=03a4ee47bffcc120815051ca6b332ac6626d821a +ARG PGIS1_GDAL_CHECKOUT=24e151d1cb6281973714207afbbce3a59719fa6f +ARG PGIS1_PROJ_CHECKOUT=a3b225fc9e8ae4423449c2862833bf747a4573ad ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=77c04eddfffef86d6ae4c3b78bdb9471c021c562 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=e826cc1ccd0ddb737245371d3a528609d2d08e7f -ARG PGIS1_PROJ_CHECKOUT_SHA1=03a4ee47bffcc120815051ca6b332ac6626d821a +ARG PGIS1_GDAL_CHECKOUT_SHA1=24e151d1cb6281973714207afbbce3a59719fa6f +ARG PGIS1_PROJ_CHECKOUT_SHA1=a3b225fc9e8ae4423449c2862833bf747a4573ad ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index b05251095..35f366570 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -34,8 +34,12 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT={{ .[env.variant].PG_HINT_PLAN_CHECKOUT }} ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1={{ .[env.variant].PG_HINT_PLAN_CHECKOUT_SHA1 }} +ARG PGIS1_DUCKDB_CHECKOUT={{ .[env.variant].DUCKDB_CHECKOUT }} + FROM ${PGIS1_BASE_IMAGE} AS builder +ARG PGIS1_DUCKDB_CHECKOUT + RUN set -eux \ && apt-get update \ && apt-get install -y --no-install-recommends \ @@ -45,6 +49,7 @@ RUN set -eux \ bison \ build-essential \ cmake \ + curl \ g++ \ git \ make \ @@ -77,6 +82,21 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version FROM builder as builder-http-gzip @@ -202,14 +222,29 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase +# TODO hydradatabase version! RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ + && export COLUMNAR_O3=1 \ && ./configure \ && make -j$(nproc) \ && make install +{{ if env.version | startswith("16") then ( -}} +# pg_quack is not available for PG16 +# - https://github.com/hydradatabase/pg_quack/issues/3 +{{ ) else ( -}} +# add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) +# TODO: add pg_quack version! +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ + && cd pg_quack \ + && make -j$(nproc) \ + && make install +{{ ) end -}} + # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ @@ -228,6 +263,11 @@ RUN set -eux \ && cd postgres_dba \ && rm -rf .git +RUN set -eux \ + && git clone --depth 1 https://github.com/dr-jts/pg_svg.git \ + && cd pg_svg \ + && rm -rf .git + #install: psql < /pg_svg/pg-svg-lib.sql FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} @@ -311,7 +351,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-pgrouting-scripts \ postgresql-$PG_MAJOR-pgsphere \ postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pgvector \ + postgresql-$PG_MAJOR-pgvector \ postgresql-$PG_MAJOR-pldebugger \ postgresql-$PG_MAJOR-plpgsql-check \ postgresql-$PG_MAJOR-pointcloud \ @@ -335,6 +375,34 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +ARG PGIS1_DUCKDB_CHECKOUT +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) && \ + DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ + echo "DUCKDB_VERSION=${DUCKDB_VERSION}" && \ + echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" && \ + case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac && \ + wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version + +# install extensions +# https://duckdb.org/docs/extensions/overview.html +ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" +RUN for e in ${DUCKDB_EXTENSIONS} ; do \ + echo "Installing $e ..."; \ + duckdb -c "INSTALL $e;"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + done + # Install from stages COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib @@ -351,7 +419,8 @@ COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/ COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib -COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /pg_svg /pg_svg # check any missing dependencies RUN set -eux \ @@ -377,4 +446,6 @@ RUN set -eux \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample # for postgres_dba Use ":dba" to see menu -RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc \ No newline at end of file +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc + +COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh \ No newline at end of file diff --git a/README.md b/README.md index 3bacae874..2a522cb8b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-01-29) +## Versions (2024-02-05) We provide multi-platform image support for the following architectures: @@ -60,7 +60,7 @@ For those new to PostGIS, we recommend the following image versions: - This version is easy to extend and has matured over time. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.1 | | [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.1 | @@ -76,7 +76,7 @@ For those new to PostGIS, we recommend the following image versions: - This version is easy to extend and has matured over time. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.1 | | [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.1 | @@ -93,7 +93,7 @@ For those new to PostGIS, we recommend the following image versions: * The specific versions of the libraries used (like postgis, geos, proj, gdal, cgal, sfcgal) can be found in the tags of the image or in the Dockerfile. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | | [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | @@ -107,7 +107,7 @@ Please note that the included package list is subject to change as we continue t -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.1 | | [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | @@ -120,7 +120,7 @@ Please note that the included package list is subject to change as we continue t - PostGIS is compiled from source, making it a bit more challenging to extend. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.10 | | [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.10 | @@ -150,7 +150,7 @@ Please note that the included package list is subject to change as we continue t - PostGIS is compiled from source, making it a bit more challenging to extend. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.19), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.1 | | [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.19), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.1 | @@ -164,7 +164,7 @@ Please note that the included package list is subject to change as we continue t * Locked old postgis versions for testing. -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | null | @@ -176,7 +176,7 @@ Please note that the included package list is subject to change as we continue t - The ~master SFCGAL version is 1.5 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). -| `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | diff --git a/apply-readme.sh b/apply-readme.sh index e86978718..91eaad21b 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -12,7 +12,7 @@ distinct_variants=$(jq -r 'to_entries[] | .value | keys[]' "$input_file" | sort rm -f _dockerlists_*.md for readme_group in $distinct_variants recent locked bundle0 test; do echo "init _dockerlists_${readme_group}.md" - echo "| \`$dockername:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md + echo "| \`$README_IMAGE_NAME:\` tags | Dockerfile | Arch | OS | Postgres | PostGIS |" >>_dockerlists_"${readme_group}".md echo "| ---- | :-: | :-: | :-: | :-: | :-: |" >>_dockerlists_"${readme_group}".md done diff --git a/apply-templates.sh b/apply-templates.sh index 5d2732d65..857346b77 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -59,11 +59,16 @@ for version; do template="$(jq -r '.[env.version][env.variant].template' versions.json)" echo " template=$template" + + initfile="$(jq -r '.[env.version][env.variant].initfile' versions.json)" + echo " initfile=$initfile" + tags="$(jq -r '.[env.version][env.variant].tags' versions.json)" echo " tags=$tags" + cp -a "$initfile" "$dir/" if [ -z "$bundleType" ]; then - cp -a initdb-postgis.sh update-postgis.sh "$dir/" + cp -a update-postgis.sh "$dir/" fi echo "$tags" >"$dir/tags" diff --git a/initdb-bundle0.sh b/initdb-bundle0.sh new file mode 100644 index 000000000..c3d3aa62b --- /dev/null +++ b/initdb-bundle0.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# install pg-svg-lib +"${psql[@]}" < /pg_svg/pg-svg-lib.sql diff --git a/locked.yml b/locked.yml index 5d1be1ef2..eddb27070 100644 --- a/locked.yml +++ b/locked.yml @@ -1,7 +1,7 @@ # unique locked versions we want to build # initialize directory with : touch 14-l3.1.9gcp/bookworm/Dockerfile -# this file will be append to version.json +# this file will be append to 'version.json' '14-l3.1.9gcp': 'bookworm': @@ -13,6 +13,7 @@ PG_DOCKER: '14' arch: 'amd64 arm64' template: 'Dockerfile.master.template' + initfile: 'initdb-postgis.sh' POSTGIS_CHECKOUT: 'tags/3.1.9' POSTGIS_CHECKOUT_SHA1: '95a641b1747721d7004c5f0133b918d034035319' PROJ_CHECKOUT: 'tags/6.3.1' diff --git a/test/tests/postgis-bundle/run.sh b/test/tests/postgis-bundle/run.sh index f39653433..6b7feb996 100755 --- a/test/tests/postgis-bundle/run.sh +++ b/test/tests/postgis-bundle/run.sh @@ -70,3 +70,16 @@ SELECT h3_get_extension_version(); SELECT mobilitydb_full_version(); SELECT pgr_full_version(); " | psql + + +imagetag=$(echo "${1}" | cut -d':' -f2) +mkdir -p ./tmp +echo " +COPY ( + SELECT + name, default_version, comment + FROM pg_available_extensions ORDER BY 1 +) TO STDOUT WITH CSV HEADER; +" | psql > ./tmp/${imagetag}__pg_available_extensions.csv + + diff --git a/tools/environment_init.sh b/tools/environment_init.sh index e7bbeef15..1657e36ea 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -35,6 +35,10 @@ else fi export IMAGE_ARCH +# create README.md image name ( no arch!) +README_IMAGE_NAME="${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}" +export README_IMAGE_NAME + # Modify IMAGE_NAME if ENABLE_IMAGE_ARCH is set to true if [[ "${ENABLE_IMAGE_ARCH:-}" == "true" ]]; then IMAGE_NAME="${IMAGE_NAME}-${IMAGE_ARCH}" diff --git a/versions.json b/versions.json index 3bebbd4e0..707ced775 100644 --- a/versions.json +++ b/versions.json @@ -6,6 +6,7 @@ "postgis": "3.0", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.0.10", @@ -21,6 +22,7 @@ "postgis": "3.1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.1.10", @@ -36,6 +38,7 @@ "postgis": "3.2", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.2.6", @@ -51,6 +54,7 @@ "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.3.5", @@ -68,6 +72,7 @@ "PG_DOCKER": "12", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, @@ -79,6 +84,7 @@ "PG_DOCKER": "12", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, @@ -88,6 +94,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.4.1", @@ -101,6 +108,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", "POSTGIS_VERSION": "3.4.1", @@ -116,6 +124,7 @@ "postgis": "3.0", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.0.10", @@ -131,6 +140,7 @@ "postgis": "3.1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.1.10", @@ -146,6 +156,7 @@ "postgis": "3.2", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.2.6", @@ -161,6 +172,7 @@ "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.3.5", @@ -178,6 +190,7 @@ "PG_DOCKER": "13", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, @@ -189,6 +202,7 @@ "PG_DOCKER": "13", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, @@ -198,6 +212,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.4.1", @@ -211,6 +226,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", "POSTGIS_VERSION": "3.4.1", @@ -226,6 +242,7 @@ "postgis": "3.1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", "POSTGIS_VERSION": "3.1.10", @@ -241,6 +258,7 @@ "postgis": "3.2", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", "POSTGIS_VERSION": "3.2.6", @@ -256,6 +274,7 @@ "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", "POSTGIS_VERSION": "3.3.5", @@ -273,6 +292,7 @@ "PG_DOCKER": "14", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, @@ -284,6 +304,7 @@ "PG_DOCKER": "14", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, @@ -293,6 +314,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", "POSTGIS_VERSION": "3.4.1", @@ -306,6 +328,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", "POSTGIS_VERSION": "3.4.1", @@ -321,6 +344,7 @@ "postgis": "3.2", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", "POSTGIS_VERSION": "3.2.6", @@ -336,6 +360,7 @@ "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", "POSTGIS_VERSION": "3.3.5", @@ -353,6 +378,7 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, @@ -364,6 +390,7 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, @@ -373,6 +400,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", "POSTGIS_VERSION": "3.4.1", @@ -386,6 +414,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", "POSTGIS_VERSION": "3.4.1", @@ -403,14 +432,17 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", - "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", + "initfile": "initdb-bundle0.sh", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc1", + "MOBILITYDB_CHECKOUT_SHA1": "ce47e74d0afa2285997cb5f4b40f23da8fd4f191", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.13.1", "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", + "DUCKDB_CHECKOUT": "tags/v0.9.2", + "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -426,16 +458,17 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", - "POSTGIS_CHECKOUT_SHA1": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", + "POSTGIS_CHECKOUT_SHA1": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "GDAL_CHECKOUT": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", - "GDAL_CHECKOUT_SHA1": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", + "PROJ_CHECKOUT": "a3b225fc9e8ae4423449c2862833bf747a4573ad", + "PROJ_CHECKOUT_SHA1": "a3b225fc9e8ae4423449c2862833bf747a4573ad", + "GDAL_CHECKOUT": "24e151d1cb6281973714207afbbce3a59719fa6f", + "GDAL_CHECKOUT_SHA1": "24e151d1cb6281973714207afbbce3a59719fa6f", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -450,6 +483,7 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", @@ -472,6 +506,7 @@ "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", "POSTGIS_VERSION": "3.3.5", @@ -489,6 +524,7 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" }, @@ -500,6 +536,7 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, @@ -509,6 +546,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", "POSTGIS_VERSION": "3.4.1", @@ -522,6 +560,7 @@ "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", "POSTGIS_VERSION": "3.4.1", @@ -539,14 +578,17 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0-beta1", - "MOBILITYDB_CHECKOUT_SHA1": "641d0818542acbfadbfbb54b131a3af75f8dc809", + "initfile": "initdb-bundle0.sh", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc1", + "MOBILITYDB_CHECKOUT_SHA1": "ce47e74d0afa2285997cb5f4b40f23da8fd4f191", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.13.1", "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", + "DUCKDB_CHECKOUT": "tags/v0.9.2", + "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -562,16 +604,17 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", - "POSTGIS_CHECKOUT_SHA1": "77c04eddfffef86d6ae4c3b78bdb9471c021c562", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", + "POSTGIS_CHECKOUT_SHA1": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "PROJ_CHECKOUT_SHA1": "03a4ee47bffcc120815051ca6b332ac6626d821a", - "GDAL_CHECKOUT": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", - "GDAL_CHECKOUT_SHA1": "e826cc1ccd0ddb737245371d3a528609d2d08e7f", + "PROJ_CHECKOUT": "a3b225fc9e8ae4423449c2862833bf747a4573ad", + "PROJ_CHECKOUT_SHA1": "a3b225fc9e8ae4423449c2862833bf747a4573ad", + "GDAL_CHECKOUT": "24e151d1cb6281973714207afbbce3a59719fa6f", + "GDAL_CHECKOUT_SHA1": "24e151d1cb6281973714207afbbce3a59719fa6f", "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", "BOOST_VERSION": "1.74.0" @@ -586,6 +629,7 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.1", "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", "PROJ_CHECKOUT": "tags/9.3.1", @@ -611,6 +655,7 @@ "PG_DOCKER": "14", "arch": "amd64 arm64", "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.1.9", "POSTGIS_CHECKOUT_SHA1": "95a641b1747721d7004c5f0133b918d034035319", "PROJ_CHECKOUT": "tags/6.3.1", diff --git a/versions.sh b/versions.sh index 6372cce72..5cdd5085f 100755 --- a/versions.sh +++ b/versions.sh @@ -246,6 +246,7 @@ get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobility get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases norepo "" get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases norepo "" get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases norepo "" +get_latest_version_and_hash "https://github.com/duckdb/duckdb" "duckdb" releases norepo "" get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases norepo "" get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" releases norepo "${CGAL_CHECKOUT_LOCK}" @@ -576,6 +577,7 @@ for version in "${versions[@]}"; do { printf " arch: '%s'\n" "amd64 arm64" printf " template: '%s'\n" "Dockerfile.master.template" + printf " initfile: '%s'\n" "initdb-postgis.sh" printf " POSTGIS_CHECKOUT: '%s'\n" "$postgisGitHash" printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$postgisGitHash" @@ -597,6 +599,7 @@ for version in "${versions[@]}"; do { printf " arch: '%s'\n" "amd64 arm64" printf " template: '%s'\n" "Dockerfile.master.template" + printf " initfile: '%s'\n" "initdb-postgis.sh" printf " POSTGIS_CHECKOUT: 'tags/%s'\n" "$lastversion_postgis" printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$lastversion_postgis_sha1" @@ -625,8 +628,11 @@ for version in "${versions[@]}"; do if [ -z "$bundleType" ]; then printf " template: '%s'\n" "Dockerfile.debian.template" + printf " initfile: '%s'\n" "initdb-postgis.sh" else printf " template: '%s'\n" "Dockerfile.${bundleType}.template" + printf " initfile: '%s'\n" "initdb-${bundleType}.sh" + printf " MOBILITYDB_CHECKOUT: 'tags/%s'\n" "$lastversion_mobilitydb" printf " MOBILITYDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_mobilitydb_sha1" @@ -639,6 +645,9 @@ for version in "${versions[@]}"; do printf " TIMESCALEDB_CHECKOUT: 'tags/%s'\n" "$lastversion_timescaledb" printf " TIMESCALEDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_timescaledb_sha1" + printf " DUCKDB_CHECKOUT: 'tags/%s'\n" "$lastversion_duckdb" + printf " DUCKDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_duckdb_sha1" + lastversion_pg_hint_plan="lastversion_pg_hint_planREL${postgresVersion}" lastversion_pg_hint_plan_sha1="lastversion_pg_hint_planREL${postgresVersion}_sha1" printf " PG_HINT_PLAN_CHECKOUT: 'tags/%s'\n" "${!lastversion_pg_hint_plan}" @@ -697,6 +706,7 @@ for version in "${versions[@]}"; do printf " postgis: '%s'\n" "${postgisDockerTag}" printf " arch: '%s'\n" "amd64 arm64" printf " template: '%s'\n" "Dockerfile.alpine.template" + printf " initfile: '%s'\n" "initdb-postgis.sh" printf " PG_MAJOR: '%s'\n" "$postgresVersion" printf " PG_DOCKER: '%s'\n" "${postgresLastMainTags[$postgresVersion]}" printf " POSTGIS_VERSION: '%s'\n" "$srcVersion" From 9e54e51d050ef18396c9a11b70a3f42befdf8411 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 5 Feb 2024 11:23:50 +0100 Subject: [PATCH 059/167] lint, formatting --- apply-readme.sh | 2 +- initdb-bundle0.sh | 2 +- test/tests/postgis-bundle/run.sh | 10 ++++------ tools/install_dive.sh | 2 +- versions.sh | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/apply-readme.sh b/apply-readme.sh index 91eaad21b..b3c6c381a 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -31,7 +31,7 @@ for version in $versions; do if [[ "$postgis" == "master" ]]; then POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal, cgal, sfcgal" - elif [[ "$postgis" == "recent" || "$postgis" == "locked" ]]; then + elif [[ "$postgis" == "recent" || "$postgis" == "locked" ]]; then POSTGIS_TAG=$(jq -r ".\"$version\".\"$variant\".POSTGIS_CHECKOUT" "$input_file") PROJ_TAG=$(jq -r ".\"$version\".\"$variant\".PROJ_CHECKOUT" "$input_file") diff --git a/initdb-bundle0.sh b/initdb-bundle0.sh index c3d3aa62b..5f2c5d116 100644 --- a/initdb-bundle0.sh +++ b/initdb-bundle0.sh @@ -6,4 +6,4 @@ set -e export PGUSER="$POSTGRES_USER" # install pg-svg-lib -"${psql[@]}" < /pg_svg/pg-svg-lib.sql +"${psql[@]}" ./tmp/${imagetag}__pg_available_extensions.csv - - +" | psql >./tmp/"${imagetag}"__pg_available_extensions.csv diff --git a/tools/install_dive.sh b/tools/install_dive.sh index 9476ac15c..44c07eeab 100755 --- a/tools/install_dive.sh +++ b/tools/install_dive.sh @@ -20,7 +20,7 @@ fi rm -f "tools/dive" rm -f "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" wget https://github.com/wagoodman/dive/releases/download/v${version}/dive_${version}_linux_${IMAGE_ARCH}.tar.gz -O tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz -echo "${checksum}"| sha256sum --check +echo "${checksum}" | sha256sum --check tar -xzf "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" -C "tools/" chmod +x "tools/dive" rm -f "tools/dive_${version}_linux_${IMAGE_ARCH}.tar.gz" diff --git a/versions.sh b/versions.sh index 5cdd5085f..db7eed9dc 100755 --- a/versions.sh +++ b/versions.sh @@ -721,7 +721,7 @@ for version in "${versions[@]}"; do done # add locked configurations to _versions.yml file -cat locked.yml >> _versions.yml +cat locked.yml >>_versions.yml # convert yaml to json yaml2json_pretty <./_versions.yml >./_versions.json From 3d2b599022d8fb10ec1c4aed9c1fbbef62e57702 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 5 Feb 2024 17:40:47 +0100 Subject: [PATCH 060/167] update ... --- 15-3.4-bundle0/bookworm/Dockerfile | 38 +++++++++-------------- 15-3.4-bundle0/bookworm/initdb-bundle0.sh | 2 +- 15-master/bookworm/Dockerfile | 4 +-- 16-3.4-bundle0/bookworm/Dockerfile | 38 +++++++++-------------- 16-3.4-bundle0/bookworm/initdb-bundle0.sh | 2 +- 16-master/bookworm/Dockerfile | 4 +-- Dockerfile.bundle0.template | 38 +++++++++-------------- versions.json | 8 ++--- 8 files changed, 52 insertions(+), 82 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index ce6d9b503..8c9ef1f1f 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -87,22 +87,6 @@ RUN set -eux \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} -RUN arch=$(uname -m) && \ - DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ - case "$arch" in \ - x86_64) \ - duck_binary="duckdb_cli-linux-amd64.zip" ;; \ - aarch64) \ - duck_binary="duckdb_cli-linux-arm64.zip" ;; \ - *) \ - echo "Unsupported architecture: $arch"; exit 1 ;; \ - esac && \ - wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ - && unzip $duck_binary -d /usr/local/bin \ - && rm $duck_binary \ - && duckdb --version - FROM builder as builder-http-gzip ARG PGIS1_PGSQL_HTTP_REPOSITORY @@ -237,6 +221,12 @@ RUN set -eux \ && make -j$(nproc) \ && make install +RUN set -eux \ + && git clone --depth 1 https://github.com/hydradatabase/pg_stringtheory \ + && cd pg_stringtheory \ + && make -j$(nproc) \ + && make install + # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) # TODO: add pg_quack version! RUN set -eux \ @@ -377,19 +367,19 @@ RUN set -eux \ ARG PGIS1_DUCKDB_CHECKOUT ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} -RUN arch=$(uname -m) && \ - DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') && \ - echo "DUCKDB_VERSION=${DUCKDB_VERSION}" && \ - echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" && \ - case "$arch" in \ +RUN arch=$(uname -m) \ + && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') \ + && echo "DUCKDB_VERSION=${DUCKDB_VERSION}" \ + && echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" \ + && case "$arch" in \ x86_64) \ duck_binary="duckdb_cli-linux-amd64.zip" ;; \ aarch64) \ - duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + duck_binary="duckdb_cli-linux-aarch64.zip" ;; \ *) \ echo "Unsupported architecture: $arch"; exit 1 ;; \ - esac && \ - wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + esac \ + && wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ && unzip $duck_binary -d /usr/local/bin \ && rm $duck_binary \ && duckdb --version diff --git a/15-3.4-bundle0/bookworm/initdb-bundle0.sh b/15-3.4-bundle0/bookworm/initdb-bundle0.sh index c3d3aa62b..5f2c5d116 100644 --- a/15-3.4-bundle0/bookworm/initdb-bundle0.sh +++ b/15-3.4-bundle0/bookworm/initdb-bundle0.sh @@ -6,4 +6,4 @@ set -e export PGUSER="$POSTGRES_USER" # install pg-svg-lib -"${psql[@]}" < /pg_svg/pg-svg-lib.sql +"${psql[@]}" Date: Tue, 6 Feb 2024 16:30:47 +0100 Subject: [PATCH 061/167] change master --- 14-l3.1.9gcp/bookworm/Dockerfile | 78 +++++++++++++++++++---- 15-master/bookworm/Dockerfile | 104 +++++++++++++++++++++++-------- 15-recent/bookworm/Dockerfile | 78 +++++++++++++++++++---- 16-master/bookworm/Dockerfile | 104 +++++++++++++++++++++++-------- 16-recent/bookworm/Dockerfile | 78 +++++++++++++++++++---- Dockerfile.master.template | 78 +++++++++++++++++++---- README.md | 2 +- versions.json | 48 +++++++------- versions.sh | 54 ++++++++++++---- 9 files changed, 488 insertions(+), 136 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index b9fe27ae9..d4a0400d1 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -132,8 +132,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -142,8 +151,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -178,8 +196,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -221,8 +248,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -258,8 +294,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -490,8 +535,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 69c918d16..554c0c71e 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 -ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=51bf34064205f5bd78cc5e592feec902ce55f111 -ARG PGIS1_PROJ_CHECKOUT=a3b225fc9e8ae4423449c2862833bf747a4573ad -ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=51bf34064205f5bd78cc5e592feec902ce55f111 -ARG PGIS1_PROJ_CHECKOUT_SHA1=a3b225fc9e8ae4423449c2862833bf747a4573ad -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 +ARG PGIS1_POSTGIS_CHECKOUT=master +ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GDAL_CHECKOUT=master +ARG PGIS1_PROJ_CHECKOUT=master +ARG PGIS1_SFCGAL_CHECKOUT=master +ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_BOOST_VERSION=1.74.0 @@ -132,8 +132,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -142,8 +151,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -178,8 +196,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -221,8 +248,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -258,8 +294,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -490,8 +535,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 7581e4762..f63ccb03a 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -132,8 +132,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -142,8 +151,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -178,8 +196,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -221,8 +248,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -258,8 +294,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -490,8 +535,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 00158615a..cae9c24a9 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,19 +15,19 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 -ARG PGIS1_GEOS_CHECKOUT=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT=51bf34064205f5bd78cc5e592feec902ce55f111 -ARG PGIS1_PROJ_CHECKOUT=a3b225fc9e8ae4423449c2862833bf747a4573ad -ARG PGIS1_SFCGAL_CHECKOUT=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT=7249b2e3ed815d5516faa58034d7a02bbcb9a909 - -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=fcdf1f229798936166f8b859d4aeb76a2cf5fc39 -ARG PGIS1_GEOS_CHECKOUT_SHA1=8d87edcd51653b47ca955cc3a9ac744f41988d92 -ARG PGIS1_GDAL_CHECKOUT_SHA1=51bf34064205f5bd78cc5e592feec902ce55f111 -ARG PGIS1_PROJ_CHECKOUT_SHA1=a3b225fc9e8ae4423449c2862833bf747a4573ad -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=7249b2e3ed815d5516faa58034d7a02bbcb9a909 +ARG PGIS1_POSTGIS_CHECKOUT=master +ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GDAL_CHECKOUT=master +ARG PGIS1_PROJ_CHECKOUT=master +ARG PGIS1_SFCGAL_CHECKOUT=master +ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch + +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_BOOST_VERSION=1.74.0 @@ -132,8 +132,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -142,8 +151,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -178,8 +196,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -221,8 +248,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -258,8 +294,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -490,8 +535,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 6963e6fb7..ca95c15a5 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -132,8 +132,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -142,8 +151,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -178,8 +196,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -221,8 +248,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -258,8 +294,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -490,8 +535,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 928950aca..fec9937ca 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -131,8 +131,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -141,8 +150,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -177,8 +195,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -220,8 +247,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -257,8 +293,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -497,8 +542,17 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/README.md b/README.md index 2a522cb8b..e5c1056e2 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-05) +## Versions (2024-02-06) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 96e5ae960..8a36ea851 100644 --- a/versions.json +++ b/versions.json @@ -459,18 +459,18 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", - "POSTGIS_CHECKOUT_SHA1": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", - "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", - "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", - "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "a3b225fc9e8ae4423449c2862833bf747a4573ad", - "PROJ_CHECKOUT_SHA1": "a3b225fc9e8ae4423449c2862833bf747a4573ad", - "GDAL_CHECKOUT": "51bf34064205f5bd78cc5e592feec902ce55f111", - "GDAL_CHECKOUT_SHA1": "51bf34064205f5bd78cc5e592feec902ce55f111", - "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", - "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", + "POSTGIS_CHECKOUT": "master", + "POSTGIS_CHECKOUT_SHA1": "nocheck", + "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT_SHA1": "nocheck", + "SFCGAL_CHECKOUT": "master", + "SFCGAL_CHECKOUT_SHA1": "nocheck", + "PROJ_CHECKOUT": "master", + "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_CHECKOUT": "master", + "GDAL_CHECKOUT_SHA1": "nocheck", + "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } }, @@ -605,18 +605,18 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", - "POSTGIS_CHECKOUT_SHA1": "fcdf1f229798936166f8b859d4aeb76a2cf5fc39", - "CGAL_CHECKOUT": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", - "CGAL_CHECKOUT_SHA1": "7249b2e3ed815d5516faa58034d7a02bbcb9a909", - "SFCGAL_CHECKOUT": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "PROJ_CHECKOUT": "a3b225fc9e8ae4423449c2862833bf747a4573ad", - "PROJ_CHECKOUT_SHA1": "a3b225fc9e8ae4423449c2862833bf747a4573ad", - "GDAL_CHECKOUT": "51bf34064205f5bd78cc5e592feec902ce55f111", - "GDAL_CHECKOUT_SHA1": "51bf34064205f5bd78cc5e592feec902ce55f111", - "GEOS_CHECKOUT": "8d87edcd51653b47ca955cc3a9ac744f41988d92", - "GEOS_CHECKOUT_SHA1": "8d87edcd51653b47ca955cc3a9ac744f41988d92", + "POSTGIS_CHECKOUT": "master", + "POSTGIS_CHECKOUT_SHA1": "nocheck", + "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT_SHA1": "nocheck", + "SFCGAL_CHECKOUT": "master", + "SFCGAL_CHECKOUT_SHA1": "nocheck", + "PROJ_CHECKOUT": "master", + "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_CHECKOUT": "master", + "GDAL_CHECKOUT_SHA1": "nocheck", + "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } }, diff --git a/versions.sh b/versions.sh index db7eed9dc..782700aef 100755 --- a/versions.sh +++ b/versions.sh @@ -27,13 +27,26 @@ postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" postgres_versions="11 12 13 14 15 16" -# locking versions for dependencies + +# MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically +# if not set, it will use the locked version, and the checkout hash will be used +MASTER_BRANCH_MODE="flexible" + +POSTGIS_BRANCH="master" +GEOS_BRANCH="main" +GDAL_BRANCH="master" +PROJ_BRANCH="master" +SFCGAL_BRANCH="master" +CGAL_BRANCH="5.6.x-branch" + +# locked: extra locking versions for dependencies CGAL_CHECKOUT_LOCK="" SFCGAL_CHECKOUT_LOCK="" GEOS_CHECKOUT_LOCK="" PROJ_CHECKOUT_LOCK="" GDAL_CHECKOUT_LOCK="" + declare -A postgisDebPkgNameVersionSuffixes=( [3.0]='3' [3.1]='3' @@ -579,18 +592,33 @@ for version in "${versions[@]}"; do printf " template: '%s'\n" "Dockerfile.master.template" printf " initfile: '%s'\n" "initdb-postgis.sh" - printf " POSTGIS_CHECKOUT: '%s'\n" "$postgisGitHash" - printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$postgisGitHash" - printf " CGAL_CHECKOUT: '%s'\n" "$cgal5XGitHash" - printf " CGAL_CHECKOUT_SHA1: '%s'\n" "$cgal5XGitHash" - printf " SFCGAL_CHECKOUT: '%s'\n" "$sfcgalGitHash" - printf " SFCGAL_CHECKOUT_SHA1: '%s'\n" "$sfcgalGitHash" - printf " PROJ_CHECKOUT: '%s'\n" "$projGitHash" - printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$projGitHash" - printf " GDAL_CHECKOUT: '%s'\n" "$gdalGitHash" - printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$gdalGitHash" - printf " GEOS_CHECKOUT: '%s'\n" "$geosGitHash" - printf " GEOS_CHECKOUT_SHA1: '%s'\n" "$geosGitHash" + if [[ "$MASTER_BRANCH_MODE" == "flexible" ]]; then + printf " POSTGIS_CHECKOUT: '%s'\n" "$POSTGIS_BRANCH" + printf " POSTGIS_CHECKOUT_SHA1: 'nocheck'\n" + printf " CGAL_CHECKOUT: '%s'\n" "$CGAL_BRANCH" + printf " CGAL_CHECKOUT_SHA1: 'nocheck'\n" + printf " SFCGAL_CHECKOUT: '%s'\n" "$SFCGAL_BRANCH" + printf " SFCGAL_CHECKOUT_SHA1: 'nocheck'\n" + printf " PROJ_CHECKOUT: '%s'\n" "$PROJ_BRANCH" + printf " PROJ_CHECKOUT_SHA1: 'nocheck'\n" + printf " GDAL_CHECKOUT: '%s'\n" "$GDAL_BRANCH" + printf " GDAL_CHECKOUT_SHA1: 'nocheck'\n" + printf " GEOS_CHECKOUT: '%s'\n" "$GEOS_BRANCH" + printf " GEOS_CHECKOUT_SHA1: 'nocheck'\n" + else + printf " POSTGIS_CHECKOUT: '%s'\n" "$postgisGitHash" + printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$postgisGitHash" + printf " CGAL_CHECKOUT: '%s'\n" "$cgal5XGitHash" + printf " CGAL_CHECKOUT_SHA1: '%s'\n" "$cgal5XGitHash" + printf " SFCGAL_CHECKOUT: '%s'\n" "$sfcgalGitHash" + printf " SFCGAL_CHECKOUT_SHA1: '%s'\n" "$sfcgalGitHash" + printf " PROJ_CHECKOUT: '%s'\n" "$projGitHash" + printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$projGitHash" + printf " GDAL_CHECKOUT: '%s'\n" "$gdalGitHash" + printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$gdalGitHash" + printf " GEOS_CHECKOUT: '%s'\n" "$geosGitHash" + printf " GEOS_CHECKOUT_SHA1: '%s'\n" "$geosGitHash" + fi printf " BOOST_VERSION: '%s'\n" "${boostVersion[$variant]}" } >>_versions.yml From 7a69f64b9812a5417d8236738c88b547692a847f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 6 Feb 2024 17:02:43 +0100 Subject: [PATCH 062/167] fix bunlde --- 15-3.4-bundle0/bookworm/Dockerfile | 8 +------- 16-3.4-bundle0/bookworm/Dockerfile | 8 +------- Dockerfile.bundle0.template | 8 +------- versions.sh | 2 -- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 8c9ef1f1f..36e2308c1 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -213,7 +213,7 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase # TODO hydradatabase version! RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ && export COLUMNAR_O3=1 \ @@ -221,12 +221,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/pg_stringtheory \ - && cd pg_stringtheory \ - && make -j$(nproc) \ - && make install - # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) # TODO: add pg_quack version! RUN set -eux \ diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 664e1fe84..09a9fc6a1 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -213,7 +213,7 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase # TODO hydradatabase version! RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ && export COLUMNAR_O3=1 \ @@ -221,12 +221,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/pg_stringtheory \ - && cd pg_stringtheory \ - && make -j$(nproc) \ - && make install - # pg_quack is not available for PG16 # - https://github.com/hydradatabase/pg_quack/issues/3 diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index cfc6464d9..cdb5d89b9 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -208,7 +208,7 @@ ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 # Add hydradatabase # TODO hydradatabase version! RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ + && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ && git checkout main \ && export COLUMNAR_O3=1 \ @@ -216,12 +216,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/pg_stringtheory \ - && cd pg_stringtheory \ - && make -j$(nproc) \ - && make install - {{ if env.version | startswith("16") then ( -}} # pg_quack is not available for PG16 # - https://github.com/hydradatabase/pg_quack/issues/3 diff --git a/versions.sh b/versions.sh index 782700aef..68c4f3ebe 100755 --- a/versions.sh +++ b/versions.sh @@ -27,7 +27,6 @@ postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" postgres_versions="11 12 13 14 15 16" - # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used MASTER_BRANCH_MODE="flexible" @@ -46,7 +45,6 @@ GEOS_CHECKOUT_LOCK="" PROJ_CHECKOUT_LOCK="" GDAL_CHECKOUT_LOCK="" - declare -A postgisDebPkgNameVersionSuffixes=( [3.0]='3' [3.1]='3' From 62fa868e3af1ee0dcebdd1fa146f74bf0f4fdd39 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 8 Feb 2024 20:12:32 +0100 Subject: [PATCH 063/167] update postgis --- .circleci/config.yml | 20 +++ .github/workflows/main.yml | 52 +++--- 12-3.0/alpine3.18/Dockerfile | 4 +- 12-3.0/alpine3.18/tags | 2 +- 12-3.1/alpine3.18/Dockerfile | 4 +- 12-3.1/alpine3.18/tags | 2 +- 12-3.2/alpine3.18/Dockerfile | 4 +- 12-3.2/alpine3.18/tags | 2 +- 12-3.3/alpine3.18/Dockerfile | 4 +- 12-3.3/alpine3.18/tags | 2 +- 12-3.4/alpine3.18/Dockerfile | 4 +- 12-3.4/alpine3.18/tags | 2 +- 12-3.4/alpine3.19/Dockerfile | 4 +- 12-3.4/alpine3.19/tags | 2 +- 13-3.0/alpine3.18/Dockerfile | 4 +- 13-3.0/alpine3.18/tags | 2 +- 13-3.1/alpine3.18/Dockerfile | 4 +- 13-3.1/alpine3.18/tags | 2 +- 13-3.2/alpine3.18/Dockerfile | 4 +- 13-3.2/alpine3.18/tags | 2 +- 13-3.3/alpine3.18/Dockerfile | 4 +- 13-3.3/alpine3.18/tags | 2 +- 13-3.4/alpine3.18/Dockerfile | 4 +- 13-3.4/alpine3.18/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 4 +- 13-3.4/alpine3.19/tags | 2 +- 14-3.1/alpine3.18/Dockerfile | 4 +- 14-3.1/alpine3.18/tags | 2 +- 14-3.2/alpine3.18/Dockerfile | 4 +- 14-3.2/alpine3.18/tags | 2 +- 14-3.3/alpine3.18/Dockerfile | 4 +- 14-3.3/alpine3.18/tags | 2 +- 14-3.4/alpine3.18/Dockerfile | 4 +- 14-3.4/alpine3.18/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 4 +- 14-3.4/alpine3.19/tags | 2 +- 15-3.2/alpine3.18/Dockerfile | 4 +- 15-3.2/alpine3.18/tags | 2 +- 15-3.3/alpine3.18/Dockerfile | 4 +- 15-3.3/alpine3.18/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 4 +- 15-3.4/alpine3.18/Dockerfile | 4 +- 15-3.4/alpine3.18/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 4 +- 15-3.4/alpine3.19/tags | 2 +- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.3/alpine3.18/Dockerfile | 4 +- 16-3.3/alpine3.18/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 +- 16-3.4/alpine3.18/Dockerfile | 4 +- 16-3.4/alpine3.18/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 4 +- 16-3.4/alpine3.19/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- README.md | 54 +++--- manifest.sh | 156 ++++++++--------- versions.json | 260 ++++++++++++++--------------- 59 files changed, 363 insertions(+), 343 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98f4a5026..486a21182 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,26 @@ jobs: registry: docker.io docker-username: DOCKERHUB_USERNAME docker-password: DOCKERHUB_ACCESS_TOKEN + + - run: + name: Check Docker Hub Rate Limits + command: | + # Use a lightweight image for checking rate limits + IMAGE_TO_PULL="hello-world" + + # Pulling the image to trigger rate limit headers + docker pull $IMAGE_TO_PULL + + # Using curl to fetch just the HTTP headers and grep to extract rate limit info + # Note: Replace `library/$IMAGE_TO_PULL` with the appropriate image path if using a different image + TOKEN=$(curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:library/$IMAGE_TO_PULL:pull" | jq -r .token) + HEADERS=$(curl -I -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/library/$IMAGE_TO_PULL/manifests/latest) + + echo "Rate Limit Info:" + echo "$HEADERS" | grep -i "RateLimit-Limit" + echo "$HEADERS" | grep -i "RateLimit-Remaining" + echo "$HEADERS" | grep -i "RateLimit-Reset" + - run: uname -a - run: docker --version - run: docker info diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c1ba71ec..6f1be61a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,47 +24,47 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.0", variant: "alpine3.18", postgres: "12", postgis: "3.0", arch: "amd64 arm64", tags: "12-3.0-alpine3.18 12-3.0.10-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.1", variant: "alpine3.18", postgres: "12", postgis: "3.1", arch: "amd64 arm64", tags: "12-3.1-alpine3.18 12-3.1.10-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.2", variant: "alpine3.18", postgres: "12", postgis: "3.2", arch: "amd64 arm64", tags: "12-3.2-alpine3.18 12-3.2.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.3", variant: "alpine3.18", postgres: "12", postgis: "3.3", arch: "amd64 arm64", tags: "12-3.3-alpine3.18 12-3.3.5-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.1-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } + - { version: "12-3.0", variant: "alpine3.18", postgres: "12", postgis: "3.0", arch: "amd64 arm64", tags: "12-3.0-alpine3.18 12-3.0.11-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.1", variant: "alpine3.18", postgres: "12", postgis: "3.1", arch: "amd64 arm64", tags: "12-3.1-alpine3.18 12-3.1.11-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.2", variant: "alpine3.18", postgres: "12", postgis: "3.2", arch: "amd64 arm64", tags: "12-3.2-alpine3.18 12-3.2.7-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.3", variant: "alpine3.18", postgres: "12", postgis: "3.3", arch: "amd64 arm64", tags: "12-3.3-alpine3.18 12-3.3.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.2-alpine3.18", readme_group: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "13-3.0", variant: "alpine3.18", postgres: "13", postgis: "3.0", arch: "amd64 arm64", tags: "13-3.0-alpine3.18 13-3.0.10-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.1", variant: "alpine3.18", postgres: "13", postgis: "3.1", arch: "amd64 arm64", tags: "13-3.1-alpine3.18 13-3.1.10-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.2", variant: "alpine3.18", postgres: "13", postgis: "3.2", arch: "amd64 arm64", tags: "13-3.2-alpine3.18 13-3.2.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.3", variant: "alpine3.18", postgres: "13", postgis: "3.3", arch: "amd64 arm64", tags: "13-3.3-alpine3.18 13-3.3.5-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.1-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } + - { version: "13-3.0", variant: "alpine3.18", postgres: "13", postgis: "3.0", arch: "amd64 arm64", tags: "13-3.0-alpine3.18 13-3.0.11-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.1", variant: "alpine3.18", postgres: "13", postgis: "3.1", arch: "amd64 arm64", tags: "13-3.1-alpine3.18 13-3.1.11-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.2", variant: "alpine3.18", postgres: "13", postgis: "3.2", arch: "amd64 arm64", tags: "13-3.2-alpine3.18 13-3.2.7-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.3", variant: "alpine3.18", postgres: "13", postgis: "3.3", arch: "amd64 arm64", tags: "13-3.3-alpine3.18 13-3.3.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.2-alpine3.18", readme_group: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", readme_group: "bookworm" } - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "14-3.1", variant: "alpine3.18", postgres: "14", postgis: "3.1", arch: "amd64 arm64", tags: "14-3.1-alpine3.18 14-3.1.10-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.2", variant: "alpine3.18", postgres: "14", postgis: "3.2", arch: "amd64 arm64", tags: "14-3.2-alpine3.18 14-3.2.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.3", variant: "alpine3.18", postgres: "14", postgis: "3.3", arch: "amd64 arm64", tags: "14-3.3-alpine3.18 14-3.3.5-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.1-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } + - { version: "14-3.1", variant: "alpine3.18", postgres: "14", postgis: "3.1", arch: "amd64 arm64", tags: "14-3.1-alpine3.18 14-3.1.11-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.2", variant: "alpine3.18", postgres: "14", postgis: "3.2", arch: "amd64 arm64", tags: "14-3.2-alpine3.18 14-3.2.7-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.3", variant: "alpine3.18", postgres: "14", postgis: "3.3", arch: "amd64 arm64", tags: "14-3.3-alpine3.18 14-3.3.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.2-alpine3.18", readme_group: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", readme_group: "bookworm" } - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.1-bullseye", readme_group: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm", postgres: "14", postgis: "l3.1.9gcp", arch: "amd64 arm64", tags: "14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm", readme_group: "locked" } - - { version: "15-3.2", variant: "alpine3.18", postgres: "15", postgis: "3.2", arch: "amd64 arm64", tags: "15-3.2-alpine3.18 15-3.2.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.3", variant: "alpine3.18", postgres: "15", postgis: "3.3", arch: "amd64 arm64", tags: "15-3.3-alpine3.18 15-3.3.5-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.1-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } + - { version: "15-3.2", variant: "alpine3.18", postgres: "15", postgis: "3.2", arch: "amd64 arm64", tags: "15-3.2-alpine3.18 15-3.2.7-alpine3.18", readme_group: "alpine3.18" } + - { version: "15-3.3", variant: "alpine3.18", postgres: "15", postgis: "3.3", arch: "amd64 arm64", tags: "15-3.3-alpine3.18 15-3.3.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.2-alpine3.18", readme_group: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } # --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", readme_group: "bookworm" } - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.5-alpine3.18", readme_group: "alpine3.18" } - - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.1-alpine3.18", readme_group: "alpine3.18" } - - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.6-alpine3.18", readme_group: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.2-alpine3.18", readme_group: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } # --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/12-3.0/alpine3.18/Dockerfile b/12-3.0/alpine3.18/Dockerfile index 753bc1b39..a7b576ed1 100644 --- a/12-3.0/alpine3.18/Dockerfile +++ b/12-3.0/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.10 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=87d347295e84f33a4b76d6a5412f72b91ef90635 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.11 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd7f67e7a85103219cdbc49f62e18619bf2a33e6 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.0/alpine3.18/tags b/12-3.0/alpine3.18/tags index d15484997..03852dd4c 100644 --- a/12-3.0/alpine3.18/tags +++ b/12-3.0/alpine3.18/tags @@ -1 +1 @@ -12-3.0-alpine3.18 12-3.0.10-alpine3.18 +12-3.0-alpine3.18 12-3.0.11-alpine3.18 diff --git a/12-3.1/alpine3.18/Dockerfile b/12-3.1/alpine3.18/Dockerfile index 6eb6cc424..58a24e019 100644 --- a/12-3.1/alpine3.18/Dockerfile +++ b/12-3.1/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.1/alpine3.18/tags b/12-3.1/alpine3.18/tags index e6392c88b..f1c88e8d6 100644 --- a/12-3.1/alpine3.18/tags +++ b/12-3.1/alpine3.18/tags @@ -1 +1 @@ -12-3.1-alpine3.18 12-3.1.10-alpine3.18 +12-3.1-alpine3.18 12-3.1.11-alpine3.18 diff --git a/12-3.2/alpine3.18/Dockerfile b/12-3.2/alpine3.18/Dockerfile index f19e19ae9..eb3bbffda 100644 --- a/12-3.2/alpine3.18/Dockerfile +++ b/12-3.2/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.2/alpine3.18/tags b/12-3.2/alpine3.18/tags index 4b021af63..e20e16b7e 100644 --- a/12-3.2/alpine3.18/tags +++ b/12-3.2/alpine3.18/tags @@ -1 +1 @@ -12-3.2-alpine3.18 12-3.2.6-alpine3.18 +12-3.2-alpine3.18 12-3.2.7-alpine3.18 diff --git a/12-3.3/alpine3.18/Dockerfile b/12-3.3/alpine3.18/Dockerfile index dbc24ff3d..c755c4686 100644 --- a/12-3.3/alpine3.18/Dockerfile +++ b/12-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.3/alpine3.18/tags b/12-3.3/alpine3.18/tags index 15f4dc75c..ee4c96be8 100644 --- a/12-3.3/alpine3.18/tags +++ b/12-3.3/alpine3.18/tags @@ -1 +1 @@ -12-3.3-alpine3.18 12-3.3.5-alpine3.18 +12-3.3-alpine3.18 12-3.3.6-alpine3.18 diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index dc20d855c..53e910ebc 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.18/tags b/12-3.4/alpine3.18/tags index 4b741d6a5..3576f1946 100644 --- a/12-3.4/alpine3.18/tags +++ b/12-3.4/alpine3.18/tags @@ -1 +1 @@ -12-3.4-alpine3.18 12-3.4.1-alpine3.18 +12-3.4-alpine3.18 12-3.4.2-alpine3.18 diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index f3bd7d14d..e4a1ce40f 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index 22b7bc045..71d6290e1 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine +12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine diff --git a/13-3.0/alpine3.18/Dockerfile b/13-3.0/alpine3.18/Dockerfile index 00284e74b..19f92bb5b 100644 --- a/13-3.0/alpine3.18/Dockerfile +++ b/13-3.0/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.10 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=87d347295e84f33a4b76d6a5412f72b91ef90635 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.11 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd7f67e7a85103219cdbc49f62e18619bf2a33e6 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.0/alpine3.18/tags b/13-3.0/alpine3.18/tags index 2ec80b1e1..736acd925 100644 --- a/13-3.0/alpine3.18/tags +++ b/13-3.0/alpine3.18/tags @@ -1 +1 @@ -13-3.0-alpine3.18 13-3.0.10-alpine3.18 +13-3.0-alpine3.18 13-3.0.11-alpine3.18 diff --git a/13-3.1/alpine3.18/Dockerfile b/13-3.1/alpine3.18/Dockerfile index 4df9baa03..68fca4ed5 100644 --- a/13-3.1/alpine3.18/Dockerfile +++ b/13-3.1/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.1/alpine3.18/tags b/13-3.1/alpine3.18/tags index 966d8a80c..7d4e7b7ec 100644 --- a/13-3.1/alpine3.18/tags +++ b/13-3.1/alpine3.18/tags @@ -1 +1 @@ -13-3.1-alpine3.18 13-3.1.10-alpine3.18 +13-3.1-alpine3.18 13-3.1.11-alpine3.18 diff --git a/13-3.2/alpine3.18/Dockerfile b/13-3.2/alpine3.18/Dockerfile index 84a58873e..700564b96 100644 --- a/13-3.2/alpine3.18/Dockerfile +++ b/13-3.2/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.2/alpine3.18/tags b/13-3.2/alpine3.18/tags index f5e30c2f1..3faa9ff19 100644 --- a/13-3.2/alpine3.18/tags +++ b/13-3.2/alpine3.18/tags @@ -1 +1 @@ -13-3.2-alpine3.18 13-3.2.6-alpine3.18 +13-3.2-alpine3.18 13-3.2.7-alpine3.18 diff --git a/13-3.3/alpine3.18/Dockerfile b/13-3.3/alpine3.18/Dockerfile index 1c8b88455..a862fb8dc 100644 --- a/13-3.3/alpine3.18/Dockerfile +++ b/13-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.3/alpine3.18/tags b/13-3.3/alpine3.18/tags index 707885b1e..c1d3338c0 100644 --- a/13-3.3/alpine3.18/tags +++ b/13-3.3/alpine3.18/tags @@ -1 +1 @@ -13-3.3-alpine3.18 13-3.3.5-alpine3.18 +13-3.3-alpine3.18 13-3.3.6-alpine3.18 diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index 632cc48c7..316b0d4da 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.18/tags b/13-3.4/alpine3.18/tags index 43f154c28..28fe5f018 100644 --- a/13-3.4/alpine3.18/tags +++ b/13-3.4/alpine3.18/tags @@ -1 +1 @@ -13-3.4-alpine3.18 13-3.4.1-alpine3.18 +13-3.4-alpine3.18 13-3.4.2-alpine3.18 diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index cb05e3428..a95916535 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index 6daeae935..ba0983ba7 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine +13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine diff --git a/14-3.1/alpine3.18/Dockerfile b/14-3.1/alpine3.18/Dockerfile index 2fe3d4d60..09f20f449 100644 --- a/14-3.1/alpine3.18/Dockerfile +++ b/14-3.1/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.10 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.1/alpine3.18/tags b/14-3.1/alpine3.18/tags index 5fd1f4873..c0f0d23fd 100644 --- a/14-3.1/alpine3.18/tags +++ b/14-3.1/alpine3.18/tags @@ -1 +1 @@ -14-3.1-alpine3.18 14-3.1.10-alpine3.18 +14-3.1-alpine3.18 14-3.1.11-alpine3.18 diff --git a/14-3.2/alpine3.18/Dockerfile b/14-3.2/alpine3.18/Dockerfile index 044d4433e..1a7364037 100644 --- a/14-3.2/alpine3.18/Dockerfile +++ b/14-3.2/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.2/alpine3.18/tags b/14-3.2/alpine3.18/tags index 81d62eb6d..7d5349cdc 100644 --- a/14-3.2/alpine3.18/tags +++ b/14-3.2/alpine3.18/tags @@ -1 +1 @@ -14-3.2-alpine3.18 14-3.2.6-alpine3.18 +14-3.2-alpine3.18 14-3.2.7-alpine3.18 diff --git a/14-3.3/alpine3.18/Dockerfile b/14-3.3/alpine3.18/Dockerfile index f8faedda9..5edd79128 100644 --- a/14-3.3/alpine3.18/Dockerfile +++ b/14-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.3/alpine3.18/tags b/14-3.3/alpine3.18/tags index 95c7673a6..22635a27e 100644 --- a/14-3.3/alpine3.18/tags +++ b/14-3.3/alpine3.18/tags @@ -1 +1 @@ -14-3.3-alpine3.18 14-3.3.5-alpine3.18 +14-3.3-alpine3.18 14-3.3.6-alpine3.18 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index d9ad38ed5..53e2a5c53 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.18/tags b/14-3.4/alpine3.18/tags index 0d17024f7..464c0dbef 100644 --- a/14-3.4/alpine3.18/tags +++ b/14-3.4/alpine3.18/tags @@ -1 +1 @@ -14-3.4-alpine3.18 14-3.4.1-alpine3.18 +14-3.4-alpine3.18 14-3.4.2-alpine3.18 diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 2eb4ea31b..7a1a09e70 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index 9f6e9e269..7a487afa1 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine +14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine diff --git a/15-3.2/alpine3.18/Dockerfile b/15-3.2/alpine3.18/Dockerfile index aa5cf9c7d..d25e34649 100644 --- a/15-3.2/alpine3.18/Dockerfile +++ b/15-3.2/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=451803af5506f42da2acad38c69b645d68e77fc8 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.2/alpine3.18/tags b/15-3.2/alpine3.18/tags index 515454787..a1719daa7 100644 --- a/15-3.2/alpine3.18/tags +++ b/15-3.2/alpine3.18/tags @@ -1 +1 @@ -15-3.2-alpine3.18 15-3.2.6-alpine3.18 +15-3.2-alpine3.18 15-3.2.7-alpine3.18 diff --git a/15-3.3/alpine3.18/Dockerfile b/15-3.3/alpine3.18/Dockerfile index 82b544e86..e00634daf 100644 --- a/15-3.3/alpine3.18/Dockerfile +++ b/15-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.3/alpine3.18/tags b/15-3.3/alpine3.18/tags index c22a57da1..d474de72f 100644 --- a/15-3.3/alpine3.18/tags +++ b/15-3.3/alpine3.18/tags @@ -1 +1 @@ -15-3.3-alpine3.18 15-3.3.5-alpine3.18 +15-3.3-alpine3.18 15-3.3.6-alpine3.18 diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 36e2308c1..c9fbd0356 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=27398c44085ee4341e373351776e0052bd25bbc2 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=5ede370059550c9d11d3171950767ba11ebd3797 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 47b7a5365..aff590f7c 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags index c310ae1c1..3366ea647 100644 --- a/15-3.4/alpine3.18/tags +++ b/15-3.4/alpine3.18/tags @@ -1 +1 @@ -15-3.4-alpine3.18 15-3.4.1-alpine3.18 +15-3.4-alpine3.18 15-3.4.2-alpine3.18 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index f151b4557..774a8ebf9 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index 684b66dda..f5945055e 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine +15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index f63ccb03a..f8d0fb1a6 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -15,14 +15,14 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index c92d90d17..3db11d985 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.3/alpine3.18/Dockerfile b/16-3.3/alpine3.18/Dockerfile index fdcf228d5..5dbe9f55b 100644 --- a/16-3.3/alpine3.18/Dockerfile +++ b/16-3.3/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.5 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=97969989e8a1cbfa424b305f5c99c157921c9650 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.3/alpine3.18/tags b/16-3.3/alpine3.18/tags index 3152676ae..fd9633395 100644 --- a/16-3.3/alpine3.18/tags +++ b/16-3.3/alpine3.18/tags @@ -1 +1 @@ -16-3.3-alpine3.18 16-3.3.5-alpine3.18 +16-3.3-alpine3.18 16-3.3.6-alpine3.18 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 09a9fc6a1..d23669548 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=27398c44085ee4341e373351776e0052bd25bbc2 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=5ede370059550c9d11d3171950767ba11ebd3797 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index d260c3bd2..6eebc966f 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags index ecb98a842..a1524be90 100644 --- a/16-3.4/alpine3.18/tags +++ b/16-3.4/alpine3.18/tags @@ -1 +1 @@ -16-3.4-alpine3.18 16-3.4.1-alpine3.18 +16-3.4-alpine3.18 16-3.4.2-alpine3.18 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index a0bc03d14..375f65dba 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index ad4e41137..75e8bb72f 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine +16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index ca95c15a5..0f137f6fe 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -15,14 +15,14 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca035b9017295a7e67bd68465e90e2b3c2b84709 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 503a1fa9e..70ff49019 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index e5c1056e2..3ff013270 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-06) +## Versions (2024-02-08) We provide multi-platform image support for the following architectures: @@ -95,8 +95,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.1, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) @@ -122,25 +122,25 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.10 | -| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.10 | -| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.6 | -| [`12-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.18), [`12-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.3.5 | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.1 | -| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.10 | -| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.10 | -| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.6 | -| [`13-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.18), [`13-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.3.5 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.1 | -| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.10-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.10-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.10 | -| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.6 | -| [`14-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.18), [`14-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.3.5 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.1 | -| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.6 | -| [`15-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.18), [`15-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.3.5 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.1 | -| [`16-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.18), [`16-3.3.5-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.5-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.3.5 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.1 | +| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.11 | +| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.11 | +| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.7 | +| [`12-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.18), [`12-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.3.6 | +| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.2 | +| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.11 | +| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.11 | +| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.7 | +| [`13-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.18), [`13-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.3.6 | +| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.2 | +| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.11 | +| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.7 | +| [`14-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.18), [`14-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.3.6 | +| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.2 | +| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.7 | +| [`15-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.18), [`15-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.3.6 | +| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.2 | +| [`16-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.18), [`16-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.3.6 | +| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.2 | ### ⛰️Alpine 3.19 based @@ -152,11 +152,11 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-alpine3.19), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.1 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-alpine3.19), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.1 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-alpine3.19), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.1 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-alpine3.19), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.1 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-alpine3.19), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.1 | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | ### 🧪Locked ( experimental ) diff --git a/manifest.sh b/manifest.sh index 2f67c6672..fec30551b 100755 --- a/manifest.sh +++ b/manifest.sh @@ -20,11 +20,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.0-alpine3.18 \ --target ${dockername}:12-3.0-alpine3.18 || true -echo "manifest: ${dockername}:12-3.0.10-alpine3.18" +echo "manifest: ${dockername}:12-3.0.11-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.0.10-alpine3.18 \ - --target ${dockername}:12-3.0.10-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.0.11-alpine3.18 \ + --target ${dockername}:12-3.0.11-alpine3.18 || true # ----- 12-3.1-alpine3.18 ----- @@ -34,11 +34,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.1-alpine3.18 \ --target ${dockername}:12-3.1-alpine3.18 || true -echo "manifest: ${dockername}:12-3.1.10-alpine3.18" +echo "manifest: ${dockername}:12-3.1.11-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.1.10-alpine3.18 \ - --target ${dockername}:12-3.1.10-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.1.11-alpine3.18 \ + --target ${dockername}:12-3.1.11-alpine3.18 || true # ----- 12-3.2-alpine3.18 ----- @@ -48,11 +48,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.2-alpine3.18 \ --target ${dockername}:12-3.2-alpine3.18 || true -echo "manifest: ${dockername}:12-3.2.6-alpine3.18" +echo "manifest: ${dockername}:12-3.2.7-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.2.6-alpine3.18 \ - --target ${dockername}:12-3.2.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.2.7-alpine3.18 \ + --target ${dockername}:12-3.2.7-alpine3.18 || true # ----- 12-3.3-alpine3.18 ----- @@ -62,11 +62,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.18 \ --target ${dockername}:12-3.3-alpine3.18 || true -echo "manifest: ${dockername}:12-3.3.5-alpine3.18" +echo "manifest: ${dockername}:12-3.3.6-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.5-alpine3.18 \ - --target ${dockername}:12-3.3.5-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.3.6-alpine3.18 \ + --target ${dockername}:12-3.3.6-alpine3.18 || true # ----- 12-3.4-alpine3.18 ----- @@ -76,11 +76,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.18 \ --target ${dockername}:12-3.4-alpine3.18 || true -echo "manifest: ${dockername}:12-3.4.1-alpine3.18" +echo "manifest: ${dockername}:12-3.4.2-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.1-alpine3.18 \ - --target ${dockername}:12-3.4.1-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.18 \ + --target ${dockername}:12-3.4.2-alpine3.18 || true # ----- 12-3.4-alpine3.19 ----- @@ -90,11 +90,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ --target ${dockername}:12-3.4-alpine3.19 || true -echo "manifest: ${dockername}:12-3.4.1-alpine3.19" +echo "manifest: ${dockername}:12-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.1-alpine3.19 \ - --target ${dockername}:12-3.4.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.19 \ + --target ${dockername}:12-3.4.2-alpine3.19 || true echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ @@ -144,11 +144,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.0-alpine3.18 \ --target ${dockername}:13-3.0-alpine3.18 || true -echo "manifest: ${dockername}:13-3.0.10-alpine3.18" +echo "manifest: ${dockername}:13-3.0.11-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.0.10-alpine3.18 \ - --target ${dockername}:13-3.0.10-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.0.11-alpine3.18 \ + --target ${dockername}:13-3.0.11-alpine3.18 || true # ----- 13-3.1-alpine3.18 ----- @@ -158,11 +158,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.1-alpine3.18 \ --target ${dockername}:13-3.1-alpine3.18 || true -echo "manifest: ${dockername}:13-3.1.10-alpine3.18" +echo "manifest: ${dockername}:13-3.1.11-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.1.10-alpine3.18 \ - --target ${dockername}:13-3.1.10-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.1.11-alpine3.18 \ + --target ${dockername}:13-3.1.11-alpine3.18 || true # ----- 13-3.2-alpine3.18 ----- @@ -172,11 +172,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.2-alpine3.18 \ --target ${dockername}:13-3.2-alpine3.18 || true -echo "manifest: ${dockername}:13-3.2.6-alpine3.18" +echo "manifest: ${dockername}:13-3.2.7-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.2.6-alpine3.18 \ - --target ${dockername}:13-3.2.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.2.7-alpine3.18 \ + --target ${dockername}:13-3.2.7-alpine3.18 || true # ----- 13-3.3-alpine3.18 ----- @@ -186,11 +186,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.18 \ --target ${dockername}:13-3.3-alpine3.18 || true -echo "manifest: ${dockername}:13-3.3.5-alpine3.18" +echo "manifest: ${dockername}:13-3.3.6-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3.5-alpine3.18 \ - --target ${dockername}:13-3.3.5-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.3.6-alpine3.18 \ + --target ${dockername}:13-3.3.6-alpine3.18 || true # ----- 13-3.4-alpine3.18 ----- @@ -200,11 +200,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.18 \ --target ${dockername}:13-3.4-alpine3.18 || true -echo "manifest: ${dockername}:13-3.4.1-alpine3.18" +echo "manifest: ${dockername}:13-3.4.2-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.1-alpine3.18 \ - --target ${dockername}:13-3.4.1-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.18 \ + --target ${dockername}:13-3.4.2-alpine3.18 || true # ----- 13-3.4-alpine3.19 ----- @@ -214,11 +214,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ --target ${dockername}:13-3.4-alpine3.19 || true -echo "manifest: ${dockername}:13-3.4.1-alpine3.19" +echo "manifest: ${dockername}:13-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.1-alpine3.19 \ - --target ${dockername}:13-3.4.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.19 \ + --target ${dockername}:13-3.4.2-alpine3.19 || true echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ @@ -268,11 +268,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.1-alpine3.18 \ --target ${dockername}:14-3.1-alpine3.18 || true -echo "manifest: ${dockername}:14-3.1.10-alpine3.18" +echo "manifest: ${dockername}:14-3.1.11-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.1.10-alpine3.18 \ - --target ${dockername}:14-3.1.10-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.1.11-alpine3.18 \ + --target ${dockername}:14-3.1.11-alpine3.18 || true # ----- 14-3.2-alpine3.18 ----- @@ -282,11 +282,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.2-alpine3.18 \ --target ${dockername}:14-3.2-alpine3.18 || true -echo "manifest: ${dockername}:14-3.2.6-alpine3.18" +echo "manifest: ${dockername}:14-3.2.7-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.2.6-alpine3.18 \ - --target ${dockername}:14-3.2.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.2.7-alpine3.18 \ + --target ${dockername}:14-3.2.7-alpine3.18 || true # ----- 14-3.3-alpine3.18 ----- @@ -296,11 +296,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.18 \ --target ${dockername}:14-3.3-alpine3.18 || true -echo "manifest: ${dockername}:14-3.3.5-alpine3.18" +echo "manifest: ${dockername}:14-3.3.6-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3.5-alpine3.18 \ - --target ${dockername}:14-3.3.5-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.3.6-alpine3.18 \ + --target ${dockername}:14-3.3.6-alpine3.18 || true # ----- 14-3.4-alpine3.18 ----- @@ -310,11 +310,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.18 \ --target ${dockername}:14-3.4-alpine3.18 || true -echo "manifest: ${dockername}:14-3.4.1-alpine3.18" +echo "manifest: ${dockername}:14-3.4.2-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.1-alpine3.18 \ - --target ${dockername}:14-3.4.1-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.18 \ + --target ${dockername}:14-3.4.2-alpine3.18 || true # ----- 14-3.4-alpine3.19 ----- @@ -324,11 +324,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ --target ${dockername}:14-3.4-alpine3.19 || true -echo "manifest: ${dockername}:14-3.4.1-alpine3.19" +echo "manifest: ${dockername}:14-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.1-alpine3.19 \ - --target ${dockername}:14-3.4.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.19 \ + --target ${dockername}:14-3.4.2-alpine3.19 || true echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ @@ -392,11 +392,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.2-alpine3.18 \ --target ${dockername}:15-3.2-alpine3.18 || true -echo "manifest: ${dockername}:15-3.2.6-alpine3.18" +echo "manifest: ${dockername}:15-3.2.7-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.2.6-alpine3.18 \ - --target ${dockername}:15-3.2.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.2.7-alpine3.18 \ + --target ${dockername}:15-3.2.7-alpine3.18 || true # ----- 15-3.3-alpine3.18 ----- @@ -406,11 +406,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.18 \ --target ${dockername}:15-3.3-alpine3.18 || true -echo "manifest: ${dockername}:15-3.3.5-alpine3.18" +echo "manifest: ${dockername}:15-3.3.6-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3.5-alpine3.18 \ - --target ${dockername}:15-3.3.5-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.3.6-alpine3.18 \ + --target ${dockername}:15-3.3.6-alpine3.18 || true # ----- 15-3.4-alpine3.18 ----- @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.18 \ --target ${dockername}:15-3.4-alpine3.18 || true -echo "manifest: ${dockername}:15-3.4.1-alpine3.18" +echo "manifest: ${dockername}:15-3.4.2-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.1-alpine3.18 \ - --target ${dockername}:15-3.4.1-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.18 \ + --target ${dockername}:15-3.4.2-alpine3.18 || true # ----- 15-3.4-alpine3.19 ----- @@ -434,11 +434,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ --target ${dockername}:15-3.4-alpine3.19 || true -echo "manifest: ${dockername}:15-3.4.1-alpine3.19" +echo "manifest: ${dockername}:15-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.1-alpine3.19 \ - --target ${dockername}:15-3.4.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.19 \ + --target ${dockername}:15-3.4.2-alpine3.19 || true echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ @@ -522,11 +522,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -548,11 +548,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.18 \ --target ${dockername}:16-3.3-alpine3.18 || true -echo "manifest: ${dockername}:16-3.3.5-alpine3.18" +echo "manifest: ${dockername}:16-3.3.6-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3.5-alpine3.18 \ - --target ${dockername}:16-3.3.5-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.3.6-alpine3.18 \ + --target ${dockername}:16-3.3.6-alpine3.18 || true # ----- 16-3.4-alpine3.18 ----- @@ -562,11 +562,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.18 \ --target ${dockername}:16-3.4-alpine3.18 || true -echo "manifest: ${dockername}:16-3.4.1-alpine3.18" +echo "manifest: ${dockername}:16-3.4.2-alpine3.18" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.1-alpine3.18 \ - --target ${dockername}:16-3.4.1-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.18 \ + --target ${dockername}:16-3.4.2-alpine3.18 || true # ----- 16-3.4-alpine3.19 ----- @@ -576,11 +576,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ --target ${dockername}:16-3.4-alpine3.19 || true -echo "manifest: ${dockername}:16-3.4.1-alpine3.19" +echo "manifest: ${dockername}:16-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.1-alpine3.19 \ - --target ${dockername}:16-3.4.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.19 \ + --target ${dockername}:16-3.4.2-alpine3.19 || true echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ @@ -682,11 +682,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 8a36ea851..8679e4cea 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "12-3.0": { "alpine3.18": { - "tags": "12-3.0-alpine3.18 12-3.0.10-alpine3.18", + "tags": "12-3.0-alpine3.18 12-3.0.11-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.0", "arch": "amd64 arm64", @@ -9,15 +9,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.0.10", - "POSTGIS_SHA256": "1823741d04f50a5aa0a4660df671ae0aae407d44eb680c7e3e8b40aef8b1a238", - "POSTGIS_CHECKOUT": "tags/3.0.10", - "POSTGIS_CHECKOUT_SHA1": "87d347295e84f33a4b76d6a5412f72b91ef90635" + "POSTGIS_VERSION": "3.0.11", + "POSTGIS_SHA256": "556605dabe9d99a99353a76348480e7a25e28b48ac6d9d08ed033e3b37a96d26", + "POSTGIS_CHECKOUT": "tags/3.0.11", + "POSTGIS_CHECKOUT_SHA1": "dd7f67e7a85103219cdbc49f62e18619bf2a33e6" } }, "12-3.1": { "alpine3.18": { - "tags": "12-3.1-alpine3.18 12-3.1.10-alpine3.18", + "tags": "12-3.1-alpine3.18 12-3.1.11-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.1", "arch": "amd64 arm64", @@ -25,15 +25,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.1.10", - "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", - "POSTGIS_CHECKOUT": "tags/3.1.10", - "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + "POSTGIS_VERSION": "3.1.11", + "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", + "POSTGIS_CHECKOUT": "tags/3.1.11", + "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" } }, "12-3.2": { "alpine3.18": { - "tags": "12-3.2-alpine3.18 12-3.2.6-alpine3.18", + "tags": "12-3.2-alpine3.18 12-3.2.7-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.2", "arch": "amd64 arm64", @@ -41,15 +41,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.2.6", - "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", - "POSTGIS_CHECKOUT": "tags/3.2.6", - "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + "POSTGIS_VERSION": "3.2.7", + "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", + "POSTGIS_CHECKOUT": "tags/3.2.7", + "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" } }, "12-3.3": { "alpine3.18": { - "tags": "12-3.3-alpine3.18 12-3.3.5-alpine3.18", + "tags": "12-3.3-alpine3.18 12-3.3.6-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", @@ -57,10 +57,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + "POSTGIS_VERSION": "3.3.6", + "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", + "POSTGIS_CHECKOUT": "tags/3.3.6", + "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" } }, "12-3.4": { @@ -89,7 +89,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "12-3.4-alpine3.18 12-3.4.1-alpine3.18", + "tags": "12-3.4-alpine3.18 12-3.4.2-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -97,13 +97,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.1-alpine3.19 12-3.4-alpine", + "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -111,15 +111,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "13-3.0": { "alpine3.18": { - "tags": "13-3.0-alpine3.18 13-3.0.10-alpine3.18", + "tags": "13-3.0-alpine3.18 13-3.0.11-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.0", "arch": "amd64 arm64", @@ -127,15 +127,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.0.10", - "POSTGIS_SHA256": "1823741d04f50a5aa0a4660df671ae0aae407d44eb680c7e3e8b40aef8b1a238", - "POSTGIS_CHECKOUT": "tags/3.0.10", - "POSTGIS_CHECKOUT_SHA1": "87d347295e84f33a4b76d6a5412f72b91ef90635" + "POSTGIS_VERSION": "3.0.11", + "POSTGIS_SHA256": "556605dabe9d99a99353a76348480e7a25e28b48ac6d9d08ed033e3b37a96d26", + "POSTGIS_CHECKOUT": "tags/3.0.11", + "POSTGIS_CHECKOUT_SHA1": "dd7f67e7a85103219cdbc49f62e18619bf2a33e6" } }, "13-3.1": { "alpine3.18": { - "tags": "13-3.1-alpine3.18 13-3.1.10-alpine3.18", + "tags": "13-3.1-alpine3.18 13-3.1.11-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.1", "arch": "amd64 arm64", @@ -143,15 +143,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.1.10", - "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", - "POSTGIS_CHECKOUT": "tags/3.1.10", - "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + "POSTGIS_VERSION": "3.1.11", + "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", + "POSTGIS_CHECKOUT": "tags/3.1.11", + "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" } }, "13-3.2": { "alpine3.18": { - "tags": "13-3.2-alpine3.18 13-3.2.6-alpine3.18", + "tags": "13-3.2-alpine3.18 13-3.2.7-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.2", "arch": "amd64 arm64", @@ -159,15 +159,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.2.6", - "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", - "POSTGIS_CHECKOUT": "tags/3.2.6", - "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + "POSTGIS_VERSION": "3.2.7", + "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", + "POSTGIS_CHECKOUT": "tags/3.2.7", + "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" } }, "13-3.3": { "alpine3.18": { - "tags": "13-3.3-alpine3.18 13-3.3.5-alpine3.18", + "tags": "13-3.3-alpine3.18 13-3.3.6-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", @@ -175,10 +175,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + "POSTGIS_VERSION": "3.3.6", + "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", + "POSTGIS_CHECKOUT": "tags/3.3.6", + "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" } }, "13-3.4": { @@ -207,7 +207,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "13-3.4-alpine3.18 13-3.4.1-alpine3.18", + "tags": "13-3.4-alpine3.18 13-3.4.2-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -215,13 +215,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.1-alpine3.19 13-3.4-alpine", + "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -229,15 +229,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "14-3.1": { "alpine3.18": { - "tags": "14-3.1-alpine3.18 14-3.1.10-alpine3.18", + "tags": "14-3.1-alpine3.18 14-3.1.11-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.1", "arch": "amd64 arm64", @@ -245,15 +245,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.1.10", - "POSTGIS_SHA256": "45fc58728613396a7fe3076e66a5405b4aaba89a7a9a708d511c47b363ec09ce", - "POSTGIS_CHECKOUT": "tags/3.1.10", - "POSTGIS_CHECKOUT_SHA1": "4e93a1a2aa8e51d0d8a56468a6d6a4e3eda004d7" + "POSTGIS_VERSION": "3.1.11", + "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", + "POSTGIS_CHECKOUT": "tags/3.1.11", + "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" } }, "14-3.2": { "alpine3.18": { - "tags": "14-3.2-alpine3.18 14-3.2.6-alpine3.18", + "tags": "14-3.2-alpine3.18 14-3.2.7-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.2", "arch": "amd64 arm64", @@ -261,15 +261,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.2.6", - "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", - "POSTGIS_CHECKOUT": "tags/3.2.6", - "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + "POSTGIS_VERSION": "3.2.7", + "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", + "POSTGIS_CHECKOUT": "tags/3.2.7", + "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" } }, "14-3.3": { "alpine3.18": { - "tags": "14-3.3-alpine3.18 14-3.3.5-alpine3.18", + "tags": "14-3.3-alpine3.18 14-3.3.6-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", @@ -277,10 +277,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + "POSTGIS_VERSION": "3.3.6", + "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", + "POSTGIS_CHECKOUT": "tags/3.3.6", + "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" } }, "14-3.4": { @@ -309,7 +309,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "14-3.4-alpine3.18 14-3.4.1-alpine3.18", + "tags": "14-3.4-alpine3.18 14-3.4.2-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -317,13 +317,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.1-alpine3.19 14-3.4-alpine", + "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -331,15 +331,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "15-3.2": { "alpine3.18": { - "tags": "15-3.2-alpine3.18 15-3.2.6-alpine3.18", + "tags": "15-3.2-alpine3.18 15-3.2.7-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.2", "arch": "amd64 arm64", @@ -347,15 +347,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.2.6", - "POSTGIS_SHA256": "5d501df8cb16f5afdccf0906bdf1ce67522030af72b154e389a08bd02178b0d2", - "POSTGIS_CHECKOUT": "tags/3.2.6", - "POSTGIS_CHECKOUT_SHA1": "451803af5506f42da2acad38c69b645d68e77fc8" + "POSTGIS_VERSION": "3.2.7", + "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", + "POSTGIS_CHECKOUT": "tags/3.2.7", + "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" } }, "15-3.3": { "alpine3.18": { - "tags": "15-3.3-alpine3.18 15-3.3.5-alpine3.18", + "tags": "15-3.3-alpine3.18 15-3.3.6-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", @@ -363,10 +363,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + "POSTGIS_VERSION": "3.3.6", + "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", + "POSTGIS_CHECKOUT": "tags/3.3.6", + "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" } }, "15-3.4": { @@ -395,7 +395,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "15-3.4-alpine3.18 15-3.4.1-alpine3.18", + "tags": "15-3.4-alpine3.18 15-3.4.2-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -403,13 +403,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.1-alpine3.19 15-3.4-alpine", + "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -417,10 +417,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "15-3.4-bundle0": { @@ -439,8 +439,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.1", - "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", + "TIMESCALEDB_CHECKOUT": "tags/2.14.0", + "TIMESCALEDB_CHECKOUT_SHA1": "5ede370059550c9d11d3171950767ba11ebd3797", "DUCKDB_CHECKOUT": "tags/v0.9.2", "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -476,7 +476,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -484,8 +484,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", "GDAL_CHECKOUT": "tags/v3.8.3", @@ -501,7 +501,7 @@ }, "16-3.3": { "alpine3.18": { - "tags": "16-3.3-alpine3.18 16-3.3.5-alpine3.18", + "tags": "16-3.3-alpine3.18 16-3.3.6-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.3", "arch": "amd64 arm64", @@ -509,10 +509,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.3.5", - "POSTGIS_SHA256": "266d08c59cc92e5381b2d7d3637553ce8cc97474be3d5cdfee16348749c3aab4", - "POSTGIS_CHECKOUT": "tags/3.3.5", - "POSTGIS_CHECKOUT_SHA1": "97969989e8a1cbfa424b305f5c99c157921c9650" + "POSTGIS_VERSION": "3.3.6", + "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", + "POSTGIS_CHECKOUT": "tags/3.3.6", + "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" } }, "16-3.4": { @@ -541,7 +541,7 @@ "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" }, "alpine3.18": { - "tags": "16-3.4-alpine3.18 16-3.4.1-alpine3.18", + "tags": "16-3.4-alpine3.18 16-3.4.2-alpine3.18", "readme_group": "alpine3.18", "postgis": "3.4", "arch": "amd64 arm64", @@ -549,13 +549,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.1-alpine3.19 16-3.4-alpine alpine", + "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -563,10 +563,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.1", - "POSTGIS_SHA256": "473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "16-3.4-bundle0": { @@ -585,8 +585,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.1", - "TIMESCALEDB_CHECKOUT_SHA1": "27398c44085ee4341e373351776e0052bd25bbc2", + "TIMESCALEDB_CHECKOUT": "tags/2.14.0", + "TIMESCALEDB_CHECKOUT_SHA1": "5ede370059550c9d11d3171950767ba11ebd3797", "DUCKDB_CHECKOUT": "tags/v0.9.2", "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", @@ -622,7 +622,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.1-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -630,8 +630,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.1", - "POSTGIS_CHECKOUT_SHA1": "ca035b9017295a7e67bd68465e90e2b3c2b84709", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", "GDAL_CHECKOUT": "tags/v3.8.3", From 94b30d891a11320c44a79d7244f4a620dd21062a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 8 Feb 2024 22:57:29 +0100 Subject: [PATCH 064/167] check ratelimit --- .circleci/config.yml | 25 +++++++------------------ .github/workflows/main.yml | 7 +++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 486a21182..6979c16c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,24 +30,13 @@ jobs: docker-username: DOCKERHUB_USERNAME docker-password: DOCKERHUB_ACCESS_TOKEN - - run: - name: Check Docker Hub Rate Limits - command: | - # Use a lightweight image for checking rate limits - IMAGE_TO_PULL="hello-world" - - # Pulling the image to trigger rate limit headers - docker pull $IMAGE_TO_PULL - - # Using curl to fetch just the HTTP headers and grep to extract rate limit info - # Note: Replace `library/$IMAGE_TO_PULL` with the appropriate image path if using a different image - TOKEN=$(curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:library/$IMAGE_TO_PULL:pull" | jq -r .token) - HEADERS=$(curl -I -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/library/$IMAGE_TO_PULL/manifests/latest) - - echo "Rate Limit Info:" - echo "$HEADERS" | grep -i "RateLimit-Limit" - echo "$HEADERS" | grep -i "RateLimit-Remaining" - echo "$HEADERS" | grep -i "RateLimit-Reset" + - run: + name: Docker Ratelimit Check + command: | + TOKEN=$(curl --user "$DOCKERHUB_USERNAME:$DOCKERHUB_ACCESS_TOKEN" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) + HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) + echo "Rate Limit Info:" + echo "$HEADERS" | grep ratelimit - run: uname -a - run: docker --version diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f1be61a8..dda0b3d24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -111,6 +111,13 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: Docker Ratelimit Check + run: | + TOKEN=$(curl --user "${{ secrets.DOCKERHUB_USERNAME }}:${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) + HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) + echo "Rate Limit Info:" + echo "$HEADERS" | grep ratelimit + - name: Check if image exists id: check-image run: | From d672149aeb77a01e5cea2598bca15c0c60dc83cb Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 10 Feb 2024 17:12:48 +0100 Subject: [PATCH 065/167] add more rate-limit info --- .circleci/config.yml | 15 +++++++++++++-- .github/workflows/main.yml | 9 +++++++++ README.md | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6979c16c2..49c239253 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ version: 2.1 orbs: # https://circleci.com/developer/orbs/orb/circleci/docker - docker: circleci/docker@2.4.0 + docker: circleci/docker@2.5.0 # https://circleci.com/developer/orbs/orb/circleci/python python: circleci/python@2.1.1 # https://circleci.com/developer/orbs/orb/circleci/shellcheck @@ -31,7 +31,8 @@ jobs: docker-password: DOCKERHUB_ACCESS_TOKEN - run: - name: Docker Ratelimit Check + name: Docker Ratelimit Check - before + # https://docs.docker.com/docker-hub/download-rate-limit/ command: | TOKEN=$(curl --user "$DOCKERHUB_USERNAME:$DOCKERHUB_ACCESS_TOKEN" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) @@ -83,6 +84,16 @@ jobs: echo "...push and manifest done..." fi + - run: + name: Docker Ratelimit Check - after + # https://docs.docker.com/docker-hub/download-rate-limit/ + command: | + TOKEN=$(curl --user "$DOCKERHUB_USERNAME:$DOCKERHUB_ACCESS_TOKEN" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) + HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) + echo "Rate Limit Info:" + echo "$HEADERS" | grep ratelimit + + workflows: build-deploy: # AND triggered by weekly from the app.circleci.com UI diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dda0b3d24..8e0cd3553 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,6 +112,7 @@ jobs: password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - name: Docker Ratelimit Check + # https://docs.docker.com/docker-hub/download-rate-limit/ run: | TOKEN=$(curl --user "${{ secrets.DOCKERHUB_USERNAME }}:${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) @@ -188,6 +189,14 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: Docker Ratelimit Check + # https://docs.docker.com/docker-hub/download-rate-limit/ + run: | + TOKEN=$(curl --user "${{ secrets.DOCKERHUB_USERNAME }}:${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq -r .token) + HEADERS=$(curl --head -H "Authorization: Bearer $TOKEN" https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest) + echo "Rate Limit Info:" + echo "$HEADERS" | grep ratelimit + - name: push readme to docker hub api if: ${{ (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request') }} env: diff --git a/README.md b/README.md index 3ff013270..2fb6c06d2 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-08) +## Versions (2024-02-10) We provide multi-platform image support for the following architectures: From 82df8ae097446fb79e8c2fed908f6bd2f47c5fdd Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 10 Feb 2024 19:55:50 +0100 Subject: [PATCH 066/167] small changes ... --- .circleci/config.yml | 18 +++++++++++++++++- README.md | 14 +++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 49c239253..e31800a07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,20 @@ jobs: type: string steps: - checkout + + - run: + name: Display pipeline.* values + command: | + echo 'pipeline.git.branch: <>' + echo 'pipeline.git.revision: <>' + echo 'pipeline.id: <>' + echo 'pipeline.project.git_url: <>' + echo 'pipeline.trigger_source: <>' + echo 'pipeline.schedule.name:<< pipeline.schedule.name >>' + echo 'pipeline.schedule.id:<< pipeline.schedule.id >>' + echo 'pipeline.trigger_parameters.circleci.event_type:<< pipeline.trigger_parameters.circleci.event_type >>' + echo 'pipeline.trigger_parameters.github_app.type:<< pipeline.trigger_parameters.github_app.type >>' + - docker/check: registry: docker.io docker-username: DOCKERHUB_USERNAME @@ -48,6 +62,7 @@ jobs: - run: tools/install_dive.sh - run: tools/environment_init.sh - run: make check_version + - run: name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists command: | @@ -96,7 +111,8 @@ jobs: workflows: build-deploy: -# AND triggered by weekly from the app.circleci.com UI +# AND triggered by the app.circleci.com UI +# daily run : Repeats everyday every month ; 6:00am UTC, 1 (once per hour). jobs: - build-arm64: matrix: diff --git a/README.md b/README.md index 2fb6c06d2..aec8157af 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ We provide multi-platform image support for the following architectures: - `amd64`: Also known as x86-64. - Use `--platform=linux/amd64` when specifying the platform. -- `arm64`: Also known as AArch64. +- `arm64`: Also known as AArch64. - Use `--platform=linux/arm64` when specifying the platform. Notes: @@ -44,12 +44,20 @@ Notes: - The `arm64` architecture support is still experimental. Please refer to the 'arch' column in the version information to determine whether an `arm64` version is available for a specific release. - We currently do not support 32-bit architectures. Our images are only available for 64-bit architectures. +## Build Status + +| Arch | Build system | Status| +| ---- | :-: | :-: | +| Amd64| [GithubCI-logs](https://github.com/ImreSamu/docker-postgis/actions/workflows/main.yml) | [![Build PostGIS images](https://github.com/ImreSamu/docker-postgis/actions/workflows/main.yml/badge.svg)](https://github.com/ImreSamu/docker-postgis/actions/workflows/main.yml) | +| Arm64 | [CircleCI-logs](https://app.circleci.com/pipelines/github/ImreSamu/docker-postgis) | [![CircleCI](https://dl.circleci.com/status-badge/img/gh/ImreSamu/docker-postgis/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/ImreSamu/docker-postgis/tree/master) | + ### 🌟Recommended Versions for New Users For those new to PostGIS, we recommend the following image versions: -- `imresamu/postgis:15-3.4`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. -- `imresamu/postgis:15-3.4-bundle`: This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. +- `imresamu/postgis:16-3.4`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. +- `imresamu/postgis:16-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal +- `imresamu/postgis:16-3.4-bundle0-bookworm`: (experimental) This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. ### 🥇Debian - bookworm (recommended) From 13c8cbb68aa3bf7ec5670c44f350aae7285579fa Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 10 Feb 2024 19:57:55 +0100 Subject: [PATCH 067/167] fix circleci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e31800a07..d67ff277f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,6 @@ jobs: echo 'pipeline.trigger_source: <>' echo 'pipeline.schedule.name:<< pipeline.schedule.name >>' echo 'pipeline.schedule.id:<< pipeline.schedule.id >>' - echo 'pipeline.trigger_parameters.circleci.event_type:<< pipeline.trigger_parameters.circleci.event_type >>' echo 'pipeline.trigger_parameters.github_app.type:<< pipeline.trigger_parameters.github_app.type >>' - docker/check: From 1428634378bb9dbcc0ed6796d8185b79e89e299b Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 10 Feb 2024 19:58:46 +0100 Subject: [PATCH 068/167] fix circleci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d67ff277f..4259a969d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,6 @@ jobs: echo 'pipeline.trigger_source: <>' echo 'pipeline.schedule.name:<< pipeline.schedule.name >>' echo 'pipeline.schedule.id:<< pipeline.schedule.id >>' - echo 'pipeline.trigger_parameters.github_app.type:<< pipeline.trigger_parameters.github_app.type >>' - docker/check: registry: docker.io From e27f59de2aad8d719d98dfc28796b1817fe47bd1 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 11 Feb 2024 02:36:58 +0100 Subject: [PATCH 069/167] add arrow,parquet to gdal (master template) --- 14-l3.1.9gcp/bookworm/Dockerfile | 78 +++++++++++++++++++++++++++----- 15-master/bookworm/Dockerfile | 78 +++++++++++++++++++++++++++----- 15-recent/bookworm/Dockerfile | 78 +++++++++++++++++++++++++++----- 16-master/bookworm/Dockerfile | 78 +++++++++++++++++++++++++++----- 16-recent/bookworm/Dockerfile | 78 +++++++++++++++++++++++++++----- Dockerfile.master.template | 78 +++++++++++++++++++++++++++----- README.md | 2 +- 7 files changed, 403 insertions(+), 67 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index d4a0400d1..629694f3e 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -33,6 +33,9 @@ ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -40,6 +43,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -103,6 +131,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -286,7 +316,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -327,12 +371,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -342,6 +389,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -349,21 +397,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -396,14 +438,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -432,12 +486,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 554c0c71e..484076a6b 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -33,6 +33,9 @@ ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -40,6 +43,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -103,6 +131,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -286,7 +316,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -327,12 +371,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -342,6 +389,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -349,21 +397,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -396,14 +438,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -432,12 +486,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index f8d0fb1a6..49c69cf2e 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -33,6 +33,9 @@ ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -40,6 +43,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -103,6 +131,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -286,7 +316,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -327,12 +371,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -342,6 +389,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -349,21 +397,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -396,14 +438,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -432,12 +486,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index cae9c24a9..e6166b936 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -33,6 +33,9 @@ ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -40,6 +43,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -103,6 +131,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -286,7 +316,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -327,12 +371,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -342,6 +389,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -349,21 +397,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -396,14 +438,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -432,12 +486,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 0f137f6fe..0b06baee2 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -33,6 +33,9 @@ ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -40,6 +43,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -103,6 +131,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -286,7 +316,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -327,12 +371,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -342,6 +389,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -349,21 +397,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -396,14 +438,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -432,12 +486,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.master.template b/Dockerfile.master.template index fec9937ca..b9f8a54ac 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -28,6 +28,9 @@ ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} ARG PGIS1_CMAKE_BUILD_TYPE=Release +ARG PGIS1_ARROW_VERSION=15.0.0-1 +ARG PGIS1_ARROW_SOVERSION=1500 + FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / @@ -35,6 +38,31 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' > /etc/apt/sources.list.d/backports.list \ + \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + # apt-get install RUN set -eux \ && apt-get update \ @@ -102,6 +130,8 @@ RUN set -eux \ libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ + libspatialite-dev \ + libheif-dev \ libwebp-dev \ libzstd-dev @@ -285,7 +315,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 +ARG PGIS1_ARROW_VERSION +ARG PGIS1_ARROW_SOVERSION + +RUN apt-get install -y --no-install-recommends \ + # Install Arrow C++ \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + RUN set -eux \ + && ldconfig \ && cd /usr/src \ && mkdir gdal \ && cd gdal \ @@ -326,12 +370,15 @@ RUN set -eux \ && mkdir build \ && cd build \ # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ -DBUILD_DOCS=OFF \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ -# -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -341,6 +388,7 @@ RUN set -eux \ -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ @@ -348,21 +396,15 @@ RUN set -eux \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -# -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ - \ - # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 - # -DRENAME_INTERNAL_GEOTIFF_SYMBOLS=ON \ - -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_HEIF=OFF \ - -DGDAL_USE_SPATIALITE=OFF \ ; \ fi \ \ @@ -395,14 +437,26 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION +ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # add backports \ + && echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' > /etc/apt/sources.list.d/backports.list \ + # Install Arrow C++ && apt-get update \ - && apt-get install -y --no-install-recommends \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ libboost-chrono${PGIS1_BOOST_VERSION} \ @@ -439,12 +493,14 @@ RUN set -eux \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ + libheif1 \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + libspatialite7 \ netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index aec8157af..afbc24696 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-10) +## Versions (2024-02-11) We provide multi-platform image support for the following architectures: From 9b8b6d59f24cd7534f0a5ac67c9828efbc848bac Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 11 Feb 2024 16:47:52 +0100 Subject: [PATCH 070/167] add GDAL_BUILD minimal options - to avoid GDAL build errors, fix 4-l3.1.9gcp --- 14-l3.1.9gcp/bookworm/Dockerfile | 104 +++---------------- 15-master/bookworm/Dockerfile | 144 +++++++++++++------------- 15-recent/bookworm/Dockerfile | 144 +++++++++++++------------- 16-master/bookworm/Dockerfile | 144 +++++++++++++------------- 16-recent/bookworm/Dockerfile | 144 +++++++++++++------------- Dockerfile.master.template | 168 +++++++++++++++++-------------- locked.yml | 1 + test/tests/postgis-basics/run.sh | 12 +++ versions.json | 5 + versions.sh | 3 + 10 files changed, 420 insertions(+), 449 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 629694f3e..ea63869e4 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -29,12 +29,15 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=0e993d9744ecaa2f146bf62c43aecc61809a43ef ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f +ARG PGIS1_GDAL_BUILD=minimal + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 +# gdal_build: +# - minimal ; no arrow, no parquet, no extra dependencies +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -43,31 +46,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -120,19 +98,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -316,18 +283,10 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION -RUN apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} +# + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -378,34 +337,20 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ - -DGDAL_USE_ARROW=ON \ - -DGDAL_USE_ARROWDATASET=ON \ - -DGDAL_USE_BLOSC=ON \ - -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ -DGDAL_USE_DEFLATE=ON \ -DGDAL_USE_EXPAT=ON \ - -DGDAL_USE_FREEXL=ON \ - -DGDAL_USE_FYBA=ON \ -DGDAL_USE_GEOS=ON \ - -DGDAL_USE_HDF5=ON \ - -DGDAL_USE_HEIF=ON \ -DGDAL_USE_JSONC=ON \ - -DGDAL_USE_LERC_INTERNAL=ON \ - -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ - -DGDAL_USE_NETCDF=ON \ - -DGDAL_USE_OPENJPEG=ON \ - -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ - -DGDAL_USE_QHULL=ON \ - -DGDAL_USE_SPATIALITE=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ +# minimal GDAL build .. ; \ fi \ \ @@ -438,25 +383,17 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +# minimal GDAL build; so no need extra dependencies + + RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -480,21 +417,6 @@ RUN set -eux \ libtiff6 \ libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ - libcfitsio10 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -691,6 +613,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 484076a6b..14edbff1a 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -29,12 +29,16 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_BUILD=with_extra + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +# gdal_build: ARG PGIS1_ARROW_VERSION=15.0.0-1 ARG PGIS1_ARROW_SOVERSION=1500 +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -43,31 +47,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -120,19 +99,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -316,10 +284,20 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 + ARG PGIS1_ARROW_VERSION ARG PGIS1_ARROW_SOVERSION - -RUN apt-get install -y --no-install-recommends \ +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -327,7 +305,21 @@ RUN apt-get install -y --no-install-recommends \ libarrow-dev=${PGIS1_ARROW_VERSION} \ libparquet-dev=${PGIS1_ARROW_VERSION} \ libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -378,34 +370,35 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ -DGDAL_USE_ARROW=ON \ -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ -DGDAL_USE_FREEXL=ON \ -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ ; \ fi \ \ @@ -438,16 +431,15 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +# Install Arrow + Parquet + other GDAL extra dependencies +ARG PGIS1_ARROW_SOVERSION RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ + # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ @@ -457,6 +449,29 @@ RUN set -eux \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -480,21 +495,6 @@ RUN set -eux \ libtiff6 \ libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ - libcfitsio10 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -691,6 +691,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 49c69cf2e..074c8867f 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -29,12 +29,16 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f +ARG PGIS1_GDAL_BUILD=with_extra + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +# gdal_build: ARG PGIS1_ARROW_VERSION=15.0.0-1 ARG PGIS1_ARROW_SOVERSION=1500 +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -43,31 +47,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -120,19 +99,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -316,10 +284,20 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 + ARG PGIS1_ARROW_VERSION ARG PGIS1_ARROW_SOVERSION - -RUN apt-get install -y --no-install-recommends \ +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -327,7 +305,21 @@ RUN apt-get install -y --no-install-recommends \ libarrow-dev=${PGIS1_ARROW_VERSION} \ libparquet-dev=${PGIS1_ARROW_VERSION} \ libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -378,34 +370,35 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ -DGDAL_USE_ARROW=ON \ -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ -DGDAL_USE_FREEXL=ON \ -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ ; \ fi \ \ @@ -438,16 +431,15 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +# Install Arrow + Parquet + other GDAL extra dependencies +ARG PGIS1_ARROW_SOVERSION RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ + # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ @@ -457,6 +449,29 @@ RUN set -eux \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -480,21 +495,6 @@ RUN set -eux \ libtiff6 \ libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ - libcfitsio10 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -691,6 +691,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index e6166b936..c1af08f4a 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -29,12 +29,16 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_BUILD=with_extra + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +# gdal_build: ARG PGIS1_ARROW_VERSION=15.0.0-1 ARG PGIS1_ARROW_SOVERSION=1500 +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -43,31 +47,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -120,19 +99,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -316,10 +284,20 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 + ARG PGIS1_ARROW_VERSION ARG PGIS1_ARROW_SOVERSION - -RUN apt-get install -y --no-install-recommends \ +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -327,7 +305,21 @@ RUN apt-get install -y --no-install-recommends \ libarrow-dev=${PGIS1_ARROW_VERSION} \ libparquet-dev=${PGIS1_ARROW_VERSION} \ libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -378,34 +370,35 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ -DGDAL_USE_ARROW=ON \ -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ -DGDAL_USE_FREEXL=ON \ -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ ; \ fi \ \ @@ -438,16 +431,15 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +# Install Arrow + Parquet + other GDAL extra dependencies +ARG PGIS1_ARROW_SOVERSION RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ + # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ @@ -457,6 +449,29 @@ RUN set -eux \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -480,21 +495,6 @@ RUN set -eux \ libtiff6 \ libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ - libcfitsio10 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -691,6 +691,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 0b06baee2..393441904 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -29,12 +29,16 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f +ARG PGIS1_GDAL_BUILD=with_extra + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release +# gdal_build: ARG PGIS1_ARROW_VERSION=15.0.0-1 ARG PGIS1_ARROW_SOVERSION=1500 +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -43,31 +47,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -120,19 +99,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -316,10 +284,20 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 + ARG PGIS1_ARROW_VERSION ARG PGIS1_ARROW_SOVERSION - -RUN apt-get install -y --no-install-recommends \ +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -327,7 +305,21 @@ RUN apt-get install -y --no-install-recommends \ libarrow-dev=${PGIS1_ARROW_VERSION} \ libparquet-dev=${PGIS1_ARROW_VERSION} \ libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -378,34 +370,35 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ -DGDAL_USE_ARROW=ON \ -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ -DGDAL_USE_FREEXL=ON \ -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ ; \ fi \ \ @@ -438,16 +431,15 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +# Install Arrow + Parquet + other GDAL extra dependencies +ARG PGIS1_ARROW_SOVERSION RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ + # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ @@ -457,6 +449,29 @@ RUN set -eux \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -480,21 +495,6 @@ RUN set -eux \ libtiff6 \ libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ - libcfitsio10 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -691,6 +691,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/Dockerfile.master.template b/Dockerfile.master.template index b9f8a54ac..44915bd5d 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -24,12 +24,20 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1={{ .[env.variant].PROJ_CHECKOUT_SHA1 }} ARG PGIS1_SFCGAL_CHECKOUT_SHA1={{ .[env.variant].SFCGAL_CHECKOUT_SHA1 }} ARG PGIS1_CGAL_CHECKOUT_SHA1={{ .[env.variant].CGAL_CHECKOUT_SHA1 }} +ARG PGIS1_GDAL_BUILD={{ .[env.variant].GDAL_BUILD }} + ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} ARG PGIS1_CMAKE_BUILD_TYPE=Release +# gdal_build: +{{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} ARG PGIS1_ARROW_VERSION=15.0.0-1 ARG PGIS1_ARROW_SOVERSION=1500 +{{ ) else ( -}} +# - minimal ; no arrow, no parquet, no extra dependencies +{{ ) end -}} +# -- FROM ${PGIS1_BASE_IMAGE} as builder @@ -38,31 +46,6 @@ WORKDIR / ARG PGIS1_BOOST_VERSION ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' > /etc/apt/sources.list.d/backports.list \ - \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ - && apt-get update \ - && apt-cache showpkg libarrow-dev \ - && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} - # apt-get install RUN set -eux \ && apt-get update \ @@ -119,19 +102,8 @@ RUN set -eux \ protobuf-c-compiler \ xsltproc \ # gdal+ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libkml-dev \ liblz4-dev \ liblzma-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libqhull-dev \ - libspatialite-dev \ - libheif-dev \ libwebp-dev \ libzstd-dev @@ -315,10 +287,21 @@ ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 + +{{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} ARG PGIS1_ARROW_VERSION ARG PGIS1_ARROW_SOVERSION - -RUN apt-get install -y --no-install-recommends \ +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && apt-get update \ + && apt-cache showpkg libarrow-dev \ + && apt-get install -y --no-install-recommends \ # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -326,7 +309,24 @@ RUN apt-get install -y --no-install-recommends \ libarrow-dev=${PGIS1_ARROW_VERSION} \ libparquet-dev=${PGIS1_ARROW_VERSION} \ libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libqhull-dev \ + libspatialite-dev +{{ ) else ( -}} +# +{{ ) end -}} + +## GDAL_build-end RUN set -eux \ && ldconfig \ @@ -377,34 +377,39 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ +{{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} + \ -DGDAL_USE_ARROW=ON \ -DGDAL_USE_ARROWDATASET=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ -DGDAL_USE_FREEXL=ON \ -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_GEOS=ON \ -DGDAL_USE_HDF5=ON \ -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LERC_INTERNAL=ON \ -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LZ4=ON \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ +{{ ) else ( -}} +# minimal GDAL build .. +{{ ) end -}} ; \ fi \ \ @@ -437,16 +442,16 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE ARG PGIS1_BOOST_VERSION -ARG PGIS1_ARROW_SOVERSION ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +{{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} +# Install Arrow + Parquet + other GDAL extra dependencies +ARG PGIS1_ARROW_SOVERSION RUN set -eux \ - # add backports \ - && echo 'deb http://deb.debian.org/debian {{ env.variant }}-backports main' > /etc/apt/sources.list.d/backports.list \ - # Install Arrow C++ + # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ @@ -456,6 +461,36 @@ RUN set -eux \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ +{{ if env.variant != "bullseye" then ( -}} + libcfitsio10 \ +{{ ) else ( -}} + libcfitsio9 \ +{{ ) end -}} + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* +{{ ) else ( -}} +# minimal GDAL build; so no need extra dependencies +{{ ) end -}} + + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ \ curl \ libboost-atomic${PGIS1_BOOST_VERSION} \ @@ -483,25 +518,6 @@ RUN set -eux \ {{ ) end -}} libxml2 \ sqlite3 \ - # gdal+ - libblosc1 \ -{{ if env.variant != "bullseye" then ( -}} - libcfitsio10 \ -{{ ) else ( -}} - libcfitsio9 \ -{{ ) end -}} - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -698,6 +714,8 @@ RUN set -eux \ && ogr2ogr --version \ && proj \ && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ \ # Is the "ca-certificates" package installed? (for accessing remote raster files) # https://github.com/postgis/docker-postgis/issues/307 diff --git a/locked.yml b/locked.yml index eddb27070..5c7ec33e8 100644 --- a/locked.yml +++ b/locked.yml @@ -18,6 +18,7 @@ POSTGIS_CHECKOUT_SHA1: '95a641b1747721d7004c5f0133b918d034035319' PROJ_CHECKOUT: 'tags/6.3.1' PROJ_CHECKOUT_SHA1: '0e993d9744ecaa2f146bf62c43aecc61809a43ef' + GDAL_BUILD: 'minimal' GDAL_CHECKOUT: 'tags/v3.6.4' GDAL_CHECKOUT_SHA1: '7ca88116f5a46d429251361634eb24629f315076' GEOS_CHECKOUT: 'tags/3.6.6' diff --git a/test/tests/postgis-basics/run.sh b/test/tests/postgis-basics/run.sh index 44473ce1f..a64ec063a 100755 --- a/test/tests/postgis-basics/run.sh +++ b/test/tests/postgis-basics/run.sh @@ -53,3 +53,15 @@ else echo "address_standardizer extension test failed, returned response is $response" exit 1 fi + +echo "CREATE EXTENSION IF NOT EXISTS postgis;" | psql +echo "CREATE EXTENSION IF NOT EXISTS postgis_raster;" | psql +echo "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;" | psql +echo "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;" | psql +echo "CREATE EXTENSION IF NOT EXISTS address_standardizer;" | psql +echo "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;" | psql +echo "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;" | psql +echo "CREATE EXTENSION IF NOT EXISTS postgis_topology;" | psql +echo "SELECT version();" | psql +echo "SELECT PostGIS_Full_Version();" | psql +echo "\dx" | psql diff --git a/versions.json b/versions.json index 8679e4cea..7821c6edd 100644 --- a/versions.json +++ b/versions.json @@ -467,6 +467,7 @@ "SFCGAL_CHECKOUT_SHA1": "nocheck", "PROJ_CHECKOUT": "master", "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", "GEOS_CHECKOUT": "main", @@ -488,6 +489,7 @@ "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.8.3", "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", "GEOS_CHECKOUT": "tags/3.12.1", @@ -613,6 +615,7 @@ "SFCGAL_CHECKOUT_SHA1": "nocheck", "PROJ_CHECKOUT": "master", "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", "GEOS_CHECKOUT": "main", @@ -634,6 +637,7 @@ "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.8.3", "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", "GEOS_CHECKOUT": "tags/3.12.1", @@ -660,6 +664,7 @@ "POSTGIS_CHECKOUT_SHA1": "95a641b1747721d7004c5f0133b918d034035319", "PROJ_CHECKOUT": "tags/6.3.1", "PROJ_CHECKOUT_SHA1": "0e993d9744ecaa2f146bf62c43aecc61809a43ef", + "GDAL_BUILD": "minimal", "GDAL_CHECKOUT": "tags/v3.6.4", "GDAL_CHECKOUT_SHA1": "7ca88116f5a46d429251361634eb24629f315076", "GEOS_CHECKOUT": "tags/3.6.6", diff --git a/versions.sh b/versions.sh index 68c4f3ebe..3ca39413e 100755 --- a/versions.sh +++ b/versions.sh @@ -599,6 +599,7 @@ for version in "${versions[@]}"; do printf " SFCGAL_CHECKOUT_SHA1: 'nocheck'\n" printf " PROJ_CHECKOUT: '%s'\n" "$PROJ_BRANCH" printf " PROJ_CHECKOUT_SHA1: 'nocheck'\n" + printf " GDAL_BUILD: '%s'\n" "with_extra" printf " GDAL_CHECKOUT: '%s'\n" "$GDAL_BRANCH" printf " GDAL_CHECKOUT_SHA1: 'nocheck'\n" printf " GEOS_CHECKOUT: '%s'\n" "$GEOS_BRANCH" @@ -612,6 +613,7 @@ for version in "${versions[@]}"; do printf " SFCGAL_CHECKOUT_SHA1: '%s'\n" "$sfcgalGitHash" printf " PROJ_CHECKOUT: '%s'\n" "$projGitHash" printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$projGitHash" + printf " GDAL_BUILD: '%s'\n" "with_extra" printf " GDAL_CHECKOUT: '%s'\n" "$gdalGitHash" printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$gdalGitHash" printf " GEOS_CHECKOUT: '%s'\n" "$geosGitHash" @@ -631,6 +633,7 @@ for version in "${versions[@]}"; do printf " POSTGIS_CHECKOUT_SHA1: '%s'\n" "$lastversion_postgis_sha1" printf " PROJ_CHECKOUT: 'tags/%s'\n" "$lastversion_proj" printf " PROJ_CHECKOUT_SHA1: '%s'\n" "$lastversion_proj_sha1" + printf " GDAL_BUILD: '%s'\n" "with_extra" printf " GDAL_CHECKOUT: 'tags/%s'\n" "$lastversion_gdal" printf " GDAL_CHECKOUT_SHA1: '%s'\n" "$lastversion_gdal_sha1" printf " GEOS_CHECKOUT: 'tags/%s'\n" "$lastversion_geos" From 4d456b774162ebc5759084a86c960b1cfccb74e6 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 12 Feb 2024 00:43:52 +0100 Subject: [PATCH 071/167] add more GDAL config --- 14-l3.1.9gcp/bookworm/Dockerfile | 6 +++++- 15-master/bookworm/Dockerfile | 4 ++++ 15-recent/bookworm/Dockerfile | 4 ++++ 16-master/bookworm/Dockerfile | 4 ++++ 16-recent/bookworm/Dockerfile | 4 ++++ Dockerfile.master.template | 6 +++++- README.md | 2 +- 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index ea63869e4..35ed31d6e 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -284,7 +284,7 @@ ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -# +# ## GDAL_build-end @@ -467,6 +467,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -528,6 +531,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 14edbff1a..49383cc1a 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -545,6 +545,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -606,6 +609,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 074c8867f..300150ebc 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -545,6 +545,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -606,6 +609,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index c1af08f4a..a0ba6361d 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -545,6 +545,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -606,6 +609,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 393441904..2348148f2 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -545,6 +545,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -606,6 +609,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 44915bd5d..a348d9db9 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -323,7 +323,7 @@ RUN set -eux \ libqhull-dev \ libspatialite-dev {{ ) else ( -}} -# +# {{ ) end -}} ## GDAL_build-end @@ -568,6 +568,9 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 +# Specify GDAL config path for PostGIS build +ENV GDAL_CONFIG /usr/local/bin/gdal-config + # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 RUN set -eux \ @@ -629,6 +632,7 @@ RUN set -eux \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/README.md b/README.md index afbc24696..447459de9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-11) +## Versions (2024-02-12) We provide multi-platform image support for the following architectures: From a4b9cff6db2e0fee969b9143bb2cefd9f48933af Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 18 Feb 2024 23:13:55 +0100 Subject: [PATCH 072/167] update.sh --- .github/workflows/main.yml | 28 +++++----- 12-3.4/bookworm/Dockerfile | 4 +- 12-3.4/bookworm/tags | 2 +- 12-3.4/bullseye/Dockerfile | 4 +- 12-3.4/bullseye/tags | 2 +- 13-3.4/bookworm/Dockerfile | 4 +- 13-3.4/bookworm/tags | 2 +- 13-3.4/bullseye/Dockerfile | 4 +- 13-3.4/bullseye/tags | 2 +- 14-3.4/bookworm/Dockerfile | 4 +- 14-3.4/bookworm/tags | 2 +- 14-3.4/bullseye/Dockerfile | 4 +- 14-3.4/bullseye/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 6 +-- 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/bookworm/Dockerfile | 4 +- 15-3.4/bookworm/tags | 2 +- 15-3.4/bullseye/Dockerfile | 4 +- 15-3.4/bullseye/tags | 2 +- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 6 +-- 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/bookworm/Dockerfile | 4 +- 16-3.4/bookworm/tags | 2 +- 16-3.4/bullseye/Dockerfile | 4 +- 16-3.4/bullseye/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- README.md | 30 +++++------ manifest.sh | 84 +++++++++++++++--------------- versions.json | 76 +++++++++++++-------------- 32 files changed, 153 insertions(+), 153 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e0cd3553..220cba90e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,41 +30,41 @@ jobs: - { version: "12-3.3", variant: "alpine3.18", postgres: "12", postgis: "3.3", arch: "amd64 arm64", tags: "12-3.3-alpine3.18 12-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } - - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", readme_group: "bookworm" } - - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", readme_group: "bookworm" } + - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.2-bullseye", readme_group: "bullseye" } - { version: "13-3.0", variant: "alpine3.18", postgres: "13", postgis: "3.0", arch: "amd64 arm64", tags: "13-3.0-alpine3.18 13-3.0.11-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.1", variant: "alpine3.18", postgres: "13", postgis: "3.1", arch: "amd64 arm64", tags: "13-3.1-alpine3.18 13-3.1.11-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.2", variant: "alpine3.18", postgres: "13", postgis: "3.2", arch: "amd64 arm64", tags: "13-3.2-alpine3.18 13-3.2.7-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.3", variant: "alpine3.18", postgres: "13", postgis: "3.3", arch: "amd64 arm64", tags: "13-3.3-alpine3.18 13-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } - - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", readme_group: "bookworm" } - - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", readme_group: "bookworm" } + - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.2-bullseye", readme_group: "bullseye" } - { version: "14-3.1", variant: "alpine3.18", postgres: "14", postgis: "3.1", arch: "amd64 arm64", tags: "14-3.1-alpine3.18 14-3.1.11-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.2", variant: "alpine3.18", postgres: "14", postgis: "3.2", arch: "amd64 arm64", tags: "14-3.2-alpine3.18 14-3.2.7-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.3", variant: "alpine3.18", postgres: "14", postgis: "3.3", arch: "amd64 arm64", tags: "14-3.3-alpine3.18 14-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } - - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", readme_group: "bookworm" } - - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.1-bullseye", readme_group: "bullseye" } + - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", readme_group: "bookworm" } + - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.2-bullseye", readme_group: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm", postgres: "14", postgis: "l3.1.9gcp", arch: "amd64 arm64", tags: "14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm", readme_group: "locked" } - { version: "15-3.2", variant: "alpine3.18", postgres: "15", postgis: "3.2", arch: "amd64 arm64", tags: "15-3.2-alpine3.18 15-3.2.7-alpine3.18", readme_group: "alpine3.18" } - { version: "15-3.3", variant: "alpine3.18", postgres: "15", postgis: "3.3", arch: "amd64 arm64", tags: "15-3.3-alpine3.18 15-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } -# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", readme_group: "bookworm" } - - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } +# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", readme_group: "bookworm" } + - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.2-bullseye", readme_group: "bullseye" } + - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } -# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", readme_group: "bookworm" } - - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.1-bullseye", readme_group: "bullseye" } - - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } +# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", readme_group: "bookworm" } + - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.2-bullseye", readme_group: "bullseye" } + - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile index 8daa36909..3743e48b7 100644 --- a/12-3.4/bookworm/Dockerfile +++ b/12-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags index 7a98fdd2b..0088f5ff7 100644 --- a/12-3.4/bookworm/tags +++ b/12-3.4/bookworm/tags @@ -1 +1 @@ -12-3.4-bookworm 12-3.4.1-bookworm 12-3.4 +12-3.4-bookworm 12-3.4.2-bookworm 12-3.4 diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile index b8cf11e4b..3bf932ca1 100644 --- a/12-3.4/bullseye/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags index ad816812d..26c97b435 100644 --- a/12-3.4/bullseye/tags +++ b/12-3.4/bullseye/tags @@ -1 +1 @@ -12-3.4-bullseye 12-3.4.1-bullseye +12-3.4-bullseye 12-3.4.2-bullseye diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile index 899ac0c10..12020cf16 100644 --- a/13-3.4/bookworm/Dockerfile +++ b/13-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags index 221b9f2e1..d35a8e788 100644 --- a/13-3.4/bookworm/tags +++ b/13-3.4/bookworm/tags @@ -1 +1 @@ -13-3.4-bookworm 13-3.4.1-bookworm 13-3.4 +13-3.4-bookworm 13-3.4.2-bookworm 13-3.4 diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile index 3b563ec08..a554eb21f 100644 --- a/13-3.4/bullseye/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags index 8afde38f2..37db47727 100644 --- a/13-3.4/bullseye/tags +++ b/13-3.4/bullseye/tags @@ -1 +1 @@ -13-3.4-bullseye 13-3.4.1-bullseye +13-3.4-bullseye 13-3.4.2-bullseye diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile index 51e4d3490..58d9c8854 100644 --- a/14-3.4/bookworm/Dockerfile +++ b/14-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags index c6327df75..f44af9937 100644 --- a/14-3.4/bookworm/tags +++ b/14-3.4/bookworm/tags @@ -1 +1 @@ -14-3.4-bookworm 14-3.4.1-bookworm 14-3.4 +14-3.4-bookworm 14-3.4.2-bookworm 14-3.4 diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile index 2bd7f64e5..45a609314 100644 --- a/14-3.4/bullseye/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags index 30fbb178d..cd8bb9fee 100644 --- a/14-3.4/bullseye/tags +++ b/14-3.4/bullseye/tags @@ -1 +1 @@ -14-3.4-bullseye 14-3.4.1-bullseye +14-3.4-bullseye 14-3.4.2-bullseye diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index c9fbd0356..66b463816 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,14 +32,14 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=5ede370059550c9d11d3171950767ba11ebd3797 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=39616e838b1c540a7ed83b5243a980a9c21a4333 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.9.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index e0e7780e2..487b1a6b9 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0 +15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile index 66eff9c8b..85aeb569c 100644 --- a/15-3.4/bookworm/Dockerfile +++ b/15-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index 313c8e211..f45fa473e 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4-bookworm 15-3.4.1-bookworm 15-3.4 +15-3.4-bookworm 15-3.4.2-bookworm 15-3.4 diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile index b9756b32a..4a2d7ed74 100644 --- a/15-3.4/bullseye/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags index 50732a7e6..ca554ec60 100644 --- a/15-3.4/bullseye/tags +++ b/15-3.4/bullseye/tags @@ -1 +1 @@ -15-3.4-bullseye 15-3.4.1-bullseye +15-3.4-bullseye 15-3.4.2-bullseye diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 300150ebc..9df7d5b94 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 3db11d985..9973776d0 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index d23669548..b93ccce78 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,14 +32,14 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=5ede370059550c9d11d3171950767ba11ebd3797 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=39616e838b1c540a7ed83b5243a980a9c21a4333 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.9.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 0ea0c66f4..693b1526c 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0 +16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0 diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile index a40c2bb6b..31d631904 100644 --- a/16-3.4/bookworm/Dockerfile +++ b/16-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index a9c12e7a9..263a25f35 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest +16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile index a0e436112..11921c37f 100644 --- a/16-3.4/bullseye/Dockerfile +++ b/16-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags index 83171dda1..925db2db4 100644 --- a/16-3.4/bullseye/tags +++ b/16-3.4/bullseye/tags @@ -1 +1 @@ -16-3.4-bullseye 16-3.4.1-bullseye +16-3.4-bullseye 16-3.4.2-bullseye diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 2348148f2..ba5737017 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,14 +17,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=654f4907abbbf6bf4226d58a8c067d134eaf3ce9 +ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 70ff49019..2d657e68b 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 447459de9..d6e8b81ad 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-12) +## Versions (2024-02-18) We provide multi-platform image support for the following architectures: @@ -70,11 +70,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.1 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.1 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.1 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.1 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | ### 📘Debian - bullseye @@ -86,11 +86,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.1 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.1 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.1 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.1 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.1 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.3, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) @@ -117,8 +117,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.1-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.1 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.1-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.1 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | ### ⛰️Alpine 3.18 based diff --git a/manifest.sh b/manifest.sh index fec30551b..8e29dc2c2 100755 --- a/manifest.sh +++ b/manifest.sh @@ -110,11 +110,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ --target ${dockername}:12-3.4-bookworm || true -echo "manifest: ${dockername}:12-3.4.1-bookworm" +echo "manifest: ${dockername}:12-3.4.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.1-bookworm \ - --target ${dockername}:12-3.4.1-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.4.2-bookworm \ + --target ${dockername}:12-3.4.2-bookworm || true echo "manifest: ${dockername}:12-3.4" manifest-tool push from-args \ @@ -130,11 +130,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ --target ${dockername}:12-3.4-bullseye || true -echo "manifest: ${dockername}:12-3.4.1-bullseye" +echo "manifest: ${dockername}:12-3.4.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.1-bullseye \ - --target ${dockername}:12-3.4.1-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.4.2-bullseye \ + --target ${dockername}:12-3.4.2-bullseye || true # ----- 13-3.0-alpine3.18 ----- @@ -234,11 +234,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ --target ${dockername}:13-3.4-bookworm || true -echo "manifest: ${dockername}:13-3.4.1-bookworm" +echo "manifest: ${dockername}:13-3.4.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.1-bookworm \ - --target ${dockername}:13-3.4.1-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.4.2-bookworm \ + --target ${dockername}:13-3.4.2-bookworm || true echo "manifest: ${dockername}:13-3.4" manifest-tool push from-args \ @@ -254,11 +254,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ --target ${dockername}:13-3.4-bullseye || true -echo "manifest: ${dockername}:13-3.4.1-bullseye" +echo "manifest: ${dockername}:13-3.4.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.1-bullseye \ - --target ${dockername}:13-3.4.1-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.4.2-bullseye \ + --target ${dockername}:13-3.4.2-bullseye || true # ----- 14-3.1-alpine3.18 ----- @@ -344,11 +344,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ --target ${dockername}:14-3.4-bookworm || true -echo "manifest: ${dockername}:14-3.4.1-bookworm" +echo "manifest: ${dockername}:14-3.4.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.1-bookworm \ - --target ${dockername}:14-3.4.1-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4.2-bookworm \ + --target ${dockername}:14-3.4.2-bookworm || true echo "manifest: ${dockername}:14-3.4" manifest-tool push from-args \ @@ -364,11 +364,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ --target ${dockername}:14-3.4-bullseye || true -echo "manifest: ${dockername}:14-3.4.1-bullseye" +echo "manifest: ${dockername}:14-3.4.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.1-bullseye \ - --target ${dockername}:14-3.4.1-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.4.2-bullseye \ + --target ${dockername}:14-3.4.2-bullseye || true # ----- 14-l3.1.9gcp-bookworm ----- @@ -454,11 +454,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ --target ${dockername}:15-3.4-bookworm || true -echo "manifest: ${dockername}:15-3.4.1-bookworm" +echo "manifest: ${dockername}:15-3.4.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.1-bookworm \ - --target ${dockername}:15-3.4.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-bookworm \ + --target ${dockername}:15-3.4.2-bookworm || true echo "manifest: ${dockername}:15-3.4" manifest-tool push from-args \ @@ -474,11 +474,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ --target ${dockername}:15-3.4-bullseye || true -echo "manifest: ${dockername}:15-3.4.1-bullseye" +echo "manifest: ${dockername}:15-3.4.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.1-bullseye \ - --target ${dockername}:15-3.4.1-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-bullseye \ + --target ${dockername}:15-3.4.2-bullseye || true # ----- 15-3.4-bundle0-bookworm ----- @@ -488,11 +488,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ --target ${dockername}:15-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4.1-bundle0-bookworm" +echo "manifest: ${dockername}:15-3.4.2-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.1-bundle0-bookworm \ - --target ${dockername}:15-3.4.1-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-bundle0-bookworm \ + --target ${dockername}:15-3.4.2-bundle0-bookworm || true echo "manifest: ${dockername}:15-3.4-bundle0" manifest-tool push from-args \ @@ -522,11 +522,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -602,11 +602,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ --target ${dockername}:16-3.4-bookworm || true -echo "manifest: ${dockername}:16-3.4.1-bookworm" +echo "manifest: ${dockername}:16-3.4.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.1-bookworm \ - --target ${dockername}:16-3.4.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-bookworm \ + --target ${dockername}:16-3.4.2-bookworm || true echo "manifest: ${dockername}:16-3.4" manifest-tool push from-args \ @@ -628,11 +628,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ --target ${dockername}:16-3.4-bullseye || true -echo "manifest: ${dockername}:16-3.4.1-bullseye" +echo "manifest: ${dockername}:16-3.4.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.1-bullseye \ - --target ${dockername}:16-3.4.1-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-bullseye \ + --target ${dockername}:16-3.4.2-bullseye || true # ----- 16-3.4-bundle0-bookworm ----- @@ -642,11 +642,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ --target ${dockername}:16-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4.1-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.4.2-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.1-bundle0-bookworm \ - --target ${dockername}:16-3.4.1-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-bundle0-bookworm \ + --target ${dockername}:16-3.4.2-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.4-bundle0" manifest-tool push from-args \ @@ -682,11 +682,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 7821c6edd..6b84d2409 100644 --- a/versions.json +++ b/versions.json @@ -65,7 +65,7 @@ }, "12-3.4": { "bullseye": { - "tags": "12-3.4-bullseye 12-3.4.1-bullseye", + "tags": "12-3.4-bullseye 12-3.4.2-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "12", @@ -74,10 +74,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.4-bookworm 12-3.4.1-bookworm 12-3.4", + "tags": "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "12", @@ -86,7 +86,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "12-3.4-alpine3.18 12-3.4.2-alpine3.18", @@ -183,7 +183,7 @@ }, "13-3.4": { "bullseye": { - "tags": "13-3.4-bullseye 13-3.4.1-bullseye", + "tags": "13-3.4-bullseye 13-3.4.2-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "13", @@ -192,10 +192,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.4-bookworm 13-3.4.1-bookworm 13-3.4", + "tags": "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -204,7 +204,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "13-3.4-alpine3.18 13-3.4.2-alpine3.18", @@ -285,7 +285,7 @@ }, "14-3.4": { "bullseye": { - "tags": "14-3.4-bullseye 14-3.4.1-bullseye", + "tags": "14-3.4-bullseye 14-3.4.2-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "14", @@ -294,10 +294,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.4-bookworm 14-3.4.1-bookworm 14-3.4", + "tags": "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -306,7 +306,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "14-3.4-alpine3.18 14-3.4.2-alpine3.18", @@ -371,7 +371,7 @@ }, "15-3.4": { "bullseye": { - "tags": "15-3.4-bullseye 15-3.4.1-bullseye", + "tags": "15-3.4-bullseye 15-3.4.2-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "15", @@ -380,10 +380,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.1-bookworm 15-3.4", + "tags": "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -392,7 +392,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "15-3.4-alpine3.18 15-3.4.2-alpine3.18", @@ -425,7 +425,7 @@ }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.1-bundle0-bookworm 15-3.4-bundle0", + "tags": "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "15", @@ -439,14 +439,14 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.0", - "TIMESCALEDB_CHECKOUT_SHA1": "5ede370059550c9d11d3171950767ba11ebd3797", - "DUCKDB_CHECKOUT": "tags/v0.9.2", - "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", + "TIMESCALEDB_CHECKOUT": "tags/2.14.1", + "TIMESCALEDB_CHECKOUT_SHA1": "39616e838b1c540a7ed83b5243a980a9c21a4333", + "DUCKDB_CHECKOUT": "tags/v0.10.0", + "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } }, "15-master": { @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -490,8 +490,8 @@ "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.3", - "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", + "GDAL_CHECKOUT": "tags/v3.8.4", + "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -519,7 +519,7 @@ }, "16-3.4": { "bullseye": { - "tags": "16-3.4-bullseye 16-3.4.1-bullseye", + "tags": "16-3.4-bullseye 16-3.4.2-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "16", @@ -528,10 +528,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.1-bookworm 16-3.4 latest", + "tags": "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -540,7 +540,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.18": { "tags": "16-3.4-alpine3.18 16-3.4.2-alpine3.18", @@ -573,7 +573,7 @@ }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.1-bundle0-bookworm 16-3.4-bundle0 bundle0", + "tags": "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -587,14 +587,14 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.0", - "TIMESCALEDB_CHECKOUT_SHA1": "5ede370059550c9d11d3171950767ba11ebd3797", - "DUCKDB_CHECKOUT": "tags/v0.9.2", - "DUCKDB_CHECKOUT_SHA1": "3c695d7ba94d95d9facee48d395f46ed0bd72b46", + "TIMESCALEDB_CHECKOUT": "tags/2.14.1", + "TIMESCALEDB_CHECKOUT_SHA1": "39616e838b1c540a7ed83b5243a980a9c21a4333", + "DUCKDB_CHECKOUT": "tags/v0.10.0", + "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } }, "16-master": { @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.3-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -638,8 +638,8 @@ "PROJ_CHECKOUT": "tags/9.3.1", "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.3", - "GDAL_CHECKOUT_SHA1": "654f4907abbbf6bf4226d58a8c067d134eaf3ce9", + "GDAL_CHECKOUT": "tags/v3.8.4", + "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", From 8d59d2f69540d9ff2f0648ebec04ea19c80d73d9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 28 Feb 2024 17:48:58 +0100 Subject: [PATCH 073/167] update.sh - update CGAL --- .github/workflows/main.yml | 4 ++-- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 20 ++++++++++---------- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 220cba90e..7732c9649 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.2-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } @@ -64,7 +64,7 @@ jobs: - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.2-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 66b463816..914c8a647 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=39616e838b1c540a7ed83b5243a980a9c21a4333 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=8f27a70d054fc80c4bbc722d8df4b6b305a7e93d ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 9df7d5b94..7b1f56376 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -20,14 +20,14 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f +ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c ARG PGIS1_GDAL_BUILD=with_extra diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 9973776d0..de1bcd8f1 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index b93ccce78..39db3adef 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=39616e838b1c540a7ed83b5243a980a9c21a4333 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=8f27a70d054fc80c4bbc722d8df4b6b305a7e93d ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index ba5737017..5160d07a7 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -20,14 +20,14 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 -ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f +ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c ARG PGIS1_GDAL_BUILD=with_extra diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 2d657e68b..7f49272f1 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index d6e8b81ad..ba1c552fd 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-18) +## Versions (2024-02-28) We provide multi-platform image support for the following architectures: @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 8e29dc2c2..0b5335c6f 100755 --- a/manifest.sh +++ b/manifest.sh @@ -522,11 +522,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -682,11 +682,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 6b84d2409..b5b471fa6 100644 --- a/versions.json +++ b/versions.json @@ -439,8 +439,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.1", - "TIMESCALEDB_CHECKOUT_SHA1": "39616e838b1c540a7ed83b5243a980a9c21a4333", + "TIMESCALEDB_CHECKOUT": "tags/2.14.2", + "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", "DUCKDB_CHECKOUT": "tags/v0.10.0", "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -496,8 +496,8 @@ "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "CGAL_CHECKOUT": "tags/v5.6", - "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", + "CGAL_CHECKOUT": "tags/v5.6.1", + "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", "BOOST_VERSION": "1.74.0" } }, @@ -587,8 +587,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.1", - "TIMESCALEDB_CHECKOUT_SHA1": "39616e838b1c540a7ed83b5243a980a9c21a4333", + "TIMESCALEDB_CHECKOUT": "tags/2.14.2", + "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", "DUCKDB_CHECKOUT": "tags/v0.10.0", "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -644,8 +644,8 @@ "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", - "CGAL_CHECKOUT": "tags/v5.6", - "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", + "CGAL_CHECKOUT": "tags/v5.6.1", + "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", "BOOST_VERSION": "1.74.0" } }, From e1a0a7a7e04fa5bbb7a47b3f3117fb68bd90861c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 1 Mar 2024 19:15:40 +0100 Subject: [PATCH 074/167] update.sh; Proj 9.4 --- .github/workflows/main.yml | 4 ++-- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 24 ++++++++++++------------ versions.json | 12 ++++++------ 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7732c9649..a96b7f135 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.2-bullseye", readme_group: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } + - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.6-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.2-alpine3.18", readme_group: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } @@ -64,7 +64,7 @@ jobs: - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.2-bullseye", readme_group: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 7b1f56376..aab7f028d 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -18,14 +18,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 -ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a +ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index de1bcd8f1..f447f9f2f 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 5160d07a7..0f5e6d30b 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,14 +18,14 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 -ARG PGIS1_PROJ_CHECKOUT=tags/9.3.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0f2922e1bb6e98727f10e5a3720466710943963a +ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 7f49272f1..33bde95ff 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index ba1c552fd..3218928f8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-02-28) +## Versions (2024-03-01) We provide multi-platform image support for the following architectures: @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.3.1, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 0b5335c6f..dc7faa65b 100755 --- a/manifest.sh +++ b/manifest.sh @@ -522,17 +522,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ @@ -682,17 +682,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index b5b471fa6..b775e225d 100644 --- a/versions.json +++ b/versions.json @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -487,8 +487,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", - "PROJ_CHECKOUT": "tags/9.3.1", - "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "PROJ_CHECKOUT": "tags/9.4.0", + "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.8.4", "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.3.1-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.3-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -635,8 +635,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", - "PROJ_CHECKOUT": "tags/9.3.1", - "PROJ_CHECKOUT_SHA1": "0f2922e1bb6e98727f10e5a3720466710943963a", + "PROJ_CHECKOUT": "tags/9.4.0", + "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.8.4", "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", From 741feb29462947de4a261c0c948b5916394d1c46 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 5 Mar 2024 09:58:41 +0100 Subject: [PATCH 075/167] fix master in arm64, update mobilitydb --- 14-l3.1.9gcp/bookworm/Dockerfile | 6 ++++-- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 15-master/bookworm/Dockerfile | 6 ++++-- 15-recent/bookworm/Dockerfile | 6 ++++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-master/bookworm/Dockerfile | 6 ++++-- 16-recent/bookworm/Dockerfile | 6 ++++-- Dockerfile.master.template | 6 ++++-- README.md | 2 +- versions.json | 8 ++++---- 10 files changed, 33 insertions(+), 21 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 35ed31d6e..9d1c480b1 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -467,8 +467,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -528,10 +530,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 914c8a647..58b5485f8 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=ce47e74d0afa2285997cb5f4b40f23da8fd4f191 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc2 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=c730be775071b7da37916970b4be41f710149daf ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 49383cc1a..ae4f87054 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -545,8 +545,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -606,10 +608,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index aab7f028d..dd9094baa 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -545,8 +545,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -606,10 +608,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 39db3adef..6d452c029 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=ce47e74d0afa2285997cb5f4b40f23da8fd4f191 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc2 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=c730be775071b7da37916970b4be41f710149daf ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a0ba6361d..aea6326a0 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -545,8 +545,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -606,10 +608,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 0f5e6d30b..be9bb029f 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -545,8 +545,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -606,10 +608,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index a348d9db9..17284bf95 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -568,8 +568,10 @@ RUN set -eux \ && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 -# Specify GDAL config path for PostGIS build +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables # https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 @@ -629,10 +631,10 @@ RUN set -eux \ fi; \ fi \ && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ && ./autogen.sh \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ldconfig \ && ./configure \ --enable-lto \ && make -j$(nproc) \ diff --git a/README.md b/README.md index 3218928f8..ccb547582 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-03-01) +## Versions (2024-03-05) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index b775e225d..19c8f400e 100644 --- a/versions.json +++ b/versions.json @@ -433,8 +433,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc1", - "MOBILITYDB_CHECKOUT_SHA1": "ce47e74d0afa2285997cb5f4b40f23da8fd4f191", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc2", + "MOBILITYDB_CHECKOUT_SHA1": "c730be775071b7da37916970b4be41f710149daf", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", @@ -581,8 +581,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc1", - "MOBILITYDB_CHECKOUT_SHA1": "ce47e74d0afa2285997cb5f4b40f23da8fd4f191", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc2", + "MOBILITYDB_CHECKOUT_SHA1": "c730be775071b7da37916970b4be41f710149daf", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", From cfa3eb352a726741136681dbae26e4f3bcb0447f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 11 Mar 2024 09:39:31 +0100 Subject: [PATCH 076/167] fix master.template Arrow install, detecting correct dependency. for example: libarrow-dev=15.0.1-1 Depends: libarrow1500 and not libarrow1501 as expected. --- 14-l3.1.9gcp/bookworm/Dockerfile | 6 +-- 15-master/bookworm/Dockerfile | 84 ++++++++++++++++------------- 15-recent/bookworm/Dockerfile | 84 ++++++++++++++++------------- 16-master/bookworm/Dockerfile | 84 ++++++++++++++++------------- 16-recent/bookworm/Dockerfile | 84 ++++++++++++++++------------- Dockerfile.master.template | 92 ++++++++++++++++++-------------- README.md | 2 +- 7 files changed, 248 insertions(+), 188 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 9d1c480b1..46252cdec 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -388,9 +388,6 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -# minimal GDAL build; so no need extra dependencies - - RUN set -eux \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ @@ -423,6 +420,9 @@ RUN set -eux \ COPY --from=stage0-builder /_pgis*.* / COPY --from=stage0-builder /usr/local /usr/local +# minimal GDAL build; so no need extra dependencies + + ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index ae4f87054..27c80acd6 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -285,8 +285,7 @@ ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION + # Install Arrow C++ # also check the "Build final image" section too, for the final installation RUN set -eux \ @@ -296,9 +295,18 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ @@ -436,39 +444,6 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -# Install Arrow + Parquet + other GDAL extra dependencies -ARG PGIS1_ARROW_SOVERSION -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - RUN set -eux \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ @@ -501,6 +476,43 @@ RUN set -eux \ COPY --from=stage0-builder /_pgis*.* / COPY --from=stage0-builder /usr/local /usr/local +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index dd9094baa..cac5fccfa 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -285,8 +285,7 @@ ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION + # Install Arrow C++ # also check the "Build final image" section too, for the final installation RUN set -eux \ @@ -296,9 +295,18 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ @@ -436,39 +444,6 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -# Install Arrow + Parquet + other GDAL extra dependencies -ARG PGIS1_ARROW_SOVERSION -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - RUN set -eux \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ @@ -501,6 +476,43 @@ RUN set -eux \ COPY --from=stage0-builder /_pgis*.* / COPY --from=stage0-builder /usr/local /usr/local +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index aea6326a0..6a1c9b480 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -285,8 +285,7 @@ ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION + # Install Arrow C++ # also check the "Build final image" section too, for the final installation RUN set -eux \ @@ -296,9 +295,18 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ @@ -436,39 +444,6 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -# Install Arrow + Parquet + other GDAL extra dependencies -ARG PGIS1_ARROW_SOVERSION -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - RUN set -eux \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ @@ -501,6 +476,43 @@ RUN set -eux \ COPY --from=stage0-builder /_pgis*.* / COPY --from=stage0-builder /usr/local /usr/local +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index be9bb029f..838a86731 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -285,8 +285,7 @@ ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} ARG PGIS1_GDAL_CHECKOUT_SHA1 -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION + # Install Arrow C++ # also check the "Build final image" section too, for the final installation RUN set -eux \ @@ -296,9 +295,18 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ @@ -436,39 +444,6 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} -# Install Arrow + Parquet + other GDAL extra dependencies -ARG PGIS1_ARROW_SOVERSION -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libqhull-r8.0 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - RUN set -eux \ && apt-get update \ && apt-get install -y -V --no-install-recommends \ @@ -501,6 +476,43 @@ RUN set -eux \ COPY --from=stage0-builder /_pgis*.* / COPY --from=stage0-builder /usr/local /usr/local +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libqhull-r8.0 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 17284bf95..53ac7c211 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -289,8 +289,7 @@ ARG PGIS1_GDAL_CHECKOUT_SHA1 {{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} -ARG PGIS1_ARROW_VERSION -ARG PGIS1_ARROW_SOVERSION + # Install Arrow C++ # also check the "Build final image" section too, for the final installation RUN set -eux \ @@ -300,9 +299,18 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ && apt-get install -y --no-install-recommends \ - # Install Arrow C++ \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ libarrow-dataset${PGIS1_ARROW_SOVERSION} \ @@ -447,9 +455,45 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ +{{ if env.variant != "bullseye" then ( -}} + libtiff6 \ +{{ ) else ( -}} + libtiff5 \ +{{ ) end -}} + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + {{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} # Install Arrow + Parquet + other GDAL extra dependencies -ARG PGIS1_ARROW_SOVERSION + RUN set -eux \ # Install Arrow + Parquet && apt-get update \ @@ -457,6 +501,10 @@ RUN set -eux \ && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ && apt-get install -y -V --no-install-recommends \ libarrow${PGIS1_ARROW_SOVERSION} \ libparquet${PGIS1_ARROW_SOVERSION} \ @@ -488,42 +536,6 @@ RUN set -eux \ {{ ) end -}} -RUN set -eux \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libpcre3 \ - libprotobuf-c1 \ -{{ if env.variant != "bullseye" then ( -}} - libtiff6 \ -{{ ) else ( -}} - libtiff5 \ -{{ ) end -}} - libxml2 \ - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage0-builder /_pgis*.* / -COPY --from=stage0-builder /usr/local /usr/local - ARG PGIS1_GDAL_CHECKOUT ARG PGIS1_GDAL_REPOSITORY ARG PGIS1_GEOS_CHECKOUT diff --git a/README.md b/README.md index ccb547582..e709ed40e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-03-05) +## Versions (2024-03-11) We provide multi-platform image support for the following architectures: From 2dabc6ee5eda9b9e3bc68bbfe4cf20f6a500ba92 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 23 Mar 2024 18:48:07 +0100 Subject: [PATCH 077/167] add auto update --- .github/workflows/update.yml | 38 +++++++++++++++++++++++++++++++---- tools/get_versions_changes.sh | 20 ++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) create mode 100755 tools/get_versions_changes.sh diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 92d43df3b..73bc7f1d9 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -1,10 +1,8 @@ name: "update_dockerfiles" # updating the image code and pushing to the local registry on: - push: - pull_request: schedule: - - cron: '15 8 * * 1' + - cron: '57 17 * * *' jobs: update_dockerfiles: @@ -24,5 +22,37 @@ jobs: - run: tools/environment_init.sh - run: ./update.sh - run: git status - - run: git diff - run: git diff versions.json + + - name: Check if version.json changed + id: version_check + run: | + if git diff --name-only | grep -q 'version.json'; then + echo "version.json changed" + # echo "versions_changed=true" >> $GITHUB_ENV + # Generate changed versions list + echo "versions_changed_list=$(./tools/get_versions_changes.sh)" >> $GITHUB_ENV + echo "versions_changed_list=$(./tools/get_versions_changes.sh)" + # Generate branch name with date and time + echo "BRANCH_NAME=updates/$(date +'%Y%m%d_%H%M')" >> $GITHUB_ENV + fi + + # https://github.com/peter-evans/create-pull-request + - name: Create Pull Request + if: env.version_changed == 'true' + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.POSTGIS_PR_REPO_TOKEN }} + committer: GitHub + author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> + commit-message: Update version.json and related Dockerfiles + title: '🤖 Bump the: ${{ env.versions_changed_list }}' + body: | + Update docker-postgis version.json and related Dockerfiles. + Changes: ${{ env.versions_changed_list }} + + Auto-generated by .github/workflows/update.yml + Please verify if the changes are correct! + labels: automated_pr + branch: ${{ env.BRANCH_NAME }} + delete-branch: true diff --git a/tools/get_versions_changes.sh b/tools/get_versions_changes.sh new file mode 100755 index 000000000..9ff03dd24 --- /dev/null +++ b/tools/get_versions_changes.sh @@ -0,0 +1,20 @@ +#!/bin/bash +set -Eeuo pipefail + +# Get changed versions from git diff +# used by auto update CI : .github/workflows/update.yml + +# example outputs: DUCKDB:v0.10.1,MOBILITYDB:v1.1.0 + +git diff versions.json | \ + grep "^+" | \ + sed 's/^+//' | \ + grep -E "_CHECKOUT|_VERSION" | \ + grep -vE "_SHA1" | \ + sed 's/_CHECKOUT"//g;s/_VERSION"//g' | \ + sed 's# "tags/##g' | \ + sed 's#"##g' | \ + sed 's# ##g' | \ + sed 's#,##g' | \ + sort | uniq | \ + awk 'BEGIN { ORS=""; print ""; total_length=0; } { word_length=length($0)+1; if (total_length+word_length<=80) { print (NR>1?",":"") $0; total_length+=word_length; } else { exit; } }' \ No newline at end of file From 2aa34e087141a80bd81e481f34302d1fafb5e2ac Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 23 Mar 2024 19:42:35 +0100 Subject: [PATCH 078/167] add auto update v2. --- .github/workflows/update.yml | 8 +++++--- tools/get_versions_changes.sh | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 73bc7f1d9..dcc2ddff1 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -2,7 +2,7 @@ name: "update_dockerfiles" # updating the image code and pushing to the local registry on: schedule: - - cron: '57 17 * * *' + - cron: '57 18 * * *' jobs: update_dockerfiles: @@ -27,14 +27,16 @@ jobs: - name: Check if version.json changed id: version_check run: | - if git diff --name-only | grep -q 'version.json'; then + if git diff --name-only | grep 'versions.json'; then echo "version.json changed" - # echo "versions_changed=true" >> $GITHUB_ENV + echo "versions_changed=true" >> $GITHUB_ENV # Generate changed versions list echo "versions_changed_list=$(./tools/get_versions_changes.sh)" >> $GITHUB_ENV echo "versions_changed_list=$(./tools/get_versions_changes.sh)" # Generate branch name with date and time echo "BRANCH_NAME=updates/$(date +'%Y%m%d_%H%M')" >> $GITHUB_ENV + else + echo "version.json not changed" fi # https://github.com/peter-evans/create-pull-request diff --git a/tools/get_versions_changes.sh b/tools/get_versions_changes.sh index 9ff03dd24..bd4c75967 100755 --- a/tools/get_versions_changes.sh +++ b/tools/get_versions_changes.sh @@ -6,15 +6,15 @@ set -Eeuo pipefail # example outputs: DUCKDB:v0.10.1,MOBILITYDB:v1.1.0 -git diff versions.json | \ - grep "^+" | \ - sed 's/^+//' | \ - grep -E "_CHECKOUT|_VERSION" | \ - grep -vE "_SHA1" | \ - sed 's/_CHECKOUT"//g;s/_VERSION"//g' | \ - sed 's# "tags/##g' | \ - sed 's#"##g' | \ - sed 's# ##g' | \ - sed 's#,##g' | \ - sort | uniq | \ - awk 'BEGIN { ORS=""; print ""; total_length=0; } { word_length=length($0)+1; if (total_length+word_length<=80) { print (NR>1?",":"") $0; total_length+=word_length; } else { exit; } }' \ No newline at end of file +git diff versions.json | + grep "^+" | + sed 's/^+//' | + grep -E "_CHECKOUT|_VERSION" | + grep -vE "_SHA1" | + sed 's/_CHECKOUT"//g;s/_VERSION"//g' | + sed 's# "tags/##g' | + sed 's#"##g' | + sed 's# ##g' | + sed 's#,##g' | + sort | uniq | + awk 'BEGIN { ORS=""; print ""; total_length=0; } { word_length=length($0)+1; if (total_length+word_length<=80) { print (NR>1?",":"") $0; total_length+=word_length; } else { exit; } }' From 59f62463dd61ef9b365fea454a53de51b502bdbd Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 23 Mar 2024 20:11:30 +0100 Subject: [PATCH 079/167] add auto update v3. --- .github/workflows/update.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index dcc2ddff1..2e2230fc0 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -2,7 +2,7 @@ name: "update_dockerfiles" # updating the image code and pushing to the local registry on: schedule: - - cron: '57 18 * * *' + - cron: '17 19 * * *' jobs: update_dockerfiles: @@ -24,33 +24,34 @@ jobs: - run: git status - run: git diff versions.json - - name: Check if version.json changed + - name: Check if versions.json changed id: version_check run: | if git diff --name-only | grep 'versions.json'; then - echo "version.json changed" echo "versions_changed=true" >> $GITHUB_ENV + echo "versions_changed=true" # Generate changed versions list echo "versions_changed_list=$(./tools/get_versions_changes.sh)" >> $GITHUB_ENV echo "versions_changed_list=$(./tools/get_versions_changes.sh)" # Generate branch name with date and time echo "BRANCH_NAME=updates/$(date +'%Y%m%d_%H%M')" >> $GITHUB_ENV + echo "BRANCH_NAME=updates/$(date +'%Y%m%d_%H%M')" else - echo "version.json not changed" + echo "versions.json not changed" fi # https://github.com/peter-evans/create-pull-request - name: Create Pull Request - if: env.version_changed == 'true' + if: env.versions_changed == 'true' uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.POSTGIS_PR_REPO_TOKEN }} committer: GitHub author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit-message: Update version.json and related Dockerfiles + commit-message: Update versions.json and related Dockerfiles title: '🤖 Bump the: ${{ env.versions_changed_list }}' body: | - Update docker-postgis version.json and related Dockerfiles. + Update docker-postgis versions.json and related Dockerfiles. Changes: ${{ env.versions_changed_list }} Auto-generated by .github/workflows/update.yml From b6c00302f2224cafc556c4f3d23da640985f8e20 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 23 Mar 2024 20:44:32 +0100 Subject: [PATCH 080/167] add auto update v4. --- .github/workflows/update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 2e2230fc0..8dde7e7db 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -2,7 +2,7 @@ name: "update_dockerfiles" # updating the image code and pushing to the local registry on: schedule: - - cron: '17 19 * * *' + - cron: '57 19 * * *' jobs: update_dockerfiles: @@ -45,7 +45,7 @@ jobs: if: env.versions_changed == 'true' uses: peter-evans/create-pull-request@v6 with: - token: ${{ secrets.POSTGIS_PR_REPO_TOKEN }} +# token: ${{ secrets.POSTGIS_PR_REPO_TOKEN }} committer: GitHub author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> commit-message: Update versions.json and related Dockerfiles From 869d292c1c136ff3d15b79e58ba89736d877784e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 24 Mar 2024 20:00:30 +0000 Subject: [PATCH 081/167] Update versions.json and related Dockerfiles --- 15-3.4-bundle0/bookworm/Dockerfile | 6 +++--- 16-3.4-bundle0/bookworm/Dockerfile | 6 +++--- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 58b5485f8..0659f069c 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc2 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=c730be775071b7da37916970b4be41f710149daf +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=e00c69f36a2948c4ad500dd98dfafc17fe46a8d2 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 6d452c029..acf38b27f 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0rc2 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=c730be775071b7da37916970b4be41f710149daf +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=e00c69f36a2948c4ad500dd98dfafc17fe46a8d2 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index e709ed40e..9f710632e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-03-11) +## Versions (2024-03-24) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 19c8f400e..08769893f 100644 --- a/versions.json +++ b/versions.json @@ -433,16 +433,16 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc2", - "MOBILITYDB_CHECKOUT_SHA1": "c730be775071b7da37916970b4be41f710149daf", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0", + "MOBILITYDB_CHECKOUT_SHA1": "e00c69f36a2948c4ad500dd98dfafc17fe46a8d2", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.14.2", "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", - "DUCKDB_CHECKOUT": "tags/v0.10.0", - "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", + "DUCKDB_CHECKOUT": "tags/v0.10.1", + "DUCKDB_CHECKOUT_SHA1": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -581,16 +581,16 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0rc2", - "MOBILITYDB_CHECKOUT_SHA1": "c730be775071b7da37916970b4be41f710149daf", + "MOBILITYDB_CHECKOUT": "tags/v1.1.0", + "MOBILITYDB_CHECKOUT_SHA1": "e00c69f36a2948c4ad500dd98dfafc17fe46a8d2", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.14.2", "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", - "DUCKDB_CHECKOUT": "tags/v0.10.0", - "DUCKDB_CHECKOUT_SHA1": "20b1486d1192f9fbd2328d1122b5afe5f1747fce", + "DUCKDB_CHECKOUT": "tags/v0.10.1", + "DUCKDB_CHECKOUT_SHA1": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", From 60d9ba3a18beb6a4be6a6a7c2ded1093576ee968 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 8 Apr 2024 09:53:16 +0200 Subject: [PATCH 082/167] improve workflow - for auto-upgrade compatible --- .github/workflows/main.yml | 92 +++++++++++++++++++------------------- apply-ci.sh | 4 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a96b7f135..3fa5df1d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,52 +24,52 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.0", variant: "alpine3.18", postgres: "12", postgis: "3.0", arch: "amd64 arm64", tags: "12-3.0-alpine3.18 12-3.0.11-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.1", variant: "alpine3.18", postgres: "12", postgis: "3.1", arch: "amd64 arm64", tags: "12-3.1-alpine3.18 12-3.1.11-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.2", variant: "alpine3.18", postgres: "12", postgis: "3.2", arch: "amd64 arm64", tags: "12-3.2-alpine3.18 12-3.2.7-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.3", variant: "alpine3.18", postgres: "12", postgis: "3.3", arch: "amd64 arm64", tags: "12-3.3-alpine3.18 12-3.3.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.4", variant: "alpine3.18", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.18 12-3.4.2-alpine3.18", readme_group: "alpine3.18" } - - { version: "12-3.4", variant: "alpine3.19", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine", readme_group: "alpine3.19" } - - { version: "12-3.4", variant: "bookworm", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", readme_group: "bookworm" } - - { version: "12-3.4", variant: "bullseye", postgres: "12", postgis: "3.4", arch: "amd64 arm64", tags: "12-3.4-bullseye 12-3.4.2-bullseye", readme_group: "bullseye" } - - { version: "13-3.0", variant: "alpine3.18", postgres: "13", postgis: "3.0", arch: "amd64 arm64", tags: "13-3.0-alpine3.18 13-3.0.11-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.1", variant: "alpine3.18", postgres: "13", postgis: "3.1", arch: "amd64 arm64", tags: "13-3.1-alpine3.18 13-3.1.11-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.2", variant: "alpine3.18", postgres: "13", postgis: "3.2", arch: "amd64 arm64", tags: "13-3.2-alpine3.18 13-3.2.7-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.3", variant: "alpine3.18", postgres: "13", postgis: "3.3", arch: "amd64 arm64", tags: "13-3.3-alpine3.18 13-3.3.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.4", variant: "alpine3.18", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.18 13-3.4.2-alpine3.18", readme_group: "alpine3.18" } - - { version: "13-3.4", variant: "alpine3.19", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine", readme_group: "alpine3.19" } - - { version: "13-3.4", variant: "bookworm", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", readme_group: "bookworm" } - - { version: "13-3.4", variant: "bullseye", postgres: "13", postgis: "3.4", arch: "amd64 arm64", tags: "13-3.4-bullseye 13-3.4.2-bullseye", readme_group: "bullseye" } - - { version: "14-3.1", variant: "alpine3.18", postgres: "14", postgis: "3.1", arch: "amd64 arm64", tags: "14-3.1-alpine3.18 14-3.1.11-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.2", variant: "alpine3.18", postgres: "14", postgis: "3.2", arch: "amd64 arm64", tags: "14-3.2-alpine3.18 14-3.2.7-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.3", variant: "alpine3.18", postgres: "14", postgis: "3.3", arch: "amd64 arm64", tags: "14-3.3-alpine3.18 14-3.3.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.4", variant: "alpine3.18", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.18 14-3.4.2-alpine3.18", readme_group: "alpine3.18" } - - { version: "14-3.4", variant: "alpine3.19", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine", readme_group: "alpine3.19" } - - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", readme_group: "bookworm" } - - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.2-bullseye", readme_group: "bullseye" } - - { version: "14-l3.1.9gcp", variant: "bookworm", postgres: "14", postgis: "l3.1.9gcp", arch: "amd64 arm64", tags: "14-l3.1.9gcp-bookworm 14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm", readme_group: "locked" } - - { version: "15-3.2", variant: "alpine3.18", postgres: "15", postgis: "3.2", arch: "amd64 arm64", tags: "15-3.2-alpine3.18 15-3.2.7-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.3", variant: "alpine3.18", postgres: "15", postgis: "3.3", arch: "amd64 arm64", tags: "15-3.3-alpine3.18 15-3.3.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.2-alpine3.18", readme_group: "alpine3.18" } - - { version: "15-3.4", variant: "alpine3.19", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine", readme_group: "alpine3.19" } -# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", readme_group: "bookworm" } - - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.2-bullseye", readme_group: "bullseye" } - - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" } - - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" } - - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", readme_group: "recent" } - - { version: "16-3.3", variant: "alpine3.18", postgres: "16", postgis: "3.3", arch: "amd64 arm64", tags: "16-3.3-alpine3.18 16-3.3.6-alpine3.18", readme_group: "alpine3.18" } - - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.2-alpine3.18", readme_group: "alpine3.18" } - - { version: "16-3.4", variant: "alpine3.19", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", readme_group: "alpine3.19" } -# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", readme_group: "bookworm" } - - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.2-bullseye", readme_group: "bullseye" } - - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" } - - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" } - - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", readme_group: "recent" } + - { version: "12-3.0", variant: "alpine3.18" } + - { version: "12-3.1", variant: "alpine3.18" } + - { version: "12-3.2", variant: "alpine3.18" } + - { version: "12-3.3", variant: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.18" } + - { version: "12-3.4", variant: "alpine3.19" } + - { version: "12-3.4", variant: "bookworm" } + - { version: "12-3.4", variant: "bullseye" } + - { version: "13-3.0", variant: "alpine3.18" } + - { version: "13-3.1", variant: "alpine3.18" } + - { version: "13-3.2", variant: "alpine3.18" } + - { version: "13-3.3", variant: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.18" } + - { version: "13-3.4", variant: "alpine3.19" } + - { version: "13-3.4", variant: "bookworm" } + - { version: "13-3.4", variant: "bullseye" } + - { version: "14-3.1", variant: "alpine3.18" } + - { version: "14-3.2", variant: "alpine3.18" } + - { version: "14-3.3", variant: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.18" } + - { version: "14-3.4", variant: "alpine3.19" } + - { version: "14-3.4", variant: "bookworm" } + - { version: "14-3.4", variant: "bullseye" } + - { version: "14-l3.1.9gcp", variant: "bookworm" } + - { version: "15-3.2", variant: "alpine3.18" } + - { version: "15-3.3", variant: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.18" } + - { version: "15-3.4", variant: "alpine3.19" } +# --skip-- - { version: "15-3.4", variant: "bookworm" } + - { version: "15-3.4", variant: "bullseye" } + - { version: "15-3.4-bundle0", variant: "bookworm" } + - { version: "15-master", variant: "bookworm" } + - { version: "15-recent", variant: "bookworm" } + - { version: "16-3.3", variant: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.18" } + - { version: "16-3.4", variant: "alpine3.19" } +# --skip-- - { version: "16-3.4", variant: "bookworm" } + - { version: "16-3.4", variant: "bullseye" } + - { version: "16-3.4-bundle0", variant: "bookworm" } + - { version: "16-master", variant: "bookworm" } + - { version: "16-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" runs-on: ubuntu-22.04 - continue-on-error: ${{ matrix.postgis == 'master' }} + continue-on-error: ${{ endsWith(matrix.version, '-master') }} env: PLATFORM: linux/amd64 DOCKER_BUILDKIT: '1' @@ -136,11 +136,11 @@ jobs: echo "weekly build exists; no need to re-build. STOP" exit 0 - - name: "verify: make -n test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" + - name: "verify: make -n test-${{ matrix.version }}-${{ matrix.variant }} " if: env.IMAGE_EXISTS == 'false' run: make -n test-${{ matrix.version }}-${{ matrix.variant }} - - name: "make test-${{ matrix.version }}-${{ matrix.variant }} tags ${{ matrix.tags }}" + - name: "make test-${{ matrix.version }}-${{ matrix.variant }} " if: env.IMAGE_EXISTS == 'false' run: make test-${{ matrix.version }}-${{ matrix.variant }} @@ -163,8 +163,8 @@ jobs: make push-${{ matrix.version }}-${{ matrix.variant }} make manifest-${{ matrix.version }}-${{ matrix.variant }} - make-manifest: - name: update manifest + make-readme: + name: update readme needs: make-docker-images runs-on: ubuntu-22.04 env: diff --git a/apply-ci.sh b/apply-ci.sh index 0902c2300..24a610e16 100755 --- a/apply-ci.sh +++ b/apply-ci.sh @@ -59,9 +59,9 @@ for version in $versions; do if [[ $arch == *"amd64"* ]]; then if [[ $versions_bundle_base =~ ${version}-${variant} ]]; then - echo "# --skip-- - { version: \"$version\", variant: \"$variant\", postgres: \"$pg_docker\", postgis: \"$postgis\", arch: \"$arch\", tags: \"$tags\", readme_group: \"$readme_group\" }" >>_matrix.yml + echo "# --skip-- - { version: \"$version\", variant: \"$variant\" }" >>_matrix.yml else - echo " - { version: \"$version\", variant: \"$variant\", postgres: \"$pg_docker\", postgis: \"$postgis\", arch: \"$arch\", tags: \"$tags\", readme_group: \"$readme_group\" }" >>_matrix.yml + echo " - { version: \"$version\", variant: \"$variant\" }" >>_matrix.yml fi fi From 8c9c1f67693d460a30a077f9824480b6e7871e0f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 8 Apr 2024 09:54:33 +0200 Subject: [PATCH 083/167] improve master template --- 14-l3.1.9gcp/bookworm/Dockerfile | 11 +++++------ 15-master/bookworm/Dockerfile | 12 +++++------- 15-recent/bookworm/Dockerfile | 12 +++++------- 16-master/bookworm/Dockerfile | 12 +++++------- 16-recent/bookworm/Dockerfile | 12 +++++------- Dockerfile.master.template | 14 ++++++-------- 6 files changed, 31 insertions(+), 42 deletions(-) diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 46252cdec..2833cdb0a 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -15,6 +15,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.9 ARG PGIS1_GEOS_CHECKOUT=tags/3.6.6 ARG PGIS1_GDAL_CHECKOUT=tags/v3.6.4 @@ -22,6 +23,8 @@ ARG PGIS1_PROJ_CHECKOUT=tags/6.3.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=95a641b1747721d7004c5f0133b918d034035319 ARG PGIS1_GEOS_CHECKOUT_SHA1=36ea3034fb8719a639a7e7727e54ec8ab2e8a196 ARG PGIS1_GDAL_CHECKOUT_SHA1=7ca88116f5a46d429251361634eb24629f315076 @@ -29,15 +32,11 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=0e993d9744ecaa2f146bf62c43aecc61809a43ef ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f -ARG PGIS1_GDAL_BUILD=minimal - ARG PGIS1_BOOST_VERSION=1.74.0 - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: -# - minimal ; no arrow, no parquet, no extra dependencies -# -- +ARG PGIS1_GDAL_BUILD=minimal +# Minimal GDAL build ; no arrow, no parquet, no extra dependencies FROM ${PGIS1_BASE_IMAGE} as builder diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 27c80acd6..3388ce7e7 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,6 +15,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master ARG PGIS1_GEOS_CHECKOUT=main ARG PGIS1_GDAL_CHECKOUT=master @@ -22,6 +23,8 @@ ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck @@ -29,16 +32,11 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck -ARG PGIS1_GDAL_BUILD=with_extra - ARG PGIS1_BOOST_VERSION=1.74.0 - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 -# -- +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies FROM ${PGIS1_BASE_IMAGE} as builder diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index cac5fccfa..12f49fb2d 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -15,6 +15,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 @@ -22,6 +23,8 @@ ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 @@ -29,16 +32,11 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c -ARG PGIS1_GDAL_BUILD=with_extra - ARG PGIS1_BOOST_VERSION=1.74.0 - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 -# -- +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies FROM ${PGIS1_BASE_IMAGE} as builder diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 6a1c9b480..e75cb1f55 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,6 +15,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master ARG PGIS1_GEOS_CHECKOUT=main ARG PGIS1_GDAL_CHECKOUT=master @@ -22,6 +23,8 @@ ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck @@ -29,16 +32,11 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck -ARG PGIS1_GDAL_BUILD=with_extra - ARG PGIS1_BOOST_VERSION=1.74.0 - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 -# -- +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies FROM ${PGIS1_BASE_IMAGE} as builder diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 838a86731..ceff72ad3 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -15,6 +15,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 @@ -22,6 +23,8 @@ ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 @@ -29,16 +32,11 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c -ARG PGIS1_GDAL_BUILD=with_extra - ARG PGIS1_BOOST_VERSION=1.74.0 - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 -# -- +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies FROM ${PGIS1_BASE_IMAGE} as builder diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 53ac7c211..724d4b613 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -10,6 +10,7 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git +# Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} ARG PGIS1_GEOS_CHECKOUT={{ .[env.variant].GEOS_CHECKOUT }} ARG PGIS1_GDAL_CHECKOUT={{ .[env.variant].GDAL_CHECKOUT }} @@ -17,6 +18,8 @@ ARG PGIS1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} ARG PGIS1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} ARG PGIS1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} ARG PGIS1_GEOS_CHECKOUT_SHA1={{ .[env.variant].GEOS_CHECKOUT_SHA1 }} ARG PGIS1_GDAL_CHECKOUT_SHA1={{ .[env.variant].GDAL_CHECKOUT_SHA1 }} @@ -24,20 +27,15 @@ ARG PGIS1_PROJ_CHECKOUT_SHA1={{ .[env.variant].PROJ_CHECKOUT_SHA1 }} ARG PGIS1_SFCGAL_CHECKOUT_SHA1={{ .[env.variant].SFCGAL_CHECKOUT_SHA1 }} ARG PGIS1_CGAL_CHECKOUT_SHA1={{ .[env.variant].CGAL_CHECKOUT_SHA1 }} -ARG PGIS1_GDAL_BUILD={{ .[env.variant].GDAL_BUILD }} - ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} - ARG PGIS1_CMAKE_BUILD_TYPE=Release -# gdal_build: +ARG PGIS1_GDAL_BUILD={{ .[env.variant].GDAL_BUILD }} {{ if .[env.variant].GDAL_BUILD != "minimal" then ( -}} -ARG PGIS1_ARROW_VERSION=15.0.0-1 -ARG PGIS1_ARROW_SOVERSION=1500 +# Full GDAL build ; with arrow, parquet and extra dependencies {{ ) else ( -}} -# - minimal ; no arrow, no parquet, no extra dependencies +# Minimal GDAL build ; no arrow, no parquet, no extra dependencies {{ ) end -}} -# -- FROM ${PGIS1_BASE_IMAGE} as builder From cf6a83984bf8af4c7de27e815bdbbcee5ca11650 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 8 Apr 2024 10:30:59 +0200 Subject: [PATCH 084/167] fix lint --- .github/workflows/main.yml | 4 ++-- apply-ci.sh | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3fa5df1d7..9beffa149 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,7 @@ jobs: - { version: "15-3.3", variant: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.18" } - { version: "15-3.4", variant: "alpine3.19" } -# --skip-- - { version: "15-3.4", variant: "bookworm" } +# --skip-- - { version: "15-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "15-3.4", variant: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm" } - { version: "15-master", variant: "bookworm" } @@ -60,7 +60,7 @@ jobs: - { version: "16-3.3", variant: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.18" } - { version: "16-3.4", variant: "alpine3.19" } -# --skip-- - { version: "16-3.4", variant: "bookworm" } +# --skip-- - { version: "16-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.4", variant: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } diff --git a/apply-ci.sh b/apply-ci.sh index 24a610e16..cf3ba3902 100755 --- a/apply-ci.sh +++ b/apply-ci.sh @@ -51,15 +51,11 @@ for version in $versions; do # Remove quotes around variant variant=$(echo "$variant" | tr -d '"') - pg_docker=$(jq -r ".\"$version\".\"$variant\".PG_DOCKER" "$input_file") - postgis=$(jq -r ".\"$version\".\"$variant\".postgis" "$input_file") - tags=$(jq -r ".\"$version\".\"$variant\".tags" "$input_file") arch=$(jq -r ".\"$version\".\"$variant\".arch" "$input_file") - readme_group=$(jq -r ".\"$version\".\"$variant\".readme_group" "$input_file") if [[ $arch == *"amd64"* ]]; then if [[ $versions_bundle_base =~ ${version}-${variant} ]]; then - echo "# --skip-- - { version: \"$version\", variant: \"$variant\" }" >>_matrix.yml + echo "# --skip-- - { version: \"$version\", variant: \"$variant\" } --> generated with the related bundle job!" >>_matrix.yml else echo " - { version: \"$version\", variant: \"$variant\" }" >>_matrix.yml fi From cfe5050e6d0b60f7b96183a926d82e61cd590dfa Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 9 Apr 2024 20:00:18 +0000 Subject: [PATCH 085/167] Update versions.json and related Dockerfiles --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 20 ++++++++++---------- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 0659f069c..36853dcda 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=e00c69f36a2948c4ad500dd98dfafc17fe46a8d2 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=4273bdd4f70ee6fb8b28cd269385d83da6eeba31 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 12f49fb2d..041109411 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.5 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 +ARG PGIS1_GDAL_CHECKOUT_SHA1=1d418c1c1a1655c9f0afc944d6c928a60a7ad99a ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index f447f9f2f..eab8957a3 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index acf38b27f..f880d98f1 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.0 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=e00c69f36a2948c4ad500dd98dfafc17fe46a8d2 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=4273bdd4f70ee6fb8b28cd269385d83da6eeba31 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index ceff72ad3..fa16369e2 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.4 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.5 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=c2d2a61739ca770bae5a26be3eeb25a045dd3458 +ARG PGIS1_GDAL_CHECKOUT_SHA1=1d418c1c1a1655c9f0afc944d6c928a60a7ad99a ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 33bde95ff..54e54cb65 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 9f710632e..7e22997cb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-03-24) +## Versions (2024-04-09) We provide multi-platform image support for the following architectures: @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.4, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.5, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.5, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index dc7faa65b..a28af0988 100755 --- a/manifest.sh +++ b/manifest.sh @@ -522,11 +522,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -682,11 +682,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 08769893f..bea0043f1 100644 --- a/versions.json +++ b/versions.json @@ -433,8 +433,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0", - "MOBILITYDB_CHECKOUT_SHA1": "e00c69f36a2948c4ad500dd98dfafc17fe46a8d2", + "MOBILITYDB_CHECKOUT": "tags/v1.1.1", + "MOBILITYDB_CHECKOUT_SHA1": "4273bdd4f70ee6fb8b28cd269385d83da6eeba31", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -490,8 +490,8 @@ "PROJ_CHECKOUT": "tags/9.4.0", "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.4", - "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", + "GDAL_CHECKOUT": "tags/v3.8.5", + "GDAL_CHECKOUT_SHA1": "1d418c1c1a1655c9f0afc944d6c928a60a7ad99a", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -581,8 +581,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.0", - "MOBILITYDB_CHECKOUT_SHA1": "e00c69f36a2948c4ad500dd98dfafc17fe46a8d2", + "MOBILITYDB_CHECKOUT": "tags/v1.1.1", + "MOBILITYDB_CHECKOUT_SHA1": "4273bdd4f70ee6fb8b28cd269385d83da6eeba31", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.4-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -638,8 +638,8 @@ "PROJ_CHECKOUT": "tags/9.4.0", "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.4", - "GDAL_CHECKOUT_SHA1": "c2d2a61739ca770bae5a26be3eeb25a045dd3458", + "GDAL_CHECKOUT": "tags/v3.8.5", + "GDAL_CHECKOUT_SHA1": "1d418c1c1a1655c9f0afc944d6c928a60a7ad99a", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", From a522cb6058c200f91f9f38ead9f171a1f8f9d4c7 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 17 Apr 2024 20:00:06 +0000 Subject: [PATCH 086/167] Update versions.json and related Dockerfiles --- 15-3.4-bundle0/bookworm/Dockerfile | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 36853dcda..1e3555894 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.1 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.2 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index f880d98f1..715d75c26 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.1 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.2 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 7e22997cb..356e78287 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-04-09) +## Versions (2024-04-17) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index bea0043f1..33f55ef54 100644 --- a/versions.json +++ b/versions.json @@ -441,8 +441,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.14.2", "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", - "DUCKDB_CHECKOUT": "tags/v0.10.1", - "DUCKDB_CHECKOUT_SHA1": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", + "DUCKDB_CHECKOUT": "tags/v0.10.2", + "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -589,8 +589,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.14.2", "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", - "DUCKDB_CHECKOUT": "tags/v0.10.1", - "DUCKDB_CHECKOUT_SHA1": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", + "DUCKDB_CHECKOUT": "tags/v0.10.2", + "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", From 522178de6cb976361a3e99e47b85b9f1ce3ef10a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 7 May 2024 20:00:28 +0000 Subject: [PATCH 087/167] Update versions.json and related Dockerfiles --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 1e3555894..54d5d43fd 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=8f27a70d054fc80c4bbc722d8df4b6b305a7e93d +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=19f731d174820dfc0f33e073235c99368b3ad98c ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 715d75c26..d9ea6c450 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.14.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=8f27a70d054fc80c4bbc722d8df4b6b305a7e93d +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=19f731d174820dfc0f33e073235c99368b3ad98c ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/README.md b/README.md index 356e78287..63f551b38 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-04-17) +## Versions (2024-05-07) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 33f55ef54..b393aac2b 100644 --- a/versions.json +++ b/versions.json @@ -439,8 +439,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.2", - "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", + "TIMESCALEDB_CHECKOUT": "tags/2.15.0", + "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", "DUCKDB_CHECKOUT": "tags/v0.10.2", "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -587,8 +587,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.14.2", - "TIMESCALEDB_CHECKOUT_SHA1": "8f27a70d054fc80c4bbc722d8df4b6b305a7e93d", + "TIMESCALEDB_CHECKOUT": "tags/2.15.0", + "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", "DUCKDB_CHECKOUT": "tags/v0.10.2", "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", From f9cd30075ac4c73807d3902c5ff8a97b93b6870c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 10 May 2024 20:00:13 +0000 Subject: [PATCH 088/167] Update versions.json and related Dockerfiles --- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 24 ++++++++++++------------ versions.json | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 041109411..959df3245 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.5 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=1d418c1c1a1655c9f0afc944d6c928a60a7ad99a +ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index eab8957a3..34f2059d4 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index fa16369e2..6a6521775 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.5 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b -ARG PGIS1_GDAL_CHECKOUT_SHA1=1d418c1c1a1655c9f0afc944d6c928a60a7ad99a +ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 54e54cb65..57d36e4ca 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 63f551b38..a09403ca9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-05-07) +## Versions (2024-05-10) We provide multi-platform image support for the following architectures: @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.5, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.8.5, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index a28af0988..6ae572a99 100755 --- a/manifest.sh +++ b/manifest.sh @@ -522,17 +522,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ @@ -682,17 +682,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index b393aac2b..48604542a 100644 --- a/versions.json +++ b/versions.json @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -490,8 +490,8 @@ "PROJ_CHECKOUT": "tags/9.4.0", "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.5", - "GDAL_CHECKOUT_SHA1": "1d418c1c1a1655c9f0afc944d6c928a60a7ad99a", + "GDAL_CHECKOUT": "tags/v3.9.0", + "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.8.5-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.8-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -638,8 +638,8 @@ "PROJ_CHECKOUT": "tags/9.4.0", "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.8.5", - "GDAL_CHECKOUT_SHA1": "1d418c1c1a1655c9f0afc944d6c928a60a7ad99a", + "GDAL_CHECKOUT": "tags/v3.9.0", + "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", "GEOS_CHECKOUT": "tags/3.12.1", "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", "SFCGAL_CHECKOUT": "tags/v1.5.1", From 447f67c18d15ec20f7c482939158ccfe2dd3679f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 23 May 2024 06:45:15 +0200 Subject: [PATCH 089/167] fix locked images documentation --- apply-readme.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply-readme.sh b/apply-readme.sh index b3c6c381a..e7c409f23 100755 --- a/apply-readme.sh +++ b/apply-readme.sh @@ -31,7 +31,7 @@ for version in $versions; do if [[ "$postgis" == "master" ]]; then POSTGIS_DOC_VERSION="development: postgis, geos, proj, gdal, cgal, sfcgal" - elif [[ "$postgis" == "recent" || "$postgis" == "locked" ]]; then + elif [[ "$postgis" == "recent" || "$readme_group" == "locked" ]]; then POSTGIS_TAG=$(jq -r ".\"$version\".\"$variant\".POSTGIS_CHECKOUT" "$input_file") PROJ_TAG=$(jq -r ".\"$version\".\"$variant\".PROJ_CHECKOUT" "$input_file") From cf730db7c91628c23af86df206ab1e98ef0192b8 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 24 May 2024 18:09:00 +0200 Subject: [PATCH 090/167] Alpine 3.20 update and temporary keep some alpine3.18 image. --- .circleci/config.yml | 20 +- .github/workflows/main.yml | 20 +- 12-3.3/alpine3.18/tags | 1 - 12-3.3/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 12-3.3/alpine3.20/tags | 1 + .../update-postgis.sh | 0 12-3.4/alpine3.18/tags | 1 - 12-3.4/alpine3.19/tags | 2 +- 12-3.4/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 12-3.4/alpine3.20/tags | 1 + .../update-postgis.sh | 0 13-3.3/alpine3.18/tags | 1 - 13-3.3/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.3/alpine3.20/tags | 1 + .../update-postgis.sh | 0 13-3.4/alpine3.18/tags | 1 - 13-3.4/alpine3.19/tags | 2 +- 13-3.4/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.4/alpine3.20/tags | 1 + .../update-postgis.sh | 0 14-3.3/alpine3.18/tags | 1 - 14-3.3/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.3/alpine3.20/tags | 1 + .../update-postgis.sh | 0 14-3.4/alpine3.18/tags | 1 - 14-3.4/alpine3.19/tags | 2 +- 14-3.4/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.4/alpine3.20/tags | 1 + .../update-postgis.sh | 0 15-3.3/alpine3.18/tags | 1 - 15-3.3/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.3/alpine3.20/tags | 1 + .../update-postgis.sh | 0 15-3.4-bundle0/bookworm/Dockerfile | 2 +- 15-3.4/alpine3.18/tags | 1 - 15-3.4/alpine3.19/tags | 2 +- 15-3.4/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.4/alpine3.20/tags | 1 + .../update-postgis.sh | 0 16-3.3/alpine3.18/tags | 1 - 16-3.3/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.3/alpine3.20/tags | 1 + .../update-postgis.sh | 0 16-3.4-bundle0/bookworm/Dockerfile | 2 +- 16-3.4/alpine3.18/tags | 1 - 16-3.4/alpine3.19/tags | 2 +- 16-3.4/{alpine3.18 => alpine3.20}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.4/alpine3.20/tags | 1 + .../update-postgis.sh | 0 README.md | 75 ++++--- manifest.sh | 210 ++++++++++-------- versions.json | 98 ++++---- versions.sh | 6 +- 63 files changed, 273 insertions(+), 230 deletions(-) delete mode 100644 12-3.3/alpine3.18/tags rename 12-3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 12-3.3/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 12-3.3/alpine3.20/tags rename 12-3.3/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 12-3.4/alpine3.18/tags rename 12-3.4/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 12-3.4/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 12-3.4/alpine3.20/tags rename 12-3.4/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 13-3.3/alpine3.18/tags rename 13-3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 13-3.3/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 13-3.3/alpine3.20/tags rename 13-3.3/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 13-3.4/alpine3.18/tags rename 13-3.4/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 13-3.4/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 13-3.4/alpine3.20/tags rename 13-3.4/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 14-3.3/alpine3.18/tags rename 14-3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 14-3.3/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 14-3.3/alpine3.20/tags rename 14-3.3/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 14-3.4/alpine3.18/tags rename 14-3.4/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 14-3.4/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 14-3.4/alpine3.20/tags rename 14-3.4/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 15-3.3/alpine3.18/tags rename 15-3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 15-3.3/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 15-3.3/alpine3.20/tags rename 15-3.3/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 15-3.4/alpine3.18/tags rename 15-3.4/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 15-3.4/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 15-3.4/alpine3.20/tags rename 15-3.4/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 16-3.3/alpine3.18/tags rename 16-3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 16-3.3/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 16-3.3/alpine3.20/tags rename 16-3.3/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) delete mode 100644 16-3.4/alpine3.18/tags rename 16-3.4/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 16-3.4/{alpine3.18 => alpine3.20}/initdb-postgis.sh (100%) create mode 100644 16-3.4/alpine3.20/tags rename 16-3.4/{alpine3.18 => alpine3.20}/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4259a969d..2f2dfda34 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,39 +126,39 @@ workflows: "12-3.0-alpine3.18", "12-3.1-alpine3.18", "12-3.2-alpine3.18", - "12-3.3-alpine3.18", - "12-3.4-alpine3.18", + "12-3.3-alpine3.20", "12-3.4-alpine3.19", + "12-3.4-alpine3.20", "12-3.4-bookworm", "12-3.4-bullseye", "13-3.0-alpine3.18", "13-3.1-alpine3.18", "13-3.2-alpine3.18", - "13-3.3-alpine3.18", - "13-3.4-alpine3.18", + "13-3.3-alpine3.20", "13-3.4-alpine3.19", + "13-3.4-alpine3.20", "13-3.4-bookworm", "13-3.4-bullseye", "14-3.1-alpine3.18", "14-3.2-alpine3.18", - "14-3.3-alpine3.18", - "14-3.4-alpine3.18", + "14-3.3-alpine3.20", "14-3.4-alpine3.19", + "14-3.4-alpine3.20", "14-3.4-bookworm", "14-3.4-bullseye", "14-l3.1.9gcp-bookworm", "15-3.2-alpine3.18", - "15-3.3-alpine3.18", - "15-3.4-alpine3.18", + "15-3.3-alpine3.20", "15-3.4-alpine3.19", + "15-3.4-alpine3.20", # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! "15-3.4-bullseye", "15-3.4-bundle0-bookworm", "15-master-bookworm", "15-recent-bookworm", - "16-3.3-alpine3.18", - "16-3.4-alpine3.18", + "16-3.3-alpine3.20", "16-3.4-alpine3.19", + "16-3.4-alpine3.20", # --skip-- "16-3.4-bookworm", --> generated with the related bundle job! "16-3.4-bullseye", "16-3.4-bundle0-bookworm", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9beffa149..856c99044 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,39 +27,39 @@ jobs: - { version: "12-3.0", variant: "alpine3.18" } - { version: "12-3.1", variant: "alpine3.18" } - { version: "12-3.2", variant: "alpine3.18" } - - { version: "12-3.3", variant: "alpine3.18" } - - { version: "12-3.4", variant: "alpine3.18" } + - { version: "12-3.3", variant: "alpine3.20" } - { version: "12-3.4", variant: "alpine3.19" } + - { version: "12-3.4", variant: "alpine3.20" } - { version: "12-3.4", variant: "bookworm" } - { version: "12-3.4", variant: "bullseye" } - { version: "13-3.0", variant: "alpine3.18" } - { version: "13-3.1", variant: "alpine3.18" } - { version: "13-3.2", variant: "alpine3.18" } - - { version: "13-3.3", variant: "alpine3.18" } - - { version: "13-3.4", variant: "alpine3.18" } + - { version: "13-3.3", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.19" } + - { version: "13-3.4", variant: "alpine3.20" } - { version: "13-3.4", variant: "bookworm" } - { version: "13-3.4", variant: "bullseye" } - { version: "14-3.1", variant: "alpine3.18" } - { version: "14-3.2", variant: "alpine3.18" } - - { version: "14-3.3", variant: "alpine3.18" } - - { version: "14-3.4", variant: "alpine3.18" } + - { version: "14-3.3", variant: "alpine3.20" } - { version: "14-3.4", variant: "alpine3.19" } + - { version: "14-3.4", variant: "alpine3.20" } - { version: "14-3.4", variant: "bookworm" } - { version: "14-3.4", variant: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - { version: "15-3.2", variant: "alpine3.18" } - - { version: "15-3.3", variant: "alpine3.18" } - - { version: "15-3.4", variant: "alpine3.18" } + - { version: "15-3.3", variant: "alpine3.20" } - { version: "15-3.4", variant: "alpine3.19" } + - { version: "15-3.4", variant: "alpine3.20" } # --skip-- - { version: "15-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "15-3.4", variant: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm" } - { version: "15-master", variant: "bookworm" } - { version: "15-recent", variant: "bookworm" } - - { version: "16-3.3", variant: "alpine3.18" } - - { version: "16-3.4", variant: "alpine3.18" } + - { version: "16-3.3", variant: "alpine3.20" } - { version: "16-3.4", variant: "alpine3.19" } + - { version: "16-3.4", variant: "alpine3.20" } # --skip-- - { version: "16-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.4", variant: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm" } diff --git a/12-3.3/alpine3.18/tags b/12-3.3/alpine3.18/tags deleted file mode 100644 index ee4c96be8..000000000 --- a/12-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.3-alpine3.18 12-3.3.6-alpine3.18 diff --git a/12-3.3/alpine3.18/Dockerfile b/12-3.3/alpine3.20/Dockerfile similarity index 99% rename from 12-3.3/alpine3.18/Dockerfile rename to 12-3.3/alpine3.20/Dockerfile index c755c4686..47bdc0e56 100644 --- a/12-3.3/alpine3.18/Dockerfile +++ b/12-3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.3/alpine3.18/initdb-postgis.sh b/12-3.3/alpine3.20/initdb-postgis.sh similarity index 100% rename from 12-3.3/alpine3.18/initdb-postgis.sh rename to 12-3.3/alpine3.20/initdb-postgis.sh diff --git a/12-3.3/alpine3.20/tags b/12-3.3/alpine3.20/tags new file mode 100644 index 000000000..589ce2229 --- /dev/null +++ b/12-3.3/alpine3.20/tags @@ -0,0 +1 @@ +12-3.3-alpine3.20 12-3.3.6-alpine3.20 12-3.3-alpine diff --git a/12-3.3/alpine3.18/update-postgis.sh b/12-3.3/alpine3.20/update-postgis.sh similarity index 100% rename from 12-3.3/alpine3.18/update-postgis.sh rename to 12-3.3/alpine3.20/update-postgis.sh diff --git a/12-3.4/alpine3.18/tags b/12-3.4/alpine3.18/tags deleted file mode 100644 index 3576f1946..000000000 --- a/12-3.4/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-alpine3.18 12-3.4.2-alpine3.18 diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index 71d6290e1..798bdf3d8 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine +12-3.4-alpine3.19 12-3.4.2-alpine3.19 diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.20/Dockerfile similarity index 99% rename from 12-3.4/alpine3.18/Dockerfile rename to 12-3.4/alpine3.20/Dockerfile index 53e910ebc..a8bf18a5e 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.4/alpine3.18/initdb-postgis.sh b/12-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 12-3.4/alpine3.18/initdb-postgis.sh rename to 12-3.4/alpine3.20/initdb-postgis.sh diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags new file mode 100644 index 000000000..8b804f9fb --- /dev/null +++ b/12-3.4/alpine3.20/tags @@ -0,0 +1 @@ +12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine diff --git a/12-3.4/alpine3.18/update-postgis.sh b/12-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 12-3.4/alpine3.18/update-postgis.sh rename to 12-3.4/alpine3.20/update-postgis.sh diff --git a/13-3.3/alpine3.18/tags b/13-3.3/alpine3.18/tags deleted file mode 100644 index c1d3338c0..000000000 --- a/13-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.3-alpine3.18 13-3.3.6-alpine3.18 diff --git a/13-3.3/alpine3.18/Dockerfile b/13-3.3/alpine3.20/Dockerfile similarity index 99% rename from 13-3.3/alpine3.18/Dockerfile rename to 13-3.3/alpine3.20/Dockerfile index a862fb8dc..81733d707 100644 --- a/13-3.3/alpine3.18/Dockerfile +++ b/13-3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.3/alpine3.18/initdb-postgis.sh b/13-3.3/alpine3.20/initdb-postgis.sh similarity index 100% rename from 13-3.3/alpine3.18/initdb-postgis.sh rename to 13-3.3/alpine3.20/initdb-postgis.sh diff --git a/13-3.3/alpine3.20/tags b/13-3.3/alpine3.20/tags new file mode 100644 index 000000000..b5994c153 --- /dev/null +++ b/13-3.3/alpine3.20/tags @@ -0,0 +1 @@ +13-3.3-alpine3.20 13-3.3.6-alpine3.20 13-3.3-alpine diff --git a/13-3.3/alpine3.18/update-postgis.sh b/13-3.3/alpine3.20/update-postgis.sh similarity index 100% rename from 13-3.3/alpine3.18/update-postgis.sh rename to 13-3.3/alpine3.20/update-postgis.sh diff --git a/13-3.4/alpine3.18/tags b/13-3.4/alpine3.18/tags deleted file mode 100644 index 28fe5f018..000000000 --- a/13-3.4/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-alpine3.18 13-3.4.2-alpine3.18 diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index ba0983ba7..12d9f0286 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine +13-3.4-alpine3.19 13-3.4.2-alpine3.19 diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.20/Dockerfile similarity index 99% rename from 13-3.4/alpine3.18/Dockerfile rename to 13-3.4/alpine3.20/Dockerfile index 316b0d4da..396cbc13a 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.4/alpine3.18/initdb-postgis.sh b/13-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 13-3.4/alpine3.18/initdb-postgis.sh rename to 13-3.4/alpine3.20/initdb-postgis.sh diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags new file mode 100644 index 000000000..8539476b0 --- /dev/null +++ b/13-3.4/alpine3.20/tags @@ -0,0 +1 @@ +13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine diff --git a/13-3.4/alpine3.18/update-postgis.sh b/13-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 13-3.4/alpine3.18/update-postgis.sh rename to 13-3.4/alpine3.20/update-postgis.sh diff --git a/14-3.3/alpine3.18/tags b/14-3.3/alpine3.18/tags deleted file mode 100644 index 22635a27e..000000000 --- a/14-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.3-alpine3.18 14-3.3.6-alpine3.18 diff --git a/14-3.3/alpine3.18/Dockerfile b/14-3.3/alpine3.20/Dockerfile similarity index 99% rename from 14-3.3/alpine3.18/Dockerfile rename to 14-3.3/alpine3.20/Dockerfile index 5edd79128..63411191b 100644 --- a/14-3.3/alpine3.18/Dockerfile +++ b/14-3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.3/alpine3.18/initdb-postgis.sh b/14-3.3/alpine3.20/initdb-postgis.sh similarity index 100% rename from 14-3.3/alpine3.18/initdb-postgis.sh rename to 14-3.3/alpine3.20/initdb-postgis.sh diff --git a/14-3.3/alpine3.20/tags b/14-3.3/alpine3.20/tags new file mode 100644 index 000000000..6e88e42b6 --- /dev/null +++ b/14-3.3/alpine3.20/tags @@ -0,0 +1 @@ +14-3.3-alpine3.20 14-3.3.6-alpine3.20 14-3.3-alpine diff --git a/14-3.3/alpine3.18/update-postgis.sh b/14-3.3/alpine3.20/update-postgis.sh similarity index 100% rename from 14-3.3/alpine3.18/update-postgis.sh rename to 14-3.3/alpine3.20/update-postgis.sh diff --git a/14-3.4/alpine3.18/tags b/14-3.4/alpine3.18/tags deleted file mode 100644 index 464c0dbef..000000000 --- a/14-3.4/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-alpine3.18 14-3.4.2-alpine3.18 diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index 7a487afa1..d555082f7 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine +14-3.4-alpine3.19 14-3.4.2-alpine3.19 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.20/Dockerfile similarity index 99% rename from 14-3.4/alpine3.18/Dockerfile rename to 14-3.4/alpine3.20/Dockerfile index 53e2a5c53..e97d17111 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.4/alpine3.18/initdb-postgis.sh b/14-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 14-3.4/alpine3.18/initdb-postgis.sh rename to 14-3.4/alpine3.20/initdb-postgis.sh diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags new file mode 100644 index 000000000..a98dbc9ec --- /dev/null +++ b/14-3.4/alpine3.20/tags @@ -0,0 +1 @@ +14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine diff --git a/14-3.4/alpine3.18/update-postgis.sh b/14-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 14-3.4/alpine3.18/update-postgis.sh rename to 14-3.4/alpine3.20/update-postgis.sh diff --git a/15-3.3/alpine3.18/tags b/15-3.3/alpine3.18/tags deleted file mode 100644 index d474de72f..000000000 --- a/15-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.3-alpine3.18 15-3.3.6-alpine3.18 diff --git a/15-3.3/alpine3.18/Dockerfile b/15-3.3/alpine3.20/Dockerfile similarity index 99% rename from 15-3.3/alpine3.18/Dockerfile rename to 15-3.3/alpine3.20/Dockerfile index e00634daf..8d19e93fc 100644 --- a/15-3.3/alpine3.18/Dockerfile +++ b/15-3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.3/alpine3.18/initdb-postgis.sh b/15-3.3/alpine3.20/initdb-postgis.sh similarity index 100% rename from 15-3.3/alpine3.18/initdb-postgis.sh rename to 15-3.3/alpine3.20/initdb-postgis.sh diff --git a/15-3.3/alpine3.20/tags b/15-3.3/alpine3.20/tags new file mode 100644 index 000000000..5feadf883 --- /dev/null +++ b/15-3.3/alpine3.20/tags @@ -0,0 +1 @@ +15-3.3-alpine3.20 15-3.3.6-alpine3.20 15-3.3-alpine diff --git a/15-3.3/alpine3.18/update-postgis.sh b/15-3.3/alpine3.20/update-postgis.sh similarity index 100% rename from 15-3.3/alpine3.18/update-postgis.sh rename to 15-3.3/alpine3.20/update-postgis.sh diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 54d5d43fd..d808aa55f 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.3 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags deleted file mode 100644 index 3366ea647..000000000 --- a/15-3.4/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-alpine3.18 15-3.4.2-alpine3.18 diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index f5945055e..a1f96453b 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine +15-3.4-alpine3.19 15-3.4.2-alpine3.19 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.20/Dockerfile similarity index 99% rename from 15-3.4/alpine3.18/Dockerfile rename to 15-3.4/alpine3.20/Dockerfile index aff590f7c..b6fc12014 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.4/alpine3.18/initdb-postgis.sh b/15-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 15-3.4/alpine3.18/initdb-postgis.sh rename to 15-3.4/alpine3.20/initdb-postgis.sh diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags new file mode 100644 index 000000000..157d72013 --- /dev/null +++ b/15-3.4/alpine3.20/tags @@ -0,0 +1 @@ +15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine diff --git a/15-3.4/alpine3.18/update-postgis.sh b/15-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 15-3.4/alpine3.18/update-postgis.sh rename to 15-3.4/alpine3.20/update-postgis.sh diff --git a/16-3.3/alpine3.18/tags b/16-3.3/alpine3.18/tags deleted file mode 100644 index fd9633395..000000000 --- a/16-3.3/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.3-alpine3.18 16-3.3.6-alpine3.18 diff --git a/16-3.3/alpine3.18/Dockerfile b/16-3.3/alpine3.20/Dockerfile similarity index 99% rename from 16-3.3/alpine3.18/Dockerfile rename to 16-3.3/alpine3.20/Dockerfile index 5dbe9f55b..7bb648b5c 100644 --- a/16-3.3/alpine3.18/Dockerfile +++ b/16-3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.3/alpine3.18/initdb-postgis.sh b/16-3.3/alpine3.20/initdb-postgis.sh similarity index 100% rename from 16-3.3/alpine3.18/initdb-postgis.sh rename to 16-3.3/alpine3.20/initdb-postgis.sh diff --git a/16-3.3/alpine3.20/tags b/16-3.3/alpine3.20/tags new file mode 100644 index 000000000..a2b84d2b8 --- /dev/null +++ b/16-3.3/alpine3.20/tags @@ -0,0 +1 @@ +16-3.3-alpine3.20 16-3.3.6-alpine3.20 16-3.3-alpine diff --git a/16-3.3/alpine3.18/update-postgis.sh b/16-3.3/alpine3.20/update-postgis.sh similarity index 100% rename from 16-3.3/alpine3.18/update-postgis.sh rename to 16-3.3/alpine3.20/update-postgis.sh diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index d9ea6c450..958a08011 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.3 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags deleted file mode 100644 index a1524be90..000000000 --- a/16-3.4/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-alpine3.18 16-3.4.2-alpine3.18 diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index 75e8bb72f..2ca35a9f7 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine +16-3.4-alpine3.19 16-3.4.2-alpine3.19 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.20/Dockerfile similarity index 99% rename from 16-3.4/alpine3.18/Dockerfile rename to 16-3.4/alpine3.20/Dockerfile index 6eebc966f..28bf27239 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.4/alpine3.18/initdb-postgis.sh b/16-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 16-3.4/alpine3.18/initdb-postgis.sh rename to 16-3.4/alpine3.20/initdb-postgis.sh diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags new file mode 100644 index 000000000..169894e6e --- /dev/null +++ b/16-3.4/alpine3.20/tags @@ -0,0 +1 @@ +16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine diff --git a/16-3.4/alpine3.18/update-postgis.sh b/16-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 16-3.4/alpine3.18/update-postgis.sh rename to 16-3.4/alpine3.20/update-postgis.sh diff --git a/README.md b/README.md index a09403ca9..947c6e5a4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-05-10) +## Versions (2024-05-24) We provide multi-platform image support for the following architectures: @@ -121,35 +121,26 @@ Please note that the included package list is subject to change as we continue t | [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | -### ⛰️Alpine 3.18 based +### ⛰️Alpine 3.20 based - The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -- In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4. +- In the Alpine 3.20 version, the package versions are: geos=3.12.1, gdal=3.9.0, proj=9.4.0, and sfcgal=1.5.1 - PostGIS is compiled from source, making it a bit more challenging to extend. - + | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.11 | -| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.11 | -| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.7 | -| [`12-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.18), [`12-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.3.6 | -| [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.2 | -| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.11 | -| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.11 | -| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.7 | -| [`13-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.18), [`13-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.3.6 | -| [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.2 | -| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.11 | -| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.7 | -| [`14-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.18), [`14-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.3.6 | -| [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.2 | -| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.7 | -| [`15-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.18), [`15-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.3.6 | -| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.2 | -| [`16-3.3-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.18), [`16-3.3.6-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.3.6 | -| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.2 | - +| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | +| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | +| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | +| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | +| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | + ### ⛰️Alpine 3.19 based @@ -160,21 +151,43 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | +### ⛰️Alpine 3.18 based ( deprecated ) + +- The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). +- In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4 +- PostGIS is compiled from source, making it a bit more challenging to extend. +- No fresh upstream docker postgres alpine3.18 images are available. + + +| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | +| ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.11 | +| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.11 | +| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.7 | +| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.11 | +| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.11 | +| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.7 | +| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.11 | +| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.7 | +| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.7 | + + ### 🧪Locked ( experimental ) * Locked old postgis versions for testing. - +* Definition in the [./locked.yml](locked.yml) + * and the image identifiers : -l | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | null | +| [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | postgis=tags/3.1.9, geos=tags/3.6.6, proj=tags/6.3.1, gdal=tags/v3.6.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 | ### 📋Test images diff --git a/manifest.sh b/manifest.sh index 6ae572a99..080e57d28 100755 --- a/manifest.sh +++ b/manifest.sh @@ -54,33 +54,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.2.7-alpine3.18 \ --target ${dockername}:12-3.2.7-alpine3.18 || true -# ----- 12-3.3-alpine3.18 ----- +# ----- 12-3.3-alpine3.20 ----- -echo "manifest: ${dockername}:12-3.3-alpine3.18" +echo "manifest: ${dockername}:12-3.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.18 \ - --target ${dockername}:12-3.3-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.20 \ + --target ${dockername}:12-3.3-alpine3.20 || true -echo "manifest: ${dockername}:12-3.3.6-alpine3.18" +echo "manifest: ${dockername}:12-3.3.6-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.6-alpine3.18 \ - --target ${dockername}:12-3.3.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.3.6-alpine3.20 \ + --target ${dockername}:12-3.3.6-alpine3.20 || true -# ----- 12-3.4-alpine3.18 ----- - -echo "manifest: ${dockername}:12-3.4-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.18 \ - --target ${dockername}:12-3.4-alpine3.18 || true - -echo "manifest: ${dockername}:12-3.4.2-alpine3.18" +echo "manifest: ${dockername}:12-3.3-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.18 \ - --target ${dockername}:12-3.4.2-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:12-3.3-alpine \ + --target ${dockername}:12-3.3-alpine || true # ----- 12-3.4-alpine3.19 ----- @@ -96,6 +88,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.19 \ --target ${dockername}:12-3.4.2-alpine3.19 || true +# ----- 12-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:12-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ + --target ${dockername}:12-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:12-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.20 \ + --target ${dockername}:12-3.4.2-alpine3.20 || true + echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -178,33 +184,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.2.7-alpine3.18 \ --target ${dockername}:13-3.2.7-alpine3.18 || true -# ----- 13-3.3-alpine3.18 ----- - -echo "manifest: ${dockername}:13-3.3-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.18 \ - --target ${dockername}:13-3.3-alpine3.18 || true +# ----- 13-3.3-alpine3.20 ----- -echo "manifest: ${dockername}:13-3.3.6-alpine3.18" +echo "manifest: ${dockername}:13-3.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3.6-alpine3.18 \ - --target ${dockername}:13-3.3.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.20 \ + --target ${dockername}:13-3.3-alpine3.20 || true -# ----- 13-3.4-alpine3.18 ----- - -echo "manifest: ${dockername}:13-3.4-alpine3.18" +echo "manifest: ${dockername}:13-3.3.6-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.18 \ - --target ${dockername}:13-3.4-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.3.6-alpine3.20 \ + --target ${dockername}:13-3.3.6-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4.2-alpine3.18" +echo "manifest: ${dockername}:13-3.3-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.18 \ - --target ${dockername}:13-3.4.2-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:13-3.3-alpine \ + --target ${dockername}:13-3.3-alpine || true # ----- 13-3.4-alpine3.19 ----- @@ -220,6 +218,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.19 \ --target ${dockername}:13-3.4.2-alpine3.19 || true +# ----- 13-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:13-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ + --target ${dockername}:13-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:13-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.20 \ + --target ${dockername}:13-3.4.2-alpine3.20 || true + echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -288,33 +300,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.2.7-alpine3.18 \ --target ${dockername}:14-3.2.7-alpine3.18 || true -# ----- 14-3.3-alpine3.18 ----- +# ----- 14-3.3-alpine3.20 ----- -echo "manifest: ${dockername}:14-3.3-alpine3.18" +echo "manifest: ${dockername}:14-3.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.18 \ - --target ${dockername}:14-3.3-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.20 \ + --target ${dockername}:14-3.3-alpine3.20 || true -echo "manifest: ${dockername}:14-3.3.6-alpine3.18" +echo "manifest: ${dockername}:14-3.3.6-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3.6-alpine3.18 \ - --target ${dockername}:14-3.3.6-alpine3.18 || true - -# ----- 14-3.4-alpine3.18 ----- + --template ${dockername}-ARCHVARIANT:14-3.3.6-alpine3.20 \ + --target ${dockername}:14-3.3.6-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4-alpine3.18" +echo "manifest: ${dockername}:14-3.3-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.18 \ - --target ${dockername}:14-3.4-alpine3.18 || true - -echo "manifest: ${dockername}:14-3.4.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.18 \ - --target ${dockername}:14-3.4.2-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:14-3.3-alpine \ + --target ${dockername}:14-3.3-alpine || true # ----- 14-3.4-alpine3.19 ----- @@ -330,6 +334,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.19 \ --target ${dockername}:14-3.4.2-alpine3.19 || true +# ----- 14-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:14-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ + --target ${dockername}:14-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:14-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.20 \ + --target ${dockername}:14-3.4.2-alpine3.20 || true + echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -398,33 +416,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.2.7-alpine3.18 \ --target ${dockername}:15-3.2.7-alpine3.18 || true -# ----- 15-3.3-alpine3.18 ----- - -echo "manifest: ${dockername}:15-3.3-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.18 \ - --target ${dockername}:15-3.3-alpine3.18 || true +# ----- 15-3.3-alpine3.20 ----- -echo "manifest: ${dockername}:15-3.3.6-alpine3.18" +echo "manifest: ${dockername}:15-3.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3.6-alpine3.18 \ - --target ${dockername}:15-3.3.6-alpine3.18 || true - -# ----- 15-3.4-alpine3.18 ----- + --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.20 \ + --target ${dockername}:15-3.3-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4-alpine3.18" +echo "manifest: ${dockername}:15-3.3.6-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.18 \ - --target ${dockername}:15-3.4-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.3.6-alpine3.20 \ + --target ${dockername}:15-3.3.6-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4.2-alpine3.18" +echo "manifest: ${dockername}:15-3.3-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.18 \ - --target ${dockername}:15-3.4.2-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:15-3.3-alpine \ + --target ${dockername}:15-3.3-alpine || true # ----- 15-3.4-alpine3.19 ----- @@ -440,6 +450,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.19 \ --target ${dockername}:15-3.4.2-alpine3.19 || true +# ----- 15-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:15-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ + --target ${dockername}:15-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:15-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.20 \ + --target ${dockername}:15-3.4.2-alpine3.20 || true + echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -540,33 +564,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent \ --target ${dockername}:15-recent || true -# ----- 16-3.3-alpine3.18 ----- +# ----- 16-3.3-alpine3.20 ----- -echo "manifest: ${dockername}:16-3.3-alpine3.18" +echo "manifest: ${dockername}:16-3.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.18 \ - --target ${dockername}:16-3.3-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.20 \ + --target ${dockername}:16-3.3-alpine3.20 || true -echo "manifest: ${dockername}:16-3.3.6-alpine3.18" +echo "manifest: ${dockername}:16-3.3.6-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3.6-alpine3.18 \ - --target ${dockername}:16-3.3.6-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.3.6-alpine3.20 \ + --target ${dockername}:16-3.3.6-alpine3.20 || true -# ----- 16-3.4-alpine3.18 ----- - -echo "manifest: ${dockername}:16-3.4-alpine3.18" +echo "manifest: ${dockername}:16-3.3-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.18 \ - --target ${dockername}:16-3.4-alpine3.18 || true - -echo "manifest: ${dockername}:16-3.4.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.18 \ - --target ${dockername}:16-3.4.2-alpine3.18 || true + --template ${dockername}-ARCHVARIANT:16-3.3-alpine \ + --target ${dockername}:16-3.3-alpine || true # ----- 16-3.4-alpine3.19 ----- @@ -582,6 +598,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.19 \ --target ${dockername}:16-3.4.2-alpine3.19 || true +# ----- 16-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:16-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ + --target ${dockername}:16-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:16-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.20 \ + --target ${dockername}:16-3.4.2-alpine3.20 || true + echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ diff --git a/versions.json b/versions.json index 48604542a..276e636d8 100644 --- a/versions.json +++ b/versions.json @@ -48,9 +48,9 @@ } }, "12-3.3": { - "alpine3.18": { - "tags": "12-3.3-alpine3.18 12-3.3.6-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.20": { + "tags": "12-3.3-alpine3.20 12-3.3.6-alpine3.20 12-3.3-alpine", + "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -88,9 +88,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, - "alpine3.18": { - "tags": "12-3.4-alpine3.18 12-3.4.2-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.19": { + "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19", + "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -102,9 +102,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, - "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19 12-3.4-alpine", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -166,9 +166,9 @@ } }, "13-3.3": { - "alpine3.18": { - "tags": "13-3.3-alpine3.18 13-3.3.6-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.20": { + "tags": "13-3.3-alpine3.20 13-3.3.6-alpine3.20 13-3.3-alpine", + "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -206,9 +206,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, - "alpine3.18": { - "tags": "13-3.4-alpine3.18 13-3.4.2-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.19": { + "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19", + "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -220,9 +220,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, - "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19 13-3.4-alpine", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -268,9 +268,9 @@ } }, "14-3.3": { - "alpine3.18": { - "tags": "14-3.3-alpine3.18 14-3.3.6-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.20": { + "tags": "14-3.3-alpine3.20 14-3.3.6-alpine3.20 14-3.3-alpine", + "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -308,9 +308,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, - "alpine3.18": { - "tags": "14-3.4-alpine3.18 14-3.4.2-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.19": { + "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19", + "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -322,9 +322,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, - "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19 14-3.4-alpine", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -354,9 +354,9 @@ } }, "15-3.3": { - "alpine3.18": { - "tags": "15-3.3-alpine3.18 15-3.3.6-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.20": { + "tags": "15-3.3-alpine3.20 15-3.3.6-alpine3.20 15-3.3-alpine", + "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -394,9 +394,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, - "alpine3.18": { - "tags": "15-3.4-alpine3.18 15-3.4.2-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.19": { + "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19", + "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -408,9 +408,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, - "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19 15-3.4-alpine", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -441,8 +441,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.15.0", "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", - "DUCKDB_CHECKOUT": "tags/v0.10.2", - "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", + "DUCKDB_CHECKOUT": "tags/v0.10.3", + "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -502,9 +502,9 @@ } }, "16-3.3": { - "alpine3.18": { - "tags": "16-3.3-alpine3.18 16-3.3.6-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.20": { + "tags": "16-3.3-alpine3.20 16-3.3.6-alpine3.20 16-3.3-alpine", + "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -542,9 +542,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, - "alpine3.18": { - "tags": "16-3.4-alpine3.18 16-3.4.2-alpine3.18", - "readme_group": "alpine3.18", + "alpine3.19": { + "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19", + "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -556,9 +556,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, - "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19 16-3.4-alpine alpine", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -589,8 +589,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.15.0", "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", - "DUCKDB_CHECKOUT": "tags/v0.10.2", - "DUCKDB_CHECKOUT_SHA1": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", + "DUCKDB_CHECKOUT": "tags/v0.10.3", + "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", diff --git a/versions.sh b/versions.sh index 3ca39413e..f67977f7a 100755 --- a/versions.sh +++ b/versions.sh @@ -17,11 +17,11 @@ source tools/environment_init.sh api_preference="github" #api_preference="osgeo" -- not working yet -alpine_variants=" alpine3.18 alpine3.19 " +alpine_variants=" alpine3.18 alpine3.19 alpine3.20 " debian_variants=" bullseye bookworm " debian_latest="bookworm" -alpine_latest="alpine3.19" +alpine_latest="alpine3.20" postgis_latest="3.4" postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" @@ -58,8 +58,8 @@ declare -A postgisDebPkgNameVersionSuffixes=( declare -A boostVersion=( ["bullseye"]="1.74.0" ["bookworm"]="1.74.0" # 1.81.0 is not yet optimal. The current bookworm packages mixed use of 1.74.0 and 1.81.0 - ["alpine3.18"]="1.82.0" ["alpine3.19"]="1.82.0" + ["alpine3.20"]="1.82.0" ) # function get_tag_hash() { From f1f26372732b0a3dca0a6214589fe1ed9a82627a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 29 May 2024 20:00:34 +0000 Subject: [PATCH 091/167] Update versions.json and related Dockerfiles --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index d808aa55f..cc0c74a6c 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=19f731d174820dfc0f33e073235c99368b3ad98c +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=6a8b31f866308362b76287da47473a13d279d4a6 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 958a08011..6012d57e6 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=19f731d174820dfc0f33e073235c99368b3ad98c +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=6a8b31f866308362b76287da47473a13d279d4a6 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/README.md b/README.md index 947c6e5a4..257fe0a52 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-05-24) +## Versions (2024-05-29) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 276e636d8..6a2365e20 100644 --- a/versions.json +++ b/versions.json @@ -439,8 +439,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.0", - "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", + "TIMESCALEDB_CHECKOUT": "tags/2.15.1", + "TIMESCALEDB_CHECKOUT_SHA1": "6a8b31f866308362b76287da47473a13d279d4a6", "DUCKDB_CHECKOUT": "tags/v0.10.3", "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -587,8 +587,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.0", - "TIMESCALEDB_CHECKOUT_SHA1": "19f731d174820dfc0f33e073235c99368b3ad98c", + "TIMESCALEDB_CHECKOUT": "tags/2.15.1", + "TIMESCALEDB_CHECKOUT_SHA1": "6a8b31f866308362b76287da47473a13d279d4a6", "DUCKDB_CHECKOUT": "tags/v0.10.3", "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", From 50afbf295d188f83230851075ef3a668faf4e7db Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 1 Jun 2024 20:00:03 +0000 Subject: [PATCH 092/167] Update versions.json and related Dockerfiles --- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 959df3245..282b22fd3 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 -ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 +ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 34f2059d4..ac1d10f6e 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 6a6521775..a0aed7f84 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.4.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 -ARG PGIS1_PROJ_CHECKOUT_SHA1=7cd00d0b2ca594315acd6c76912df39be4607094 +ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 57d36e4ca..9792db6ac 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/README.md b/README.md index 257fe0a52..445c94cb7 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-05-29) +## Versions (2024-06-01) We provide multi-platform image support for the following architectures: @@ -103,8 +103,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.0, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 080e57d28..ae0c64f43 100755 --- a/manifest.sh +++ b/manifest.sh @@ -546,11 +546,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -712,11 +712,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 6a2365e20..0660ce032 100644 --- a/versions.json +++ b/versions.json @@ -477,7 +477,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -487,8 +487,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", - "PROJ_CHECKOUT": "tags/9.4.0", - "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", + "PROJ_CHECKOUT": "tags/9.4.1", + "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.0", "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", @@ -625,7 +625,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.0-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -635,8 +635,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", - "PROJ_CHECKOUT": "tags/9.4.0", - "PROJ_CHECKOUT_SHA1": "7cd00d0b2ca594315acd6c76912df39be4607094", + "PROJ_CHECKOUT": "tags/9.4.1", + "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.0", "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", From 3cd6a693611eeebf74a7fafa6bc85f50cd600ff9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 25 Jun 2024 18:16:07 +0200 Subject: [PATCH 093/167] - remove alpine3.18 - add postgres 17beta1 ( alpine3.20, recent, master ) - bump dive, manifest-tool --- .circleci/config.yml | 12 +- .github/workflows/main.yml | 12 +- 12-3.0/alpine3.18/tags | 1 - 12-3.1/alpine3.18/Dockerfile | 140 ---- 12-3.1/alpine3.18/tags | 1 - 12-3.2/alpine3.18/Dockerfile | 140 ---- 12-3.2/alpine3.18/tags | 1 - 13-3.0/alpine3.18/Dockerfile | 140 ---- 13-3.0/alpine3.18/initdb-postgis.sh | 25 - 13-3.0/alpine3.18/tags | 1 - 13-3.0/alpine3.18/update-postgis.sh | 28 - 13-3.1/alpine3.18/Dockerfile | 140 ---- 13-3.1/alpine3.18/initdb-postgis.sh | 25 - 13-3.1/alpine3.18/tags | 1 - 13-3.1/alpine3.18/update-postgis.sh | 28 - 13-3.2/alpine3.18/Dockerfile | 140 ---- 13-3.2/alpine3.18/initdb-postgis.sh | 25 - 13-3.2/alpine3.18/tags | 1 - 13-3.2/alpine3.18/update-postgis.sh | 28 - 14-3.1/alpine3.18/Dockerfile | 140 ---- 14-3.1/alpine3.18/initdb-postgis.sh | 25 - 14-3.1/alpine3.18/tags | 1 - 14-3.1/alpine3.18/update-postgis.sh | 28 - 14-3.2/alpine3.18/Dockerfile | 140 ---- 14-3.2/alpine3.18/initdb-postgis.sh | 25 - 14-3.2/alpine3.18/tags | 1 - 14-3.2/alpine3.18/update-postgis.sh | 28 - 14-l3.1.9gcp/bookworm/Dockerfile | 1 + 15-3.2/alpine3.18/Dockerfile | 140 ---- 15-3.2/alpine3.18/initdb-postgis.sh | 25 - 15-3.2/alpine3.18/tags | 1 - 15-3.2/alpine3.18/update-postgis.sh | 28 - 15-3.4-bundle0/bookworm/Dockerfile | 6 +- 15-master/bookworm/Dockerfile | 6 + 15-recent/bookworm/Dockerfile | 10 +- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 6 +- 16-master/bookworm/Dockerfile | 6 + 16-recent/bookworm/Dockerfile | 10 +- 16-recent/bookworm/tags | 2 +- .../alpine3.20}/Dockerfile | 8 +- .../alpine3.20}/initdb-postgis.sh | 0 17beta1-3.4/alpine3.20/tags | 1 + .../alpine3.20}/update-postgis.sh | 0 17beta1-master/bookworm/Dockerfile | 726 ++++++++++++++++++ .../bookworm}/initdb-postgis.sh | 0 17beta1-master/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 17beta1-recent/bookworm/Dockerfile | 726 ++++++++++++++++++ .../bookworm}/initdb-postgis.sh | 0 17beta1-recent/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 Dockerfile.master.template | 6 + README.md | 61 +- manifest.sh | 198 ++--- tools/install_dive.sh | 8 +- tools/install_manifest-tool.sh | 2 +- versions.json | 240 ++---- versions.sh | 9 +- 59 files changed, 1691 insertions(+), 1816 deletions(-) delete mode 100644 12-3.0/alpine3.18/tags delete mode 100644 12-3.1/alpine3.18/Dockerfile delete mode 100644 12-3.1/alpine3.18/tags delete mode 100644 12-3.2/alpine3.18/Dockerfile delete mode 100644 12-3.2/alpine3.18/tags delete mode 100644 13-3.0/alpine3.18/Dockerfile delete mode 100644 13-3.0/alpine3.18/initdb-postgis.sh delete mode 100644 13-3.0/alpine3.18/tags delete mode 100755 13-3.0/alpine3.18/update-postgis.sh delete mode 100644 13-3.1/alpine3.18/Dockerfile delete mode 100644 13-3.1/alpine3.18/initdb-postgis.sh delete mode 100644 13-3.1/alpine3.18/tags delete mode 100755 13-3.1/alpine3.18/update-postgis.sh delete mode 100644 13-3.2/alpine3.18/Dockerfile delete mode 100644 13-3.2/alpine3.18/initdb-postgis.sh delete mode 100644 13-3.2/alpine3.18/tags delete mode 100755 13-3.2/alpine3.18/update-postgis.sh delete mode 100644 14-3.1/alpine3.18/Dockerfile delete mode 100644 14-3.1/alpine3.18/initdb-postgis.sh delete mode 100644 14-3.1/alpine3.18/tags delete mode 100755 14-3.1/alpine3.18/update-postgis.sh delete mode 100644 14-3.2/alpine3.18/Dockerfile delete mode 100644 14-3.2/alpine3.18/initdb-postgis.sh delete mode 100644 14-3.2/alpine3.18/tags delete mode 100755 14-3.2/alpine3.18/update-postgis.sh delete mode 100644 15-3.2/alpine3.18/Dockerfile delete mode 100644 15-3.2/alpine3.18/initdb-postgis.sh delete mode 100644 15-3.2/alpine3.18/tags delete mode 100755 15-3.2/alpine3.18/update-postgis.sh rename {12-3.0/alpine3.18 => 17beta1-3.4/alpine3.20}/Dockerfile (95%) rename {12-3.0/alpine3.18 => 17beta1-3.4/alpine3.20}/initdb-postgis.sh (100%) create mode 100644 17beta1-3.4/alpine3.20/tags rename {12-3.0/alpine3.18 => 17beta1-3.4/alpine3.20}/update-postgis.sh (100%) create mode 100644 17beta1-master/bookworm/Dockerfile rename {12-3.1/alpine3.18 => 17beta1-master/bookworm}/initdb-postgis.sh (100%) create mode 100644 17beta1-master/bookworm/tags rename {12-3.1/alpine3.18 => 17beta1-master/bookworm}/update-postgis.sh (100%) create mode 100644 17beta1-recent/bookworm/Dockerfile rename {12-3.2/alpine3.18 => 17beta1-recent/bookworm}/initdb-postgis.sh (100%) create mode 100644 17beta1-recent/bookworm/tags rename {12-3.2/alpine3.18 => 17beta1-recent/bookworm}/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f2dfda34..dcca96ebf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,31 +123,22 @@ workflows: # hence they must be generated within the bundle JOB. # #circleci-targets-start - "12-3.0-alpine3.18", - "12-3.1-alpine3.18", - "12-3.2-alpine3.18", "12-3.3-alpine3.20", "12-3.4-alpine3.19", "12-3.4-alpine3.20", "12-3.4-bookworm", "12-3.4-bullseye", - "13-3.0-alpine3.18", - "13-3.1-alpine3.18", - "13-3.2-alpine3.18", "13-3.3-alpine3.20", "13-3.4-alpine3.19", "13-3.4-alpine3.20", "13-3.4-bookworm", "13-3.4-bullseye", - "14-3.1-alpine3.18", - "14-3.2-alpine3.18", "14-3.3-alpine3.20", "14-3.4-alpine3.19", "14-3.4-alpine3.20", "14-3.4-bookworm", "14-3.4-bullseye", "14-l3.1.9gcp-bookworm", - "15-3.2-alpine3.18", "15-3.3-alpine3.20", "15-3.4-alpine3.19", "15-3.4-alpine3.20", @@ -164,5 +155,8 @@ workflows: "16-3.4-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", + "17beta1-3.4-alpine3.20", + "17beta1-master-bookworm", + "17beta1-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 856c99044..31e13a84f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,31 +24,22 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.0", variant: "alpine3.18" } - - { version: "12-3.1", variant: "alpine3.18" } - - { version: "12-3.2", variant: "alpine3.18" } - { version: "12-3.3", variant: "alpine3.20" } - { version: "12-3.4", variant: "alpine3.19" } - { version: "12-3.4", variant: "alpine3.20" } - { version: "12-3.4", variant: "bookworm" } - { version: "12-3.4", variant: "bullseye" } - - { version: "13-3.0", variant: "alpine3.18" } - - { version: "13-3.1", variant: "alpine3.18" } - - { version: "13-3.2", variant: "alpine3.18" } - { version: "13-3.3", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.19" } - { version: "13-3.4", variant: "alpine3.20" } - { version: "13-3.4", variant: "bookworm" } - { version: "13-3.4", variant: "bullseye" } - - { version: "14-3.1", variant: "alpine3.18" } - - { version: "14-3.2", variant: "alpine3.18" } - { version: "14-3.3", variant: "alpine3.20" } - { version: "14-3.4", variant: "alpine3.19" } - { version: "14-3.4", variant: "alpine3.20" } - { version: "14-3.4", variant: "bookworm" } - { version: "14-3.4", variant: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - - { version: "15-3.2", variant: "alpine3.18" } - { version: "15-3.3", variant: "alpine3.20" } - { version: "15-3.4", variant: "alpine3.19" } - { version: "15-3.4", variant: "alpine3.20" } @@ -65,6 +56,9 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } + - { version: "17beta1-3.4", variant: "alpine3.20" } + - { version: "17beta1-master", variant: "bookworm" } + - { version: "17beta1-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/12-3.0/alpine3.18/tags b/12-3.0/alpine3.18/tags deleted file mode 100644 index 03852dd4c..000000000 --- a/12-3.0/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.0-alpine3.18 12-3.0.11-alpine3.18 diff --git a/12-3.1/alpine3.18/Dockerfile b/12-3.1/alpine3.18/Dockerfile deleted file mode 100644 index 58a24e019..000000000 --- a/12-3.1/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.1/alpine3.18/tags b/12-3.1/alpine3.18/tags deleted file mode 100644 index f1c88e8d6..000000000 --- a/12-3.1/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.1-alpine3.18 12-3.1.11-alpine3.18 diff --git a/12-3.2/alpine3.18/Dockerfile b/12-3.2/alpine3.18/Dockerfile deleted file mode 100644 index eb3bbffda..000000000 --- a/12-3.2/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.2/alpine3.18/tags b/12-3.2/alpine3.18/tags deleted file mode 100644 index e20e16b7e..000000000 --- a/12-3.2/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.2-alpine3.18 12-3.2.7-alpine3.18 diff --git a/13-3.0/alpine3.18/Dockerfile b/13-3.0/alpine3.18/Dockerfile deleted file mode 100644 index 19f92bb5b..000000000 --- a/13-3.0/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.11 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd7f67e7a85103219cdbc49f62e18619bf2a33e6 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.0/alpine3.18/initdb-postgis.sh b/13-3.0/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/13-3.0/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/13-3.0/alpine3.18/tags b/13-3.0/alpine3.18/tags deleted file mode 100644 index 736acd925..000000000 --- a/13-3.0/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.0-alpine3.18 13-3.0.11-alpine3.18 diff --git a/13-3.0/alpine3.18/update-postgis.sh b/13-3.0/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/13-3.0/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/13-3.1/alpine3.18/Dockerfile b/13-3.1/alpine3.18/Dockerfile deleted file mode 100644 index 68fca4ed5..000000000 --- a/13-3.1/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.1/alpine3.18/initdb-postgis.sh b/13-3.1/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/13-3.1/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/13-3.1/alpine3.18/tags b/13-3.1/alpine3.18/tags deleted file mode 100644 index 7d4e7b7ec..000000000 --- a/13-3.1/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.1-alpine3.18 13-3.1.11-alpine3.18 diff --git a/13-3.1/alpine3.18/update-postgis.sh b/13-3.1/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/13-3.1/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/13-3.2/alpine3.18/Dockerfile b/13-3.2/alpine3.18/Dockerfile deleted file mode 100644 index 700564b96..000000000 --- a/13-3.2/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.2/alpine3.18/initdb-postgis.sh b/13-3.2/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/13-3.2/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/13-3.2/alpine3.18/tags b/13-3.2/alpine3.18/tags deleted file mode 100644 index 3faa9ff19..000000000 --- a/13-3.2/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.2-alpine3.18 13-3.2.7-alpine3.18 diff --git a/13-3.2/alpine3.18/update-postgis.sh b/13-3.2/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/13-3.2/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/14-3.1/alpine3.18/Dockerfile b/14-3.1/alpine3.18/Dockerfile deleted file mode 100644 index 09f20f449..000000000 --- a/14-3.1/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.1.11 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=ca03d62cac82018f7ac1e3b9118428ab75e73c51 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.1/alpine3.18/initdb-postgis.sh b/14-3.1/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/14-3.1/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.1/alpine3.18/tags b/14-3.1/alpine3.18/tags deleted file mode 100644 index c0f0d23fd..000000000 --- a/14-3.1/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.1-alpine3.18 14-3.1.11-alpine3.18 diff --git a/14-3.1/alpine3.18/update-postgis.sh b/14-3.1/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/14-3.1/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/14-3.2/alpine3.18/Dockerfile b/14-3.2/alpine3.18/Dockerfile deleted file mode 100644 index 1a7364037..000000000 --- a/14-3.2/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.2/alpine3.18/initdb-postgis.sh b/14-3.2/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/14-3.2/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.2/alpine3.18/tags b/14-3.2/alpine3.18/tags deleted file mode 100644 index 7d5349cdc..000000000 --- a/14-3.2/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.2-alpine3.18 14-3.2.7-alpine3.18 diff --git a/14-3.2/alpine3.18/update-postgis.sh b/14-3.2/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/14-3.2/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 2833cdb0a..8c085367d 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -342,6 +342,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ diff --git a/15-3.2/alpine3.18/Dockerfile b/15-3.2/alpine3.18/Dockerfile deleted file mode 100644 index d25e34649..000000000 --- a/15-3.2/alpine3.18/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.18 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.2.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=32dc0cc4c6fc12da33248b50420d1ad8dba3f131 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.2/alpine3.18/initdb-postgis.sh b/15-3.2/alpine3.18/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/15-3.2/alpine3.18/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/15-3.2/alpine3.18/tags b/15-3.2/alpine3.18/tags deleted file mode 100644 index a1719daa7..000000000 --- a/15-3.2/alpine3.18/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.2-alpine3.18 15-3.2.7-alpine3.18 diff --git a/15-3.2/alpine3.18/update-postgis.sh b/15-3.2/alpine3.18/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/15-3.2/alpine3.18/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index cc0c74a6c..0cdfabc51 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,14 +32,14 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=6a8b31f866308362b76287da47473a13d279d4a6 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=903847e4d69938b8bed8d1d13cb84053e243e262 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.3 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 3388ce7e7..b678a9e30 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -322,6 +322,7 @@ RUN set -eux \ libkml-dev \ libnetcdf-dev \ libopenjp2-7-dev \ + libpng-dev \ libqhull-dev \ libspatialite-dev @@ -382,6 +383,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ @@ -403,6 +405,7 @@ RUN set -eux \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ ; \ @@ -494,6 +497,7 @@ RUN set -eux \ \ # Install GDAL extra dependencies libblosc1 \ + libcrypto++8 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -503,7 +507,9 @@ RUN set -eux \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ + libpng16-16 \ libqhull-r8.0 \ + librasterlite2-1 \ libspatialite7 \ netcdf-bin \ libcfitsio10 \ diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 282b22fd3..38bd9ca4b 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a -ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b +ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 @@ -322,6 +322,7 @@ RUN set -eux \ libkml-dev \ libnetcdf-dev \ libopenjp2-7-dev \ + libpng-dev \ libqhull-dev \ libspatialite-dev @@ -382,6 +383,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ @@ -403,6 +405,7 @@ RUN set -eux \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ ; \ @@ -494,6 +497,7 @@ RUN set -eux \ \ # Install GDAL extra dependencies libblosc1 \ + libcrypto++8 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -503,7 +507,9 @@ RUN set -eux \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ + libpng16-16 \ libqhull-r8.0 \ + librasterlite2-1 \ libspatialite7 \ netcdf-bin \ libcfitsio10 \ diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index ac1d10f6e..fcc40c078 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 6012d57e6..7cf87c23b 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,14 +32,14 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=6a8b31f866308362b76287da47473a13d279d4a6 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=903847e4d69938b8bed8d1d13cb84053e243e262 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v0.10.3 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index e75cb1f55..a579b0592 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -322,6 +322,7 @@ RUN set -eux \ libkml-dev \ libnetcdf-dev \ libopenjp2-7-dev \ + libpng-dev \ libqhull-dev \ libspatialite-dev @@ -382,6 +383,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ @@ -403,6 +405,7 @@ RUN set -eux \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ ; \ @@ -494,6 +497,7 @@ RUN set -eux \ \ # Install GDAL extra dependencies libblosc1 \ + libcrypto++8 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -503,7 +507,9 @@ RUN set -eux \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ + libpng16-16 \ libqhull-r8.0 \ + librasterlite2-1 \ libspatialite7 \ netcdf-bin \ libcfitsio10 \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index a0aed7f84..f64802971 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a -ARG PGIS1_GEOS_CHECKOUT_SHA1=9a5d0587fe62b1551dbee678e2cf6360d292e95b +ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 @@ -322,6 +322,7 @@ RUN set -eux \ libkml-dev \ libnetcdf-dev \ libopenjp2-7-dev \ + libpng-dev \ libqhull-dev \ libspatialite-dev @@ -382,6 +383,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ @@ -403,6 +405,7 @@ RUN set -eux \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ ; \ @@ -494,6 +497,7 @@ RUN set -eux \ \ # Install GDAL extra dependencies libblosc1 \ + libcrypto++8 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -503,7 +507,9 @@ RUN set -eux \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ + libpng16-16 \ libqhull-r8.0 \ + librasterlite2-1 \ libspatialite7 \ netcdf-bin \ libcfitsio10 \ diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 9792db6ac..f883c23a9 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/12-3.0/alpine3.18/Dockerfile b/17beta1-3.4/alpine3.20/Dockerfile similarity index 95% rename from 12-3.0/alpine3.18/Dockerfile rename to 17beta1-3.4/alpine3.20/Dockerfile index a7b576ed1..fefd9236e 100644 --- a/12-3.0/alpine3.18/Dockerfile +++ b/17beta1-3.4/alpine3.20/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.18 +ARG PGIS1_BASE_IMAGE=postgres:17beta1-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.0.11 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd7f67e7a85103219cdbc49f62e18619bf2a33e6 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta1 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.0/alpine3.18/initdb-postgis.sh b/17beta1-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 12-3.0/alpine3.18/initdb-postgis.sh rename to 17beta1-3.4/alpine3.20/initdb-postgis.sh diff --git a/17beta1-3.4/alpine3.20/tags b/17beta1-3.4/alpine3.20/tags new file mode 100644 index 000000000..44a381375 --- /dev/null +++ b/17beta1-3.4/alpine3.20/tags @@ -0,0 +1 @@ +17beta1-3.4-alpine3.20 17beta1-3.4.2-alpine3.20 17beta1-3.4-alpine diff --git a/12-3.0/alpine3.18/update-postgis.sh b/17beta1-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 12-3.0/alpine3.18/update-postgis.sh rename to 17beta1-3.4/alpine3.20/update-postgis.sh diff --git a/17beta1-master/bookworm/Dockerfile b/17beta1-master/bookworm/Dockerfile new file mode 100644 index 000000000..68f6cc85f --- /dev/null +++ b/17beta1-master/bookworm/Dockerfile @@ -0,0 +1,726 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:17beta1-bookworm + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=master +ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GDAL_CHECKOUT=master +ARG PGIS1_PROJ_CHECKOUT=master +ARG PGIS1_SFCGAL_CHECKOUT=master +ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 17beta1-master spatial database extension with PostgreSQL 17beta1 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/12-3.1/alpine3.18/initdb-postgis.sh b/17beta1-master/bookworm/initdb-postgis.sh similarity index 100% rename from 12-3.1/alpine3.18/initdb-postgis.sh rename to 17beta1-master/bookworm/initdb-postgis.sh diff --git a/17beta1-master/bookworm/tags b/17beta1-master/bookworm/tags new file mode 100644 index 000000000..7a9ebdfe7 --- /dev/null +++ b/17beta1-master/bookworm/tags @@ -0,0 +1 @@ +17beta1-master-bookworm 17beta1-master diff --git a/12-3.1/alpine3.18/update-postgis.sh b/17beta1-master/bookworm/update-postgis.sh similarity index 100% rename from 12-3.1/alpine3.18/update-postgis.sh rename to 17beta1-master/bookworm/update-postgis.sh diff --git a/17beta1-recent/bookworm/Dockerfile b/17beta1-recent/bookworm/Dockerfile new file mode 100644 index 000000000..38b5f2746 --- /dev/null +++ b/17beta1-recent/bookworm/Dockerfile @@ -0,0 +1,726 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:17beta1-bookworm + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 +ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 +ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 +ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 17beta1-recent spatial database extension with PostgreSQL 17beta1 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/12-3.2/alpine3.18/initdb-postgis.sh b/17beta1-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 12-3.2/alpine3.18/initdb-postgis.sh rename to 17beta1-recent/bookworm/initdb-postgis.sh diff --git a/17beta1-recent/bookworm/tags b/17beta1-recent/bookworm/tags new file mode 100644 index 000000000..9351993f1 --- /dev/null +++ b/17beta1-recent/bookworm/tags @@ -0,0 +1 @@ +17beta1-recent-bookworm 17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta1-recent diff --git a/12-3.2/alpine3.18/update-postgis.sh b/17beta1-recent/bookworm/update-postgis.sh similarity index 100% rename from 12-3.2/alpine3.18/update-postgis.sh rename to 17beta1-recent/bookworm/update-postgis.sh diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 724d4b613..ab48f18e2 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -326,6 +326,7 @@ RUN set -eux \ libkml-dev \ libnetcdf-dev \ libopenjp2-7-dev \ + libpng-dev \ libqhull-dev \ libspatialite-dev {{ ) else ( -}} @@ -389,6 +390,7 @@ RUN set -eux \ -DGDAL_USE_GEOS=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ -DGDAL_USE_LZ4=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_SQLITE3=ON \ @@ -411,6 +413,7 @@ RUN set -eux \ -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SPATIALITE=ON \ {{ ) else ( -}} @@ -510,6 +513,7 @@ RUN set -eux \ \ # Install GDAL extra dependencies libblosc1 \ + libcrypto++8 \ libfreexl1 \ libfyba0 \ libhdf5-103-1 \ @@ -519,7 +523,9 @@ RUN set -eux \ libkmlengine1 \ libnetcdf19 \ libopenjp2-7 \ + libpng16-16 \ libqhull-r8.0 \ + librasterlite2-1 \ libspatialite7 \ netcdf-bin \ {{ if env.variant != "bullseye" then ( -}} diff --git a/README.md b/README.md index 445c94cb7..d384cf98d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ **Important:** _Please note that this README document is larger than the 25,000 character limit set by Docker Hub. As a result, the version available on Docker Hub will be trimmed and not complete._ _For the complete and untrimmed version of the README, it is recommended to visit the project GitHub page:_ https://github.com/ImreSamu/docker-postgis/blob/master/README.md -The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, 16 and 17beta. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -30,7 +30,8 @@ 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 (2024-06-01) +## Versions (2024-06-25) + We provide multi-platform image support for the following architectures: @@ -103,8 +104,9 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.1, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`17beta1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-bookworm), [`17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta1 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) @@ -121,26 +123,6 @@ Please note that the included package list is subject to change as we continue t | [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | -### ⛰️Alpine 3.20 based - -- The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -- In the Alpine 3.20 version, the package versions are: geos=3.12.1, gdal=3.9.0, proj=9.4.0, and sfcgal=1.5.1 -- PostGIS is compiled from source, making it a bit more challenging to extend. - - -| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | -| ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | -| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | -| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | -| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | -| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | - ### ⛰️Alpine 3.19 based @@ -158,26 +140,27 @@ Please note that the included package list is subject to change as we continue t | [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | -### ⛰️Alpine 3.18 based ( deprecated ) +### ⛰️Alpine 3.20 based - The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -- In the Alpine 3.18 version, the package versions are: geos=3.11, gdal=3.6, proj=9.2, and sfcgal=1.4 +- In the Alpine 3.20 version, the package versions are: geos=3.12.1, gdal=3.9.0, proj=9.4.0, and sfcgal=1.5.1 - PostGIS is compiled from source, making it a bit more challenging to extend. -- No fresh upstream docker postgres alpine3.18 images are available. - + | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0-alpine3.18), [`12-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.0.11 | -| [`12-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1-alpine3.18), [`12-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.1.11 | -| [`12-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2-alpine3.18), [`12-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.2.7 | -| [`13-3.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0-alpine3.18), [`13-3.0.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.0.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.0/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.0.11 | -| [`13-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1-alpine3.18), [`13-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.1.11 | -| [`13-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2-alpine3.18), [`13-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.2.7 | -| [`14-3.1-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1-alpine3.18), [`14-3.1.11-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.1.11-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.1/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.1.11 | -| [`14-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2-alpine3.18), [`14-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.2.7 | -| [`15-3.2-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2-alpine3.18), [`15-3.2.7-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.2.7-alpine3.18) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.2/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.2.7 | - +| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | +| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | +| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | +| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | +| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | + +>>>>>>> Stashed changes ### 🧪Locked ( experimental ) @@ -201,6 +184,8 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17beta1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4-alpine3.20), [`17beta1-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4.2-alpine3.20), [`17beta1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta1 | 3.4.2 | +| [`17beta1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-master-bookworm), [`17beta1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta1 | development: postgis, geos, proj, gdal, cgal, sfcgal | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index ae0c64f43..5a9cd001a 100755 --- a/manifest.sh +++ b/manifest.sh @@ -12,48 +12,6 @@ source tools/environment_init.sh # PLEASE DO NOT EDIT IT DIRECTLY. # -# ----- 12-3.0-alpine3.18 ----- - -echo "manifest: ${dockername}:12-3.0-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.0-alpine3.18 \ - --target ${dockername}:12-3.0-alpine3.18 || true - -echo "manifest: ${dockername}:12-3.0.11-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.0.11-alpine3.18 \ - --target ${dockername}:12-3.0.11-alpine3.18 || true - -# ----- 12-3.1-alpine3.18 ----- - -echo "manifest: ${dockername}:12-3.1-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.1-alpine3.18 \ - --target ${dockername}:12-3.1-alpine3.18 || true - -echo "manifest: ${dockername}:12-3.1.11-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.1.11-alpine3.18 \ - --target ${dockername}:12-3.1.11-alpine3.18 || true - -# ----- 12-3.2-alpine3.18 ----- - -echo "manifest: ${dockername}:12-3.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.2-alpine3.18 \ - --target ${dockername}:12-3.2-alpine3.18 || true - -echo "manifest: ${dockername}:12-3.2.7-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.2.7-alpine3.18 \ - --target ${dockername}:12-3.2.7-alpine3.18 || true - # ----- 12-3.3-alpine3.20 ----- echo "manifest: ${dockername}:12-3.3-alpine3.20" @@ -142,48 +100,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.2-bullseye \ --target ${dockername}:12-3.4.2-bullseye || true -# ----- 13-3.0-alpine3.18 ----- - -echo "manifest: ${dockername}:13-3.0-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.0-alpine3.18 \ - --target ${dockername}:13-3.0-alpine3.18 || true - -echo "manifest: ${dockername}:13-3.0.11-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.0.11-alpine3.18 \ - --target ${dockername}:13-3.0.11-alpine3.18 || true - -# ----- 13-3.1-alpine3.18 ----- - -echo "manifest: ${dockername}:13-3.1-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.1-alpine3.18 \ - --target ${dockername}:13-3.1-alpine3.18 || true - -echo "manifest: ${dockername}:13-3.1.11-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.1.11-alpine3.18 \ - --target ${dockername}:13-3.1.11-alpine3.18 || true - -# ----- 13-3.2-alpine3.18 ----- - -echo "manifest: ${dockername}:13-3.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.2-alpine3.18 \ - --target ${dockername}:13-3.2-alpine3.18 || true - -echo "manifest: ${dockername}:13-3.2.7-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.2.7-alpine3.18 \ - --target ${dockername}:13-3.2.7-alpine3.18 || true - # ----- 13-3.3-alpine3.20 ----- echo "manifest: ${dockername}:13-3.3-alpine3.20" @@ -272,34 +188,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.2-bullseye \ --target ${dockername}:13-3.4.2-bullseye || true -# ----- 14-3.1-alpine3.18 ----- - -echo "manifest: ${dockername}:14-3.1-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.1-alpine3.18 \ - --target ${dockername}:14-3.1-alpine3.18 || true - -echo "manifest: ${dockername}:14-3.1.11-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.1.11-alpine3.18 \ - --target ${dockername}:14-3.1.11-alpine3.18 || true - -# ----- 14-3.2-alpine3.18 ----- - -echo "manifest: ${dockername}:14-3.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.2-alpine3.18 \ - --target ${dockername}:14-3.2-alpine3.18 || true - -echo "manifest: ${dockername}:14-3.2.7-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.2.7-alpine3.18 \ - --target ${dockername}:14-3.2.7-alpine3.18 || true - # ----- 14-3.3-alpine3.20 ----- echo "manifest: ${dockername}:14-3.3-alpine3.20" @@ -402,20 +290,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm \ --target ${dockername}:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm || true -# ----- 15-3.2-alpine3.18 ----- - -echo "manifest: ${dockername}:15-3.2-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.2-alpine3.18 \ - --target ${dockername}:15-3.2-alpine3.18 || true - -echo "manifest: ${dockername}:15-3.2.7-alpine3.18" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.2.7-alpine3.18 \ - --target ${dockername}:15-3.2.7-alpine3.18 || true - # ----- 15-3.3-alpine3.20 ----- echo "manifest: ${dockername}:15-3.3-alpine3.20" @@ -546,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -712,11 +586,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -735,3 +609,63 @@ manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template ${dockername}-ARCHVARIANT:recent \ --target ${dockername}:recent || true + +# ----- 17beta1-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:17beta1-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-3.4-alpine3.20 \ + --target ${dockername}:17beta1-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:17beta1-3.4.2-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-3.4.2-alpine3.20 \ + --target ${dockername}:17beta1-3.4.2-alpine3.20 || true + +echo "manifest: ${dockername}:17beta1-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-3.4-alpine \ + --target ${dockername}:17beta1-3.4-alpine || true + +# ----- 17beta1-master-bookworm ----- + +echo "manifest: ${dockername}:17beta1-master-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-master-bookworm \ + --target ${dockername}:17beta1-master-bookworm || true + +echo "manifest: ${dockername}:17beta1-master" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-master \ + --target ${dockername}:17beta1-master || true + +# ----- 17beta1-recent-bookworm ----- + +echo "manifest: ${dockername}:17beta1-recent-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-recent-bookworm \ + --target ${dockername}:17beta1-recent-bookworm || true + +echo "manifest: ${dockername}:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + +echo "manifest: ${dockername}:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + +echo "manifest: ${dockername}:17beta1-recent" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta1-recent \ + --target ${dockername}:17beta1-recent || true diff --git a/tools/install_dive.sh b/tools/install_dive.sh index 44c07eeab..a7a09789b 100755 --- a/tools/install_dive.sh +++ b/tools/install_dive.sh @@ -1,16 +1,16 @@ #!/bin/bash set -Eeuo pipefail -# https://github.com/wagoodman/dive/releases/tag/v0.11.0 -version="0.11.0" +# https://github.com/wagoodman/dive/releases/tag/v0.12.0 +version="0.12.0" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then IMAGE_ARCH=amd64 - checksum="80835d3320292c4ab761d03c1fd33745ddb9b6064c035b65f77825f18f407d28 tools/dive_0.11.0_linux_amd64.tar.gz" + checksum="20a7966523a0905f950c4fbf26471734420d6788cfffcd4a8c4bc972fded3e96 tools/dive_0.12.0_linux_amd64.tar.gz" elif [[ "$(uname -m)" == "aarch64" ]]; then IMAGE_ARCH=arm64 - checksum="656aa45f618c30f02a30fa256e429ba1afafd9e39e3757e52a30764494c71b7a tools/dive_0.11.0_linux_arm64.tar.gz" + checksum="a2a1470302cdfa367a48f80b67bbf11c0cd8039af9211e39515bd2bbbda58fea tools/dive_0.12.0_linux_arm64.tar.gz" else echo "Architecture not supported: $(uname -m)" exit 1 diff --git a/tools/install_manifest-tool.sh b/tools/install_manifest-tool.sh index b39b404d7..d20ac623a 100755 --- a/tools/install_manifest-tool.sh +++ b/tools/install_manifest-tool.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail # https://github.com/estesp/manifest-tool -version="2.1.5" +version="2.1.6" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then diff --git a/versions.json b/versions.json index 0660ce032..0cafe830c 100644 --- a/versions.json +++ b/versions.json @@ -1,52 +1,4 @@ { - "12-3.0": { - "alpine3.18": { - "tags": "12-3.0-alpine3.18 12-3.0.11-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.0", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.0.11", - "POSTGIS_SHA256": "556605dabe9d99a99353a76348480e7a25e28b48ac6d9d08ed033e3b37a96d26", - "POSTGIS_CHECKOUT": "tags/3.0.11", - "POSTGIS_CHECKOUT_SHA1": "dd7f67e7a85103219cdbc49f62e18619bf2a33e6" - } - }, - "12-3.1": { - "alpine3.18": { - "tags": "12-3.1-alpine3.18 12-3.1.11-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.1", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.1.11", - "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", - "POSTGIS_CHECKOUT": "tags/3.1.11", - "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" - } - }, - "12-3.2": { - "alpine3.18": { - "tags": "12-3.2-alpine3.18 12-3.2.7-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.2", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.2.7", - "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", - "POSTGIS_CHECKOUT": "tags/3.2.7", - "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" - } - }, "12-3.3": { "alpine3.20": { "tags": "12-3.3-alpine3.20 12-3.3.6-alpine3.20 12-3.3-alpine", @@ -117,54 +69,6 @@ "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, - "13-3.0": { - "alpine3.18": { - "tags": "13-3.0-alpine3.18 13-3.0.11-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.0", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.0.11", - "POSTGIS_SHA256": "556605dabe9d99a99353a76348480e7a25e28b48ac6d9d08ed033e3b37a96d26", - "POSTGIS_CHECKOUT": "tags/3.0.11", - "POSTGIS_CHECKOUT_SHA1": "dd7f67e7a85103219cdbc49f62e18619bf2a33e6" - } - }, - "13-3.1": { - "alpine3.18": { - "tags": "13-3.1-alpine3.18 13-3.1.11-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.1", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.1.11", - "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", - "POSTGIS_CHECKOUT": "tags/3.1.11", - "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" - } - }, - "13-3.2": { - "alpine3.18": { - "tags": "13-3.2-alpine3.18 13-3.2.7-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.2", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.2.7", - "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", - "POSTGIS_CHECKOUT": "tags/3.2.7", - "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" - } - }, "13-3.3": { "alpine3.20": { "tags": "13-3.3-alpine3.20 13-3.3.6-alpine3.20 13-3.3-alpine", @@ -235,38 +139,6 @@ "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, - "14-3.1": { - "alpine3.18": { - "tags": "14-3.1-alpine3.18 14-3.1.11-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.1", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "14", - "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.1.11", - "POSTGIS_SHA256": "edf3807c51f4a4613ea1e62184da8d146ed073d65a065a14beed48c1ab31d07b", - "POSTGIS_CHECKOUT": "tags/3.1.11", - "POSTGIS_CHECKOUT_SHA1": "ca03d62cac82018f7ac1e3b9118428ab75e73c51" - } - }, - "14-3.2": { - "alpine3.18": { - "tags": "14-3.2-alpine3.18 14-3.2.7-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.2", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "14", - "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.2.7", - "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", - "POSTGIS_CHECKOUT": "tags/3.2.7", - "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" - } - }, "14-3.3": { "alpine3.20": { "tags": "14-3.3-alpine3.20 14-3.3.6-alpine3.20 14-3.3-alpine", @@ -337,22 +209,6 @@ "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, - "15-3.2": { - "alpine3.18": { - "tags": "15-3.2-alpine3.18 15-3.2.7-alpine3.18", - "readme_group": "alpine3.18", - "postgis": "3.2", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "15", - "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.2.7", - "POSTGIS_SHA256": "c1be7f1d71752e1a5fc63607e751d7d2cc279d7cc040fbdea0055e36e65bab81", - "POSTGIS_CHECKOUT": "tags/3.2.7", - "POSTGIS_CHECKOUT_SHA1": "32dc0cc4c6fc12da33248b50420d1ad8dba3f131" - } - }, "15-3.3": { "alpine3.20": { "tags": "15-3.3-alpine3.20 15-3.3.6-alpine3.20 15-3.3-alpine", @@ -439,10 +295,10 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.1", - "TIMESCALEDB_CHECKOUT_SHA1": "6a8b31f866308362b76287da47473a13d279d4a6", - "DUCKDB_CHECKOUT": "tags/v0.10.3", - "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", + "TIMESCALEDB_CHECKOUT": "tags/2.15.2", + "TIMESCALEDB_CHECKOUT_SHA1": "903847e4d69938b8bed8d1d13cb84053e243e262", + "DUCKDB_CHECKOUT": "tags/v1.0.0", + "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -477,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -492,8 +348,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.0", "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", - "GEOS_CHECKOUT": "tags/3.12.1", - "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", + "GEOS_CHECKOUT": "tags/3.12.2", + "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.1", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "CGAL_CHECKOUT": "tags/v5.6.1", @@ -587,10 +443,10 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.1", - "TIMESCALEDB_CHECKOUT_SHA1": "6a8b31f866308362b76287da47473a13d279d4a6", - "DUCKDB_CHECKOUT": "tags/v0.10.3", - "DUCKDB_CHECKOUT_SHA1": "70fd6a8a2450c1e2a7d0547d4c0666a649dc378e", + "TIMESCALEDB_CHECKOUT": "tags/2.15.2", + "TIMESCALEDB_CHECKOUT_SHA1": "903847e4d69938b8bed8d1d13cb84053e243e262", + "DUCKDB_CHECKOUT": "tags/v1.0.0", + "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -625,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.1-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -640,8 +496,76 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.0", "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", - "GEOS_CHECKOUT": "tags/3.12.1", - "GEOS_CHECKOUT_SHA1": "9a5d0587fe62b1551dbee678e2cf6360d292e95b", + "GEOS_CHECKOUT": "tags/3.12.2", + "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", + "SFCGAL_CHECKOUT": "tags/v1.5.1", + "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "CGAL_CHECKOUT": "tags/v5.6.1", + "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", + "BOOST_VERSION": "1.74.0" + } + }, + "17beta1-3.4": { + "alpine3.20": { + "tags": "17beta1-3.4-alpine3.20 17beta1-3.4.2-alpine3.20 17beta1-3.4-alpine", + "readme_group": "test", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "17beta1", + "PG_DOCKER": "17beta1", + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + } + }, + "17beta1-master": { + "bookworm": { + "tags": "17beta1-master-bookworm 17beta1-master", + "postgis": "master", + "readme_group": "test", + "PG_MAJOR": "17beta1", + "PG_DOCKER": "17beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "master", + "POSTGIS_CHECKOUT_SHA1": "nocheck", + "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT_SHA1": "nocheck", + "SFCGAL_CHECKOUT": "master", + "SFCGAL_CHECKOUT_SHA1": "nocheck", + "PROJ_CHECKOUT": "master", + "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT": "master", + "GDAL_CHECKOUT_SHA1": "nocheck", + "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT_SHA1": "nocheck", + "BOOST_VERSION": "1.74.0" + } + }, + "17beta1-recent": { + "bookworm": { + "tags": "17beta1-recent-bookworm 17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta1-recent", + "postgis": "recent", + "readme_group": "recent", + "PG_MAJOR": "17beta1", + "PG_DOCKER": "17beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", + "PROJ_CHECKOUT": "tags/9.4.1", + "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT": "tags/v3.9.0", + "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", + "GEOS_CHECKOUT": "tags/3.12.2", + "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.1", "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", "CGAL_CHECKOUT": "tags/v5.6.1", diff --git a/versions.sh b/versions.sh index f67977f7a..2f291850a 100755 --- a/versions.sh +++ b/versions.sh @@ -17,7 +17,7 @@ source tools/environment_init.sh api_preference="github" #api_preference="osgeo" -- not working yet -alpine_variants=" alpine3.18 alpine3.19 alpine3.20 " +alpine_variants=" alpine3.19 alpine3.20 " debian_variants=" bullseye bookworm " debian_latest="bookworm" @@ -25,7 +25,7 @@ alpine_latest="alpine3.20" postgis_latest="3.4" postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4" -postgres_versions="11 12 13 14 15 16" +postgres_versions="11 12 13 14 15 16 17beta1" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used @@ -171,6 +171,11 @@ if [ "$api_preference" == "github" ]; then echo " You can check your remaining requests with :" echo " curl -sI https://api.github.com/users/postgis | grep x-ratelimit " echo + echo " ------------------------ " + curl -sI https://api.github.com/users/postgis | grep x-ratelimit + echo + echo " The limit will be reset at :" + curl -sI https://api.github.com/users/postgis | grep x-ratelimit-reset | cut -d' ' -f2 | xargs -I {} date -d @{} exit 1 fi fi From cf2fa497932755dee5579296311ebeeee4ab3ea0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 25 Jun 2024 19:06:57 +0200 Subject: [PATCH 094/167] remove pg_quack from bundle --- Dockerfile.bundle0.template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template index cdb5d89b9..3f8bccd0a 100644 --- a/Dockerfile.bundle0.template +++ b/Dockerfile.bundle0.template @@ -216,18 +216,18 @@ RUN set -eux \ && make -j$(nproc) \ && make install -{{ if env.version | startswith("16") then ( -}} -# pg_quack is not available for PG16 -# - https://github.com/hydradatabase/pg_quack/issues/3 -{{ ) else ( -}} -# add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) -# TODO: add pg_quack version! -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ - && cd pg_quack \ - && make -j$(nproc) \ - && make install -{{ ) end -}} +# {{ if env.version | startswith("16") then ( -}} +# # pg_quack is not available for PG16 +# # - https://github.com/hydradatabase/pg_quack/issues/3 +# {{ ) else ( -}} +# # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) +# # TODO: add pg_quack version! +# RUN set -eux \ +# && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ +# && cd pg_quack \ +# && make -j$(nproc) \ +# && make install +# {{ ) end -}} # install pg_hint_plan RUN set -eux \ From 0c6110bceb677e22f1155282dba70298a8fe75d4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 25 Jun 2024 19:07:53 +0200 Subject: [PATCH 095/167] temp fix bundle error --- 15-3.4-bundle0/bookworm/Dockerfile | 16 ++++++++-------- 16-3.4-bundle0/bookworm/Dockerfile | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 0cdfabc51..82d4841e2 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -221,14 +221,14 @@ RUN set -eux \ && make -j$(nproc) \ && make install -# add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) -# TODO: add pg_quack version! -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ - && cd pg_quack \ - && make -j$(nproc) \ - && make install - +# # # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) +# # TODO: add pg_quack version! +# RUN set -eux \ +# && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ +# && cd pg_quack \ +# && make -j$(nproc) \ +# && make install +# # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 7cf87c23b..9ef687653 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -221,9 +221,9 @@ RUN set -eux \ && make -j$(nproc) \ && make install -# pg_quack is not available for PG16 -# - https://github.com/hydradatabase/pg_quack/issues/3 - +# # # pg_quack is not available for PG16 +# # - https://github.com/hydradatabase/pg_quack/issues/3 +# # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ From 578c4f05920cdbdab33b11f0e5cdcfb9356ab879 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 3 Jul 2024 14:13:35 +0200 Subject: [PATCH 096/167] 17beta2 + update.sh --- .circleci/config.yml | 6 +- .github/workflows/main.yml | 6 +- 15-3.4-bundle0/bookworm/Dockerfile | 4 +- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 4 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17beta1-3.4/alpine3.20/tags | 1 - 17beta1-master/bookworm/tags | 1 - 17beta1-recent/bookworm/tags | 1 - .../alpine3.20/Dockerfile | 4 +- .../alpine3.20/initdb-postgis.sh | 0 17beta2-3.4/alpine3.20/tags | 1 + .../alpine3.20/update-postgis.sh | 0 .../bookworm/Dockerfile | 4 +- .../bookworm/initdb-postgis.sh | 0 17beta2-master/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 .../bookworm/Dockerfile | 8 +-- .../bookworm/initdb-postgis.sh | 0 17beta2-recent/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 README.md | 14 ++-- manifest.sh | 72 +++++++++---------- versions.json | 48 ++++++------- versions.sh | 4 +- 27 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 17beta1-3.4/alpine3.20/tags delete mode 100644 17beta1-master/bookworm/tags delete mode 100644 17beta1-recent/bookworm/tags rename {17beta1-3.4 => 17beta2-3.4}/alpine3.20/Dockerfile (97%) rename {17beta1-3.4 => 17beta2-3.4}/alpine3.20/initdb-postgis.sh (100%) create mode 100644 17beta2-3.4/alpine3.20/tags rename {17beta1-3.4 => 17beta2-3.4}/alpine3.20/update-postgis.sh (100%) rename {17beta1-master => 17beta2-master}/bookworm/Dockerfile (99%) rename {17beta1-master => 17beta2-master}/bookworm/initdb-postgis.sh (100%) create mode 100644 17beta2-master/bookworm/tags rename {17beta1-master => 17beta2-master}/bookworm/update-postgis.sh (100%) rename {17beta1-recent => 17beta2-recent}/bookworm/Dockerfile (98%) rename {17beta1-recent => 17beta2-recent}/bookworm/initdb-postgis.sh (100%) create mode 100644 17beta2-recent/bookworm/tags rename {17beta1-recent => 17beta2-recent}/bookworm/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcca96ebf..a70f51f6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,8 +155,8 @@ workflows: "16-3.4-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", - "17beta1-3.4-alpine3.20", - "17beta1-master-bookworm", - "17beta1-recent-bookworm", + "17beta2-3.4-alpine3.20", + "17beta2-master-bookworm", + "17beta2-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31e13a84f..e3069aa8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,9 +56,9 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - - { version: "17beta1-3.4", variant: "alpine3.20" } - - { version: "17beta1-master", variant: "bookworm" } - - { version: "17beta1-recent", variant: "bookworm" } + - { version: "17beta2-3.4", variant: "alpine3.20" } + - { version: "17beta2-master", variant: "bookworm" } + - { version: "17beta2-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 82d4841e2..3a65da1e7 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=903847e4d69938b8bed8d1d13cb84053e243e262 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.3 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 38bd9ca4b..609d3b018 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 +ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index fcc40c078..af057e22e 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 9ef687653..68eb53a71 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=903847e4d69938b8bed8d1d13cb84053e243e262 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.3 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index f64802971..c89aeacb1 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 +ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index f883c23a9..587be5fb1 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17beta1-3.4/alpine3.20/tags b/17beta1-3.4/alpine3.20/tags deleted file mode 100644 index 44a381375..000000000 --- a/17beta1-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17beta1-3.4-alpine3.20 17beta1-3.4.2-alpine3.20 17beta1-3.4-alpine diff --git a/17beta1-master/bookworm/tags b/17beta1-master/bookworm/tags deleted file mode 100644 index 7a9ebdfe7..000000000 --- a/17beta1-master/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta1-master-bookworm 17beta1-master diff --git a/17beta1-recent/bookworm/tags b/17beta1-recent/bookworm/tags deleted file mode 100644 index 9351993f1..000000000 --- a/17beta1-recent/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta1-recent-bookworm 17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta1-recent diff --git a/17beta1-3.4/alpine3.20/Dockerfile b/17beta2-3.4/alpine3.20/Dockerfile similarity index 97% rename from 17beta1-3.4/alpine3.20/Dockerfile rename to 17beta2-3.4/alpine3.20/Dockerfile index fefd9236e..2d5db9d7b 100644 --- a/17beta1-3.4/alpine3.20/Dockerfile +++ b/17beta2-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17beta1-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17beta2-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta1 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta2 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17beta1-3.4/alpine3.20/initdb-postgis.sh b/17beta2-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 17beta1-3.4/alpine3.20/initdb-postgis.sh rename to 17beta2-3.4/alpine3.20/initdb-postgis.sh diff --git a/17beta2-3.4/alpine3.20/tags b/17beta2-3.4/alpine3.20/tags new file mode 100644 index 000000000..92a496897 --- /dev/null +++ b/17beta2-3.4/alpine3.20/tags @@ -0,0 +1 @@ +17beta2-3.4-alpine3.20 17beta2-3.4.2-alpine3.20 17beta2-3.4-alpine diff --git a/17beta1-3.4/alpine3.20/update-postgis.sh b/17beta2-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 17beta1-3.4/alpine3.20/update-postgis.sh rename to 17beta2-3.4/alpine3.20/update-postgis.sh diff --git a/17beta1-master/bookworm/Dockerfile b/17beta2-master/bookworm/Dockerfile similarity index 99% rename from 17beta1-master/bookworm/Dockerfile rename to 17beta2-master/bookworm/Dockerfile index 68f6cc85f..945f9ea24 100644 --- a/17beta1-master/bookworm/Dockerfile +++ b/17beta2-master/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta1-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17beta2-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta1-master spatial database extension with PostgreSQL 17beta1 bookworm" \ + org.opencontainers.image.description="PostGIS - 17beta2-master spatial database extension with PostgreSQL 17beta2 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta1-master/bookworm/initdb-postgis.sh b/17beta2-master/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta1-master/bookworm/initdb-postgis.sh rename to 17beta2-master/bookworm/initdb-postgis.sh diff --git a/17beta2-master/bookworm/tags b/17beta2-master/bookworm/tags new file mode 100644 index 000000000..1a7dbfb33 --- /dev/null +++ b/17beta2-master/bookworm/tags @@ -0,0 +1 @@ +17beta2-master-bookworm 17beta2-master diff --git a/17beta1-master/bookworm/update-postgis.sh b/17beta2-master/bookworm/update-postgis.sh similarity index 100% rename from 17beta1-master/bookworm/update-postgis.sh rename to 17beta2-master/bookworm/update-postgis.sh diff --git a/17beta1-recent/bookworm/Dockerfile b/17beta2-recent/bookworm/Dockerfile similarity index 98% rename from 17beta1-recent/bookworm/Dockerfile rename to 17beta2-recent/bookworm/Dockerfile index 38b5f2746..7cf3130c4 100644 --- a/17beta1-recent/bookworm/Dockerfile +++ b/17beta2-recent/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta1-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17beta2-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=bb5ea618e23e498e79e8b8e6bd7215ad94bb2103 +ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta1-recent spatial database extension with PostgreSQL 17beta1 bookworm" \ + org.opencontainers.image.description="PostGIS - 17beta2-recent spatial database extension with PostgreSQL 17beta2 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta1-recent/bookworm/initdb-postgis.sh b/17beta2-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta1-recent/bookworm/initdb-postgis.sh rename to 17beta2-recent/bookworm/initdb-postgis.sh diff --git a/17beta2-recent/bookworm/tags b/17beta2-recent/bookworm/tags new file mode 100644 index 000000000..705afad45 --- /dev/null +++ b/17beta2-recent/bookworm/tags @@ -0,0 +1 @@ +17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent diff --git a/17beta1-recent/bookworm/update-postgis.sh b/17beta2-recent/bookworm/update-postgis.sh similarity index 100% rename from 17beta1-recent/bookworm/update-postgis.sh rename to 17beta2-recent/bookworm/update-postgis.sh diff --git a/README.md b/README.md index d384cf98d..75c5a42f1 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-06-25) +## Versions (2024-07-03) We provide multi-platform image support for the following architectures: @@ -104,9 +104,9 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`17beta1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-bookworm), [`17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta1 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.0, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) @@ -160,7 +160,7 @@ Please note that the included package list is subject to change as we continue t | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | | [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | ->>>>>>> Stashed changes + ### 🧪Locked ( experimental ) @@ -184,8 +184,8 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4-alpine3.20), [`17beta1-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4.2-alpine3.20), [`17beta1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta1 | 3.4.2 | -| [`17beta1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-master-bookworm), [`17beta1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta1 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17beta2-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine3.20), [`17beta2-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4.2-alpine3.20), [`17beta2-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta2 | 3.4.2 | +| [`17beta2-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master-bookworm), [`17beta2-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | development: postgis, geos, proj, gdal, cgal, sfcgal | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 5a9cd001a..4e6e90386 100755 --- a/manifest.sh +++ b/manifest.sh @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -586,11 +586,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -610,62 +610,62 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:recent \ --target ${dockername}:recent || true -# ----- 17beta1-3.4-alpine3.20 ----- +# ----- 17beta2-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:17beta1-3.4-alpine3.20" +echo "manifest: ${dockername}:17beta2-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-3.4-alpine3.20 \ - --target ${dockername}:17beta1-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta2-3.4-alpine3.20 \ + --target ${dockername}:17beta2-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17beta1-3.4.2-alpine3.20" +echo "manifest: ${dockername}:17beta2-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-3.4.2-alpine3.20 \ - --target ${dockername}:17beta1-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta2-3.4.2-alpine3.20 \ + --target ${dockername}:17beta2-3.4.2-alpine3.20 || true -echo "manifest: ${dockername}:17beta1-3.4-alpine" +echo "manifest: ${dockername}:17beta2-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-3.4-alpine \ - --target ${dockername}:17beta1-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:17beta2-3.4-alpine \ + --target ${dockername}:17beta2-3.4-alpine || true -# ----- 17beta1-master-bookworm ----- +# ----- 17beta2-master-bookworm ----- -echo "manifest: ${dockername}:17beta1-master-bookworm" +echo "manifest: ${dockername}:17beta2-master-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-master-bookworm \ - --target ${dockername}:17beta1-master-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-master-bookworm \ + --target ${dockername}:17beta2-master-bookworm || true -echo "manifest: ${dockername}:17beta1-master" +echo "manifest: ${dockername}:17beta2-master" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-master \ - --target ${dockername}:17beta1-master || true + --template ${dockername}-ARCHVARIANT:17beta2-master \ + --target ${dockername}:17beta2-master || true -# ----- 17beta1-recent-bookworm ----- +# ----- 17beta2-recent-bookworm ----- -echo "manifest: ${dockername}:17beta1-recent-bookworm" +echo "manifest: ${dockername}:17beta2-recent-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-recent-bookworm \ - --target ${dockername}:17beta1-recent-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-recent-bookworm \ + --target ${dockername}:17beta2-recent-bookworm || true -echo "manifest: ${dockername}:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ + --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true -echo "manifest: ${dockername}:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true -echo "manifest: ${dockername}:17beta1-recent" +echo "manifest: ${dockername}:17beta2-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta1-recent \ - --target ${dockername}:17beta1-recent || true + --template ${dockername}-ARCHVARIANT:17beta2-recent \ + --target ${dockername}:17beta2-recent || true diff --git a/versions.json b/versions.json index 0cafe830c..4b242386f 100644 --- a/versions.json +++ b/versions.json @@ -295,8 +295,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.2", - "TIMESCALEDB_CHECKOUT_SHA1": "903847e4d69938b8bed8d1d13cb84053e243e262", + "TIMESCALEDB_CHECKOUT": "tags/2.15.3", + "TIMESCALEDB_CHECKOUT_SHA1": "777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -346,8 +346,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.0", - "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", + "GDAL_CHECKOUT": "tags/v3.9.1", + "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -443,8 +443,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.2", - "TIMESCALEDB_CHECKOUT_SHA1": "903847e4d69938b8bed8d1d13cb84053e243e262", + "TIMESCALEDB_CHECKOUT": "tags/2.15.3", + "TIMESCALEDB_CHECKOUT_SHA1": "777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -494,8 +494,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.0", - "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", + "GDAL_CHECKOUT": "tags/v3.9.1", + "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.1", @@ -505,29 +505,29 @@ "BOOST_VERSION": "1.74.0" } }, - "17beta1-3.4": { + "17beta2-3.4": { "alpine3.20": { - "tags": "17beta1-3.4-alpine3.20 17beta1-3.4.2-alpine3.20 17beta1-3.4-alpine", + "tags": "17beta2-3.4-alpine3.20 17beta2-3.4.2-alpine3.20 17beta2-3.4-alpine", "readme_group": "test", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17beta1", - "PG_DOCKER": "17beta1", + "PG_MAJOR": "17beta2", + "PG_DOCKER": "17beta2", "POSTGIS_VERSION": "3.4.2", "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, - "17beta1-master": { + "17beta2-master": { "bookworm": { - "tags": "17beta1-master-bookworm 17beta1-master", + "tags": "17beta2-master-bookworm 17beta2-master", "postgis": "master", "readme_group": "test", - "PG_MAJOR": "17beta1", - "PG_DOCKER": "17beta1", + "PG_MAJOR": "17beta2", + "PG_DOCKER": "17beta2", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", @@ -547,13 +547,13 @@ "BOOST_VERSION": "1.74.0" } }, - "17beta1-recent": { + "17beta2-recent": { "bookworm": { - "tags": "17beta1-recent-bookworm 17beta1-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.0-cgal5.6.1-sfcgal1.5.1-bookworm 17beta1-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta1-recent", + "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", "postgis": "recent", "readme_group": "recent", - "PG_MAJOR": "17beta1", - "PG_DOCKER": "17beta1", + "PG_MAJOR": "17beta2", + "PG_DOCKER": "17beta2", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", @@ -562,8 +562,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.0", - "GDAL_CHECKOUT_SHA1": "bb5ea618e23e498e79e8b8e6bd7215ad94bb2103", + "GDAL_CHECKOUT": "tags/v3.9.1", + "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.1", diff --git a/versions.sh b/versions.sh index 2f291850a..cef4ef004 100755 --- a/versions.sh +++ b/versions.sh @@ -24,8 +24,8 @@ debian_latest="bookworm" alpine_latest="alpine3.20" postgis_latest="3.4" postgres_latest="16" -postgis_versions="3.0 3.1 3.2 3.3 3.4" -postgres_versions="11 12 13 14 15 16 17beta1" +postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" +postgres_versions="11 12 13 14 15 16 17beta2" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used From 8de593078324a7554764ac388f4b20cae5fa49fb Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 3 Jul 2024 15:20:55 +0200 Subject: [PATCH 097/167] fix readme group categorisation --- README.md | 2 +- versions.json | 2 +- versions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 75c5a42f1..bf59979d0 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,6 @@ For those new to PostGIS, we recommend the following image versions: | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | | [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ### 🧪Debian Geo Bundle ( experimental ) @@ -186,6 +185,7 @@ Please note that the included package list is subject to change as we continue t | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta2-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine3.20), [`17beta2-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4.2-alpine3.20), [`17beta2-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta2 | 3.4.2 | | [`17beta2-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master-bookworm), [`17beta2-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | ## 🚀Usage diff --git a/versions.json b/versions.json index 4b242386f..eeb977248 100644 --- a/versions.json +++ b/versions.json @@ -551,7 +551,7 @@ "bookworm": { "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", "postgis": "recent", - "readme_group": "recent", + "readme_group": "test", "PG_MAJOR": "17beta2", "PG_DOCKER": "17beta2", "arch": "amd64 arm64", diff --git a/versions.sh b/versions.sh index cef4ef004..4031441b7 100755 --- a/versions.sh +++ b/versions.sh @@ -529,7 +529,7 @@ for version in "${versions[@]}"; do if [ -n "$bundleType" ]; then readme_group="$bundleType" bundleTypeTags="-${bundleType}" - elif [[ "recent" == "$postgisVersion" ]]; then + elif [[ ${postgresLastMainTags[$postgresVersion]} =~ ^[0-9]+$ ]] && [[ "$postgisVersion" == "recent" ]]; then readme_group="recent" elif [[ ${mainTags} =~ [a-zA-Z] ]]; then readme_group="test" From 009635e294618af10ff6e38392b8783d1e91e20e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 3 Jul 2024 17:18:28 +0200 Subject: [PATCH 098/167] improve update workflow --- .github/workflows/update.yml | 61 +++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 8dde7e7db..8bc44af3f 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -3,6 +3,10 @@ name: "update_dockerfiles" on: schedule: - cron: '57 19 * * *' + workflow_dispatch: # Allow manual triggering + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: update_dockerfiles: @@ -10,6 +14,9 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch all history for all branches and tags + - run: docker ps -a - name: Login to dockerhub uses: docker/login-action@v3 @@ -40,22 +47,60 @@ jobs: echo "versions.json not changed" fi + - name: Check for existing open PRs with label 'automated_pr' + if: env.versions_changed == 'true' + id: check_prs + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + existing_prs=$(gh pr list --label automated_pr --json number --jq length) + if [ "$existing_prs" -eq "0" ]; then + echo "create_pr=true" >> $GITHUB_OUTPUT + else + echo "create_pr=false" >> $GITHUB_OUTPUT + echo "An automated PR already exists. Skipping PR creation." + fi + # https://github.com/peter-evans/create-pull-request - name: Create Pull Request - if: env.versions_changed == 'true' + if: env.versions_changed == 'true' && steps.check_prs.outputs.create_pr == 'true' + id: create-pr uses: peter-evans/create-pull-request@v6 with: -# token: ${{ secrets.POSTGIS_PR_REPO_TOKEN }} committer: GitHub author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit-message: Update versions.json and related Dockerfiles - title: '🤖 Bump the: ${{ env.versions_changed_list }}' + commit-message: '🤖 Bump versions: ${{ env.versions_changed_list }}' + title: '🤖 Bump versions: ${{ env.versions_changed_list }}' body: | - Update docker-postgis versions.json and related Dockerfiles. - Changes: ${{ env.versions_changed_list }} + ## Automated Version Update + + This pull request was automatically generated by the `update_dockerfiles` workflow ( `.github/workflows/update.yml`) + to update docker-postgis versions.json and related Dockerfiles. + + ### Changes + ${{ env.versions_changed_list }} + + ### Important Notes + 1. **Verification Required**: Please carefully review the changes to ensure they are correct and appropriate. + 2. **PR Limit**: While this PR remains open, no new automated PRs will be created by this workflow. This ensures only one automated update is processed at a time. + + If you have any questions or concerns, please comment on this PR or contact the maintainers. - Auto-generated by .github/workflows/update.yml - Please verify if the changes are correct! labels: automated_pr branch: ${{ env.BRANCH_NAME }} delete-branch: true + + - name: Close and Reopen PR + if: steps.create-pr.outputs.pull-request-number + run: | + PR_NUMBER=${{ steps.create-pr.outputs.pull-request-number }} + gh pr close $PR_NUMBER --comment "Closing to trigger full CI/CD pipeline" + sleep 5 # Wait for 5 seconds to ensure the PR is fully closed + gh pr reopen $PR_NUMBER --comment "Reopening to trigger full CI/CD pipeline" + + - name: Comment PR + if: steps.create-pr.outputs.pull-request-number + run: | + PR_NUMBER=${{ steps.create-pr.outputs.pull-request-number }} + gh pr comment $PR_NUMBER --body "This PR was automatically created and reopened by the update_dockerfiles workflow to trigger the full CI/CD pipeline. Please review the changes carefully." + \ No newline at end of file From c0c41ad6a3b35be7e809f62fa1678d920507edd5 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 25 Jul 2024 20:00:24 +0000 Subject: [PATCH 099/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20SFCGA?= =?UTF-8?q?L:v1.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17beta2-recent/bookworm/Dockerfile | 4 ++-- 17beta2-recent/bookworm/tags | 2 +- README.md | 8 ++++---- manifest.sh | 18 +++++++++--------- versions.json | 18 +++++++++--------- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 609d3b018..3c6a505b5 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' @@ -29,7 +29,7 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index af057e22e..ede9e6976 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index c89aeacb1..56597c792 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' @@ -29,7 +29,7 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 587be5fb1..f743fccd4 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17beta2-recent/bookworm/Dockerfile b/17beta2-recent/bookworm/Dockerfile index 7cf3130c4..a0a21ccdc 100644 --- a/17beta2-recent/bookworm/Dockerfile +++ b/17beta2-recent/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' @@ -29,7 +29,7 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=61f3b08ade49493b56c6bafa98c7c1f84addbc10 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/17beta2-recent/bookworm/tags b/17beta2-recent/bookworm/tags index 705afad45..d8825125c 100644 --- a/17beta2-recent/bookworm/tags +++ b/17beta2-recent/bookworm/tags @@ -1 +1 @@ -17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent +17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent diff --git a/README.md b/README.md index bf59979d0..7a495883c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-07-03) +## Versions (2024-07-25) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -185,7 +185,7 @@ Please note that the included package list is subject to change as we continue t | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta2-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine3.20), [`17beta2-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4.2-alpine3.20), [`17beta2-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta2 | 3.4.2 | | [`17beta2-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master-bookworm), [`17beta2-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.1 | +| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 4e6e90386..6507898d3 100755 --- a/manifest.sh +++ b/manifest.sh @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -586,11 +586,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -652,11 +652,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17beta2-recent-bookworm \ --target ${dockername}:17beta2-recent-bookworm || true -echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm" +echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm \ - --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index eeb977248..d65714ba2 100644 --- a/versions.json +++ b/versions.json @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -350,8 +350,8 @@ "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", - "SFCGAL_CHECKOUT": "tags/v1.5.1", - "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "SFCGAL_CHECKOUT": "tags/v1.5.2", + "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", "BOOST_VERSION": "1.74.0" @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -498,8 +498,8 @@ "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", - "SFCGAL_CHECKOUT": "tags/v1.5.1", - "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "SFCGAL_CHECKOUT": "tags/v1.5.2", + "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", "BOOST_VERSION": "1.74.0" @@ -549,7 +549,7 @@ }, "17beta2-recent": { "bookworm": { - "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.1-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", + "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", "postgis": "recent", "readme_group": "test", "PG_MAJOR": "17beta2", @@ -566,8 +566,8 @@ "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", - "SFCGAL_CHECKOUT": "tags/v1.5.1", - "SFCGAL_CHECKOUT_SHA1": "61f3b08ade49493b56c6bafa98c7c1f84addbc10", + "SFCGAL_CHECKOUT": "tags/v1.5.2", + "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", "BOOST_VERSION": "1.74.0" From d1faa138d8d053597823a28547ecd9aeae4cd1e6 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 31 Jul 2024 20:00:36 +0000 Subject: [PATCH 100/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.16.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 3a65da1e7..15c1035eb 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.3 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4fd2a878df1dbb807a9e99d01cf5614ebddc02b4 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 68eb53a71..4da88130c 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.15.3 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4fd2a878df1dbb807a9e99d01cf5614ebddc02b4 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/README.md b/README.md index 7a495883c..c5737b28b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-07-25) +## Versions (2024-07-31) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index d65714ba2..b1d199117 100644 --- a/versions.json +++ b/versions.json @@ -295,8 +295,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.3", - "TIMESCALEDB_CHECKOUT_SHA1": "777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110", + "TIMESCALEDB_CHECKOUT": "tags/2.16.0", + "TIMESCALEDB_CHECKOUT_SHA1": "4fd2a878df1dbb807a9e99d01cf5614ebddc02b4", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -443,8 +443,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.15.3", - "TIMESCALEDB_CHECKOUT_SHA1": "777f7266e16ae0f3bc2ac5f4ec9d420b5d2ea110", + "TIMESCALEDB_CHECKOUT": "tags/2.16.0", + "TIMESCALEDB_CHECKOUT_SHA1": "4fd2a878df1dbb807a9e99d01cf5614ebddc02b4", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", From 6d6a7752aa57a247cd348ba8385cd8837a2a7285 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 6 Aug 2024 20:00:35 +0000 Subject: [PATCH 101/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 15c1035eb..9df65fdc6 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4fd2a878df1dbb807a9e99d01cf5614ebddc02b4 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 4da88130c..5a58273d9 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4fd2a878df1dbb807a9e99d01cf5614ebddc02b4 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/README.md b/README.md index c5737b28b..250a019b4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-07-31) +## Versions (2024-08-06) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index b1d199117..7662949f2 100644 --- a/versions.json +++ b/versions.json @@ -295,8 +295,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.16.0", - "TIMESCALEDB_CHECKOUT_SHA1": "4fd2a878df1dbb807a9e99d01cf5614ebddc02b4", + "TIMESCALEDB_CHECKOUT": "tags/2.16.1", + "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", @@ -443,8 +443,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.16.0", - "TIMESCALEDB_CHECKOUT_SHA1": "4fd2a878df1dbb807a9e99d01cf5614ebddc02b4", + "TIMESCALEDB_CHECKOUT": "tags/2.16.1", + "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", From 27956ca41babda029eace87d1e90b007936be8e6 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 16 Aug 2024 20:00:26 +0000 Subject: [PATCH 102/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GDAL:?= =?UTF-8?q?v3.9.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17beta2-recent/bookworm/Dockerfile | 4 ++-- 17beta2-recent/bookworm/tags | 2 +- README.md | 8 ++++---- manifest.sh | 18 +++++++++--------- versions.json | 18 +++++++++--------- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 3c6a505b5..4c0c7fe9b 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 +ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index ede9e6976..4ae882472 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 56597c792..ba2ef1209 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 +ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index f743fccd4..5c5dae7e9 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17beta2-recent/bookworm/Dockerfile b/17beta2-recent/bookworm/Dockerfile index a0a21ccdc..9b1760a41 100644 --- a/17beta2-recent/bookworm/Dockerfile +++ b/17beta2-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 -ARG PGIS1_GDAL_CHECKOUT_SHA1=01ac70772b997ab87d2312e2036eb66faf6b0508 +ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/17beta2-recent/bookworm/tags b/17beta2-recent/bookworm/tags index d8825125c..01756aad4 100644 --- a/17beta2-recent/bookworm/tags +++ b/17beta2-recent/bookworm/tags @@ -1 +1 @@ -17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent +17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent diff --git a/README.md b/README.md index 250a019b4..2eb0e38fb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-08-06) +## Versions (2024-08-16) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -185,7 +185,7 @@ Please note that the included package list is subject to change as we continue t | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta2-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine3.20), [`17beta2-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4.2-alpine3.20), [`17beta2-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta2 | 3.4.2 | | [`17beta2-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master-bookworm), [`17beta2-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.1, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 6507898d3..67a3a358b 100755 --- a/manifest.sh +++ b/manifest.sh @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -586,11 +586,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -652,11 +652,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17beta2-recent-bookworm \ --target ${dockername}:17beta2-recent-bookworm || true -echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 7662949f2..927eaecca 100644 --- a/versions.json +++ b/versions.json @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -346,8 +346,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.1", - "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", + "GDAL_CHECKOUT": "tags/v3.9.2", + "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.2", @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -494,8 +494,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.1", - "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", + "GDAL_CHECKOUT": "tags/v3.9.2", + "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.2", @@ -549,7 +549,7 @@ }, "17beta2-recent": { "bookworm": { - "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.1-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", + "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", "postgis": "recent", "readme_group": "test", "PG_MAJOR": "17beta2", @@ -562,8 +562,8 @@ "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.1", - "GDAL_CHECKOUT_SHA1": "01ac70772b997ab87d2312e2036eb66faf6b0508", + "GDAL_CHECKOUT": "tags/v3.9.2", + "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", "GEOS_CHECKOUT": "tags/3.12.2", "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", "SFCGAL_CHECKOUT": "tags/v1.5.2", From 297c807b453a02c14fbd56f8e6f52c4b6456083d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 20 Aug 2024 06:26:37 +0200 Subject: [PATCH 103/167] Upgrade to 17beta3, locking to the geos3.12 branch - GEOS 3.13 has some test issues; the PostGIS regression test failed; we need check later --- .circleci/config.yml | 6 +- .github/workflows/main.yml | 6 +- 15-master/bookworm/Dockerfile | 4 +- 16-master/bookworm/Dockerfile | 4 +- 17beta2-3.4/alpine3.20/tags | 1 - 17beta2-master/bookworm/tags | 1 - 17beta2-recent/bookworm/tags | 1 - .../alpine3.20/Dockerfile | 4 +- .../alpine3.20/initdb-postgis.sh | 0 17beta3-3.4/alpine3.20/tags | 1 + .../alpine3.20/update-postgis.sh | 0 .../bookworm/Dockerfile | 8 +-- .../bookworm/initdb-postgis.sh | 0 17beta3-master/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 .../bookworm/Dockerfile | 4 +- .../bookworm/initdb-postgis.sh | 0 17beta3-recent/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 README.md | 8 +-- manifest.sh | 60 +++++++++---------- versions.json | 36 +++++------ versions.sh | 10 ++-- 23 files changed, 79 insertions(+), 77 deletions(-) delete mode 100644 17beta2-3.4/alpine3.20/tags delete mode 100644 17beta2-master/bookworm/tags delete mode 100644 17beta2-recent/bookworm/tags rename {17beta2-3.4 => 17beta3-3.4}/alpine3.20/Dockerfile (97%) rename {17beta2-3.4 => 17beta3-3.4}/alpine3.20/initdb-postgis.sh (100%) create mode 100644 17beta3-3.4/alpine3.20/tags rename {17beta2-3.4 => 17beta3-3.4}/alpine3.20/update-postgis.sh (100%) rename {17beta2-master => 17beta3-master}/bookworm/Dockerfile (98%) rename {17beta2-master => 17beta3-master}/bookworm/initdb-postgis.sh (100%) create mode 100644 17beta3-master/bookworm/tags rename {17beta2-master => 17beta3-master}/bookworm/update-postgis.sh (100%) rename {17beta2-recent => 17beta3-recent}/bookworm/Dockerfile (99%) rename {17beta2-recent => 17beta3-recent}/bookworm/initdb-postgis.sh (100%) create mode 100644 17beta3-recent/bookworm/tags rename {17beta2-recent => 17beta3-recent}/bookworm/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index a70f51f6c..22a9cff97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,8 +155,8 @@ workflows: "16-3.4-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", - "17beta2-3.4-alpine3.20", - "17beta2-master-bookworm", - "17beta2-recent-bookworm", + "17beta3-3.4-alpine3.20", + "17beta3-master-bookworm", + "17beta3-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3069aa8c..00d2d6a54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,9 +56,9 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - - { version: "17beta2-3.4", variant: "alpine3.20" } - - { version: "17beta2-master", variant: "bookworm" } - - { version: "17beta2-recent", variant: "bookworm" } + - { version: "17beta3-3.4", variant: "alpine3.20" } + - { version: "17beta3-master", variant: "bookworm" } + - { version: "17beta3-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index b678a9e30..90979a036 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,11 +17,11 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GEOS_CHECKOUT=3.12 ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master -ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch +ARG PGIS1_CGAL_CHECKOUT=master # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index a579b0592..3267bcad2 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,11 +17,11 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GEOS_CHECKOUT=3.12 ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master -ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch +ARG PGIS1_CGAL_CHECKOUT=master # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches diff --git a/17beta2-3.4/alpine3.20/tags b/17beta2-3.4/alpine3.20/tags deleted file mode 100644 index 92a496897..000000000 --- a/17beta2-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17beta2-3.4-alpine3.20 17beta2-3.4.2-alpine3.20 17beta2-3.4-alpine diff --git a/17beta2-master/bookworm/tags b/17beta2-master/bookworm/tags deleted file mode 100644 index 1a7dbfb33..000000000 --- a/17beta2-master/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta2-master-bookworm 17beta2-master diff --git a/17beta2-recent/bookworm/tags b/17beta2-recent/bookworm/tags deleted file mode 100644 index 01756aad4..000000000 --- a/17beta2-recent/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent diff --git a/17beta2-3.4/alpine3.20/Dockerfile b/17beta3-3.4/alpine3.20/Dockerfile similarity index 97% rename from 17beta2-3.4/alpine3.20/Dockerfile rename to 17beta3-3.4/alpine3.20/Dockerfile index 2d5db9d7b..066fe5b83 100644 --- a/17beta2-3.4/alpine3.20/Dockerfile +++ b/17beta3-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17beta2-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17beta3-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta2 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta3 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17beta2-3.4/alpine3.20/initdb-postgis.sh b/17beta3-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 17beta2-3.4/alpine3.20/initdb-postgis.sh rename to 17beta3-3.4/alpine3.20/initdb-postgis.sh diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags new file mode 100644 index 000000000..4ebeba32a --- /dev/null +++ b/17beta3-3.4/alpine3.20/tags @@ -0,0 +1 @@ +17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine diff --git a/17beta2-3.4/alpine3.20/update-postgis.sh b/17beta3-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 17beta2-3.4/alpine3.20/update-postgis.sh rename to 17beta3-3.4/alpine3.20/update-postgis.sh diff --git a/17beta2-master/bookworm/Dockerfile b/17beta3-master/bookworm/Dockerfile similarity index 98% rename from 17beta2-master/bookworm/Dockerfile rename to 17beta3-master/bookworm/Dockerfile index 945f9ea24..59aa360a1 100644 --- a/17beta2-master/bookworm/Dockerfile +++ b/17beta3-master/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta2-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17beta3-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -17,11 +17,11 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GEOS_CHECKOUT=3.12 ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master -ARG PGIS1_CGAL_CHECKOUT=5.6.x-branch +ARG PGIS1_CGAL_CHECKOUT=master # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta2-master spatial database extension with PostgreSQL 17beta2 bookworm" \ + org.opencontainers.image.description="PostGIS - 17beta3-master spatial database extension with PostgreSQL 17beta3 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta2-master/bookworm/initdb-postgis.sh b/17beta3-master/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta2-master/bookworm/initdb-postgis.sh rename to 17beta3-master/bookworm/initdb-postgis.sh diff --git a/17beta3-master/bookworm/tags b/17beta3-master/bookworm/tags new file mode 100644 index 000000000..7d8f95113 --- /dev/null +++ b/17beta3-master/bookworm/tags @@ -0,0 +1 @@ +17beta3-master-bookworm 17beta3-master diff --git a/17beta2-master/bookworm/update-postgis.sh b/17beta3-master/bookworm/update-postgis.sh similarity index 100% rename from 17beta2-master/bookworm/update-postgis.sh rename to 17beta3-master/bookworm/update-postgis.sh diff --git a/17beta2-recent/bookworm/Dockerfile b/17beta3-recent/bookworm/Dockerfile similarity index 99% rename from 17beta2-recent/bookworm/Dockerfile rename to 17beta3-recent/bookworm/Dockerfile index 9b1760a41..6190b434a 100644 --- a/17beta2-recent/bookworm/Dockerfile +++ b/17beta3-recent/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta2-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17beta3-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta2-recent spatial database extension with PostgreSQL 17beta2 bookworm" \ + org.opencontainers.image.description="PostGIS - 17beta3-recent spatial database extension with PostgreSQL 17beta3 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta2-recent/bookworm/initdb-postgis.sh b/17beta3-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta2-recent/bookworm/initdb-postgis.sh rename to 17beta3-recent/bookworm/initdb-postgis.sh diff --git a/17beta3-recent/bookworm/tags b/17beta3-recent/bookworm/tags new file mode 100644 index 000000000..53b7f856e --- /dev/null +++ b/17beta3-recent/bookworm/tags @@ -0,0 +1 @@ +17beta3-recent-bookworm 17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent diff --git a/17beta2-recent/bookworm/update-postgis.sh b/17beta3-recent/bookworm/update-postgis.sh similarity index 100% rename from 17beta2-recent/bookworm/update-postgis.sh rename to 17beta3-recent/bookworm/update-postgis.sh diff --git a/README.md b/README.md index 2eb0e38fb..0853e8262 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-08-16) +## Versions (2024-08-20) We provide multi-platform image support for the following architectures: @@ -183,9 +183,9 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta2-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine3.20), [`17beta2-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4.2-alpine3.20), [`17beta2-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta2 | 3.4.2 | -| [`17beta2-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master-bookworm), [`17beta2-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta2-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-bookworm), [`17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta2-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta2-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta2-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta2 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.2-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.2 | +| [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 67a3a358b..691865737 100755 --- a/manifest.sh +++ b/manifest.sh @@ -610,62 +610,62 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:recent \ --target ${dockername}:recent || true -# ----- 17beta2-3.4-alpine3.20 ----- +# ----- 17beta3-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:17beta2-3.4-alpine3.20" +echo "manifest: ${dockername}:17beta3-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-3.4-alpine3.20 \ - --target ${dockername}:17beta2-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \ + --target ${dockername}:17beta3-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17beta2-3.4.2-alpine3.20" +echo "manifest: ${dockername}:17beta3-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-3.4.2-alpine3.20 \ - --target ${dockername}:17beta2-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4.2-alpine3.20 \ + --target ${dockername}:17beta3-3.4.2-alpine3.20 || true -echo "manifest: ${dockername}:17beta2-3.4-alpine" +echo "manifest: ${dockername}:17beta3-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-3.4-alpine \ - --target ${dockername}:17beta2-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine \ + --target ${dockername}:17beta3-3.4-alpine || true -# ----- 17beta2-master-bookworm ----- +# ----- 17beta3-master-bookworm ----- -echo "manifest: ${dockername}:17beta2-master-bookworm" +echo "manifest: ${dockername}:17beta3-master-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-master-bookworm \ - --target ${dockername}:17beta2-master-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-master-bookworm \ + --target ${dockername}:17beta3-master-bookworm || true -echo "manifest: ${dockername}:17beta2-master" +echo "manifest: ${dockername}:17beta3-master" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-master \ - --target ${dockername}:17beta2-master || true + --template ${dockername}-ARCHVARIANT:17beta3-master \ + --target ${dockername}:17beta3-master || true -# ----- 17beta2-recent-bookworm ----- +# ----- 17beta3-recent-bookworm ----- -echo "manifest: ${dockername}:17beta2-recent-bookworm" +echo "manifest: ${dockername}:17beta3-recent-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent-bookworm \ - --target ${dockername}:17beta2-recent-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-bookworm \ + --target ${dockername}:17beta3-recent-bookworm || true -echo "manifest: ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true -echo "manifest: ${dockername}:17beta2-recent" +echo "manifest: ${dockername}:17beta3-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta2-recent \ - --target ${dockername}:17beta2-recent || true + --template ${dockername}-ARCHVARIANT:17beta3-recent \ + --target ${dockername}:17beta3-recent || true diff --git a/versions.json b/versions.json index 927eaecca..fe6dd5321 100644 --- a/versions.json +++ b/versions.json @@ -317,7 +317,7 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "master", "POSTGIS_CHECKOUT_SHA1": "nocheck", - "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT": "master", "CGAL_CHECKOUT_SHA1": "nocheck", "SFCGAL_CHECKOUT": "master", "SFCGAL_CHECKOUT_SHA1": "nocheck", @@ -326,7 +326,7 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT": "3.12", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } @@ -465,7 +465,7 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "master", "POSTGIS_CHECKOUT_SHA1": "nocheck", - "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT": "master", "CGAL_CHECKOUT_SHA1": "nocheck", "SFCGAL_CHECKOUT": "master", "SFCGAL_CHECKOUT_SHA1": "nocheck", @@ -474,7 +474,7 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT": "3.12", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } @@ -505,35 +505,35 @@ "BOOST_VERSION": "1.74.0" } }, - "17beta2-3.4": { + "17beta3-3.4": { "alpine3.20": { - "tags": "17beta2-3.4-alpine3.20 17beta2-3.4.2-alpine3.20 17beta2-3.4-alpine", + "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine", "readme_group": "test", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17beta2", - "PG_DOCKER": "17beta2", + "PG_MAJOR": "17beta3", + "PG_DOCKER": "17beta3", "POSTGIS_VERSION": "3.4.2", "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", "POSTGIS_CHECKOUT": "tags/3.4.2", "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, - "17beta2-master": { + "17beta3-master": { "bookworm": { - "tags": "17beta2-master-bookworm 17beta2-master", + "tags": "17beta3-master-bookworm 17beta3-master", "postgis": "master", "readme_group": "test", - "PG_MAJOR": "17beta2", - "PG_DOCKER": "17beta2", + "PG_MAJOR": "17beta3", + "PG_DOCKER": "17beta3", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "master", "POSTGIS_CHECKOUT_SHA1": "nocheck", - "CGAL_CHECKOUT": "5.6.x-branch", + "CGAL_CHECKOUT": "master", "CGAL_CHECKOUT_SHA1": "nocheck", "SFCGAL_CHECKOUT": "master", "SFCGAL_CHECKOUT_SHA1": "nocheck", @@ -542,18 +542,18 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT": "3.12", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } }, - "17beta2-recent": { + "17beta3-recent": { "bookworm": { - "tags": "17beta2-recent-bookworm 17beta2-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta2-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta2-recent", + "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", "postgis": "recent", "readme_group": "test", - "PG_MAJOR": "17beta2", - "PG_DOCKER": "17beta2", + "PG_MAJOR": "17beta3", + "PG_DOCKER": "17beta3", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", diff --git a/versions.sh b/versions.sh index 4031441b7..728ab2304 100755 --- a/versions.sh +++ b/versions.sh @@ -25,18 +25,20 @@ alpine_latest="alpine3.20" postgis_latest="3.4" postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="11 12 13 14 15 16 17beta2" +postgres_versions="11 12 13 14 15 16 17beta3" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used MASTER_BRANCH_MODE="flexible" POSTGIS_BRANCH="master" -GEOS_BRANCH="main" +#GEOS_BRANCH="main" +GEOS_BRANCH="3.12" GDAL_BRANCH="master" PROJ_BRANCH="master" SFCGAL_BRANCH="master" -CGAL_BRANCH="5.6.x-branch" +#CGAL_BRANCH="5.6.x-branch" +CGAL_BRANCH="master" # locked: extra locking versions for dependencies CGAL_CHECKOUT_LOCK="" @@ -258,7 +260,7 @@ get_latest_version_and_hash() { fi } -get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" pre-releases norepo "" +get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" releases norepo "" get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases norepo "" get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases norepo "" get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases norepo "" From 833a19c245d151a91105421ee8976a76ecaa2302 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 29 Aug 2024 20:00:39 +0000 Subject: [PATCH 104/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20PG=5F?= =?UTF-8?q?HINT=5FPLAN:REL15=5F1=5F5=5F2,PG=5FHINT=5FPLAN:REL16=5F1=5F6=5F?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 4 ++-- 16-3.4-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 9df65fdc6..110e120ef 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -36,8 +36,8 @@ ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git -ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=7a41e7ba94c8769895fefbb282f6943067adac2e +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fabd97bd76361051b91c0e772eb819a45f3fd095 ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 5a58273d9..d90d57990 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -36,8 +36,8 @@ ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git -ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fa0a461af929c06f7c96956369458456c26e7ad9 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 diff --git a/README.md b/README.md index 0853e8262..92fb9ee54 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-08-20) +## Versions (2024-08-29) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index fe6dd5321..7b802b9cb 100644 --- a/versions.json +++ b/versions.json @@ -299,8 +299,8 @@ "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", - "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", - "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", + "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", + "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } @@ -447,8 +447,8 @@ "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", "DUCKDB_CHECKOUT": "tags/v1.0.0", "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", - "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", - "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", + "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", + "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } From 1e70747133da1d2c0d868e443a3fe21f75b6af11 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 3 Sep 2024 20:00:29 +0000 Subject: [PATCH 105/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20POSTG?= =?UTF-8?q?IS:3.4.3rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 12-3.4/alpine3.19/Dockerfile | 4 +- 12-3.4/alpine3.19/tags | 2 +- 12-3.4/alpine3.20/Dockerfile | 4 +- 12-3.4/alpine3.20/tags | 2 +- 12-3.4/bookworm/tags | 2 +- 12-3.4/bullseye/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 4 +- 13-3.4/alpine3.19/tags | 2 +- 13-3.4/alpine3.20/Dockerfile | 4 +- 13-3.4/alpine3.20/tags | 2 +- 13-3.4/bookworm/tags | 2 +- 13-3.4/bullseye/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 4 +- 14-3.4/alpine3.19/tags | 2 +- 14-3.4/alpine3.20/Dockerfile | 4 +- 14-3.4/alpine3.20/tags | 2 +- 14-3.4/bookworm/tags | 2 +- 14-3.4/bullseye/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 6 +- 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 4 +- 15-3.4/alpine3.19/tags | 2 +- 15-3.4/alpine3.20/Dockerfile | 4 +- 15-3.4/alpine3.20/tags | 2 +- 15-3.4/bookworm/tags | 2 +- 15-3.4/bullseye/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 6 +- 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 4 +- 16-3.4/alpine3.19/tags | 2 +- 16-3.4/alpine3.20/Dockerfile | 4 +- 16-3.4/alpine3.20/tags | 2 +- 16-3.4/bookworm/tags | 2 +- 16-3.4/bullseye/tags | 2 +- 17beta3-3.4/alpine3.20/Dockerfile | 4 +- 17beta3-3.4/alpine3.20/tags | 2 +- README.md | 48 ++--- manifest.sh | 300 +++++++++++------------------ versions.json | 220 ++++++++++----------- 39 files changed, 293 insertions(+), 377 deletions(-) diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index e4a1ce40f..3d9ede4cd 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index 798bdf3d8..1b3fc0be5 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4-alpine3.19 12-3.4.2-alpine3.19 +12-3.4.3rc1-alpine3.19 diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile index a8bf18a5e..22750409f 100644 --- a/12-3.4/alpine3.20/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags index 8b804f9fb..ffac99786 100644 --- a/12-3.4/alpine3.20/tags +++ b/12-3.4/alpine3.20/tags @@ -1 +1 @@ -12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine +12-3.4.3rc1-alpine3.20 12-3.4.3rc1-alpine diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags index 0088f5ff7..138eef16e 100644 --- a/12-3.4/bookworm/tags +++ b/12-3.4/bookworm/tags @@ -1 +1 @@ -12-3.4-bookworm 12-3.4.2-bookworm 12-3.4 +12-3.4.3rc1-bookworm 12-3.4.2-bookworm 12-3.4.3rc1 diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags index 26c97b435..bef31e54d 100644 --- a/12-3.4/bullseye/tags +++ b/12-3.4/bullseye/tags @@ -1 +1 @@ -12-3.4-bullseye 12-3.4.2-bullseye +12-3.4.3rc1-bullseye 12-3.4.2-bullseye diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index a95916535..8b405cbe0 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index 12d9f0286..7580149a3 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4-alpine3.19 13-3.4.2-alpine3.19 +13-3.4.3rc1-alpine3.19 diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile index 396cbc13a..48459c720 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags index 8539476b0..1ba479bf9 100644 --- a/13-3.4/alpine3.20/tags +++ b/13-3.4/alpine3.20/tags @@ -1 +1 @@ -13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine +13-3.4.3rc1-alpine3.20 13-3.4.3rc1-alpine diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags index d35a8e788..f0bd403c4 100644 --- a/13-3.4/bookworm/tags +++ b/13-3.4/bookworm/tags @@ -1 +1 @@ -13-3.4-bookworm 13-3.4.2-bookworm 13-3.4 +13-3.4.3rc1-bookworm 13-3.4.2-bookworm 13-3.4.3rc1 diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags index 37db47727..fdc328c11 100644 --- a/13-3.4/bullseye/tags +++ b/13-3.4/bullseye/tags @@ -1 +1 @@ -13-3.4-bullseye 13-3.4.2-bullseye +13-3.4.3rc1-bullseye 13-3.4.2-bullseye diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 7a1a09e70..53f4ad49f 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index d555082f7..acb6fd242 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4-alpine3.19 14-3.4.2-alpine3.19 +14-3.4.3rc1-alpine3.19 diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile index e97d17111..382ae5e3a 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags index a98dbc9ec..ded316b9c 100644 --- a/14-3.4/alpine3.20/tags +++ b/14-3.4/alpine3.20/tags @@ -1 +1 @@ -14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine +14-3.4.3rc1-alpine3.20 14-3.4.3rc1-alpine diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags index f44af9937..f027028f2 100644 --- a/14-3.4/bookworm/tags +++ b/14-3.4/bookworm/tags @@ -1 +1 @@ -14-3.4-bookworm 14-3.4.2-bookworm 14-3.4 +14-3.4.3rc1-bookworm 14-3.4.2-bookworm 14-3.4.3rc1 diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags index cd8bb9fee..cdc59e218 100644 --- a/14-3.4/bullseye/tags +++ b/14-3.4/bullseye/tags @@ -1 +1 @@ -14-3.4-bullseye 14-3.4.2-bullseye +14-3.4.3rc1-bullseye 14-3.4.2-bullseye diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 110e120ef..64766fba1 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4.3rc1-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 @@ -253,10 +253,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4.3rc1-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 15-3.4-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 15-3.4.3rc1-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index 487b1a6b9..0bcd93e4a 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0 +15-3.4.3rc1-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4.3rc1-bundle0 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index 774a8ebf9..29f668bb8 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index a1f96453b..73b0112f5 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4-alpine3.19 15-3.4.2-alpine3.19 +15-3.4.3rc1-alpine3.19 diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile index b6fc12014..ad4ed508b 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags index 157d72013..d6bc3505b 100644 --- a/15-3.4/alpine3.20/tags +++ b/15-3.4/alpine3.20/tags @@ -1 +1 @@ -15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine +15-3.4.3rc1-alpine3.20 15-3.4.3rc1-alpine diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index f45fa473e..a5e2bfbcf 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4-bookworm 15-3.4.2-bookworm 15-3.4 +15-3.4.3rc1-bookworm 15-3.4.2-bookworm 15-3.4.3rc1 diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags index ca554ec60..4a740d1bf 100644 --- a/15-3.4/bullseye/tags +++ b/15-3.4/bullseye/tags @@ -1 +1 @@ -15-3.4-bullseye 15-3.4.2-bullseye +15-3.4.3rc1-bullseye 15-3.4.2-bullseye diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index d90d57990..325efecbb 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4.3rc1-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 @@ -248,10 +248,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4.3rc1-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 16-3.4-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 16-3.4.3rc1-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 693b1526c..3a4597fdb 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0 +16-3.4.3rc1-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4.3rc1-bundle0 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index 375f65dba..12f5a31a2 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index 2ca35a9f7..d9653b511 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4-alpine3.19 16-3.4.2-alpine3.19 +16-3.4.3rc1-alpine3.19 diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile index 28bf27239..d968d1109 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index 169894e6e..c0a931cd2 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine +16-3.4.3rc1-alpine3.20 16-3.4.3rc1-alpine diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index 263a25f35..3da28d986 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest +16-3.4.3rc1-bookworm 16-3.4.2-bookworm 16-3.4.3rc1 diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags index 925db2db4..c90703d3a 100644 --- a/16-3.4/bullseye/tags +++ b/16-3.4/bullseye/tags @@ -1 +1 @@ -16-3.4-bullseye 16-3.4.2-bullseye +16-3.4.3rc1-bullseye 16-3.4.2-bullseye diff --git a/17beta3-3.4/alpine3.20/Dockerfile b/17beta3-3.4/alpine3.20/Dockerfile index 066fe5b83..72650f575 100644 --- a/17beta3-3.4/alpine3.20/Dockerfile +++ b/17beta3-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17beta3-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 FROM ${PGIS1_BASE_IMAGE} diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags index 4ebeba32a..7224611bf 100644 --- a/17beta3-3.4/alpine3.20/tags +++ b/17beta3-3.4/alpine3.20/tags @@ -1 +1 @@ -17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine +17beta3-3.4.3rc1-alpine3.20 17beta3-3.4.3rc1-alpine diff --git a/README.md b/README.md index 92fb9ee54..95948d6ab 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-08-29) +## Versions (2024-09-03) We provide multi-platform image support for the following architectures: @@ -71,11 +71,6 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | ### 📘Debian - bullseye @@ -87,11 +82,6 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | @@ -118,8 +108,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | +| [`15-3.4.3rc1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4.3rc1-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`16-3.4.3rc1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4.3rc1-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | @@ -132,11 +122,6 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | ### ⛰️Alpine 3.20 based @@ -149,15 +134,10 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | | [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | | [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | | [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | @@ -181,9 +161,29 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.3rc1 | +| [`12-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine3.20), [`12-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3rc1 | +| [`12-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | +| [`12-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | +| [`13-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.3rc1 | +| [`13-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine3.20), [`13-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3rc1 | +| [`13-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | +| [`13-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | +| [`14-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.3rc1 | +| [`14-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine3.20), [`14-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3rc1 | +| [`14-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | +| [`14-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | +| [`15-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.3rc1 | +| [`15-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine3.20), [`15-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3rc1 | +| [`15-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`15-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`16-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.3rc1 | +| [`16-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine3.20), [`16-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3rc1 | +| [`16-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | +| [`16-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.2-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.2 | +| [`17beta3-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3rc1-alpine3.20), [`17beta3-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.3rc1 | | [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | diff --git a/manifest.sh b/manifest.sh index 691865737..a72e905d9 100755 --- a/manifest.sh +++ b/manifest.sh @@ -34,45 +34,33 @@ manifest-tool push from-args \ # ----- 12-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:12-3.4-alpine3.19" +echo "manifest: ${dockername}:12-3.4.3rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ - --target ${dockername}:12-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:12-3.4.2-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.19 \ - --target ${dockername}:12-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine3.19 \ + --target ${dockername}:12-3.4.3rc1-alpine3.19 || true # ----- 12-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:12-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ - --target ${dockername}:12-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:12-3.4.2-alpine3.20" +echo "manifest: ${dockername}:12-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.20 \ - --target ${dockername}:12-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine3.20 \ + --target ${dockername}:12-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:12-3.4-alpine" +echo "manifest: ${dockername}:12-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ - --target ${dockername}:12-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine \ + --target ${dockername}:12-3.4.3rc1-alpine || true # ----- 12-3.4-bookworm ----- -echo "manifest: ${dockername}:12-3.4-bookworm" +echo "manifest: ${dockername}:12-3.4.3rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ - --target ${dockername}:12-3.4-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-bookworm \ + --target ${dockername}:12-3.4.3rc1-bookworm || true echo "manifest: ${dockername}:12-3.4.2-bookworm" manifest-tool push from-args \ @@ -80,19 +68,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.2-bookworm \ --target ${dockername}:12-3.4.2-bookworm || true -echo "manifest: ${dockername}:12-3.4" +echo "manifest: ${dockername}:12-3.4.3rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4 \ - --target ${dockername}:12-3.4 || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1 \ + --target ${dockername}:12-3.4.3rc1 || true # ----- 12-3.4-bullseye ----- -echo "manifest: ${dockername}:12-3.4-bullseye" +echo "manifest: ${dockername}:12-3.4.3rc1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ - --target ${dockername}:12-3.4-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-bullseye \ + --target ${dockername}:12-3.4.3rc1-bullseye || true echo "manifest: ${dockername}:12-3.4.2-bullseye" manifest-tool push from-args \ @@ -122,45 +110,33 @@ manifest-tool push from-args \ # ----- 13-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:13-3.4-alpine3.19" +echo "manifest: ${dockername}:13-3.4.3rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ - --target ${dockername}:13-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:13-3.4.2-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.19 \ - --target ${dockername}:13-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine3.19 \ + --target ${dockername}:13-3.4.3rc1-alpine3.19 || true # ----- 13-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:13-3.4-alpine3.20" +echo "manifest: ${dockername}:13-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ - --target ${dockername}:13-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine3.20 \ + --target ${dockername}:13-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4.2-alpine3.20" +echo "manifest: ${dockername}:13-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.20 \ - --target ${dockername}:13-3.4.2-alpine3.20 || true - -echo "manifest: ${dockername}:13-3.4-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ - --target ${dockername}:13-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine \ + --target ${dockername}:13-3.4.3rc1-alpine || true # ----- 13-3.4-bookworm ----- -echo "manifest: ${dockername}:13-3.4-bookworm" +echo "manifest: ${dockername}:13-3.4.3rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ - --target ${dockername}:13-3.4-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-bookworm \ + --target ${dockername}:13-3.4.3rc1-bookworm || true echo "manifest: ${dockername}:13-3.4.2-bookworm" manifest-tool push from-args \ @@ -168,19 +144,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.2-bookworm \ --target ${dockername}:13-3.4.2-bookworm || true -echo "manifest: ${dockername}:13-3.4" +echo "manifest: ${dockername}:13-3.4.3rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4 \ - --target ${dockername}:13-3.4 || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1 \ + --target ${dockername}:13-3.4.3rc1 || true # ----- 13-3.4-bullseye ----- -echo "manifest: ${dockername}:13-3.4-bullseye" +echo "manifest: ${dockername}:13-3.4.3rc1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ - --target ${dockername}:13-3.4-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-bullseye \ + --target ${dockername}:13-3.4.3rc1-bullseye || true echo "manifest: ${dockername}:13-3.4.2-bullseye" manifest-tool push from-args \ @@ -210,45 +186,33 @@ manifest-tool push from-args \ # ----- 14-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:14-3.4-alpine3.19" +echo "manifest: ${dockername}:14-3.4.3rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ - --target ${dockername}:14-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:14-3.4.2-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.19 \ - --target ${dockername}:14-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine3.19 \ + --target ${dockername}:14-3.4.3rc1-alpine3.19 || true # ----- 14-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:14-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ - --target ${dockername}:14-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:14-3.4.2-alpine3.20" +echo "manifest: ${dockername}:14-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.20 \ - --target ${dockername}:14-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine3.20 \ + --target ${dockername}:14-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4-alpine" +echo "manifest: ${dockername}:14-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ - --target ${dockername}:14-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine \ + --target ${dockername}:14-3.4.3rc1-alpine || true # ----- 14-3.4-bookworm ----- -echo "manifest: ${dockername}:14-3.4-bookworm" +echo "manifest: ${dockername}:14-3.4.3rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ - --target ${dockername}:14-3.4-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-bookworm \ + --target ${dockername}:14-3.4.3rc1-bookworm || true echo "manifest: ${dockername}:14-3.4.2-bookworm" manifest-tool push from-args \ @@ -256,19 +220,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.2-bookworm \ --target ${dockername}:14-3.4.2-bookworm || true -echo "manifest: ${dockername}:14-3.4" +echo "manifest: ${dockername}:14-3.4.3rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4 \ - --target ${dockername}:14-3.4 || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1 \ + --target ${dockername}:14-3.4.3rc1 || true # ----- 14-3.4-bullseye ----- -echo "manifest: ${dockername}:14-3.4-bullseye" +echo "manifest: ${dockername}:14-3.4.3rc1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ - --target ${dockername}:14-3.4-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-bullseye \ + --target ${dockername}:14-3.4.3rc1-bullseye || true echo "manifest: ${dockername}:14-3.4.2-bullseye" manifest-tool push from-args \ @@ -312,45 +276,33 @@ manifest-tool push from-args \ # ----- 15-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:15-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ - --target ${dockername}:15-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:15-3.4.2-alpine3.19" +echo "manifest: ${dockername}:15-3.4.3rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.19 \ - --target ${dockername}:15-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine3.19 \ + --target ${dockername}:15-3.4.3rc1-alpine3.19 || true # ----- 15-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:15-3.4-alpine3.20" +echo "manifest: ${dockername}:15-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ - --target ${dockername}:15-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine3.20 \ + --target ${dockername}:15-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4.2-alpine3.20" +echo "manifest: ${dockername}:15-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.20 \ - --target ${dockername}:15-3.4.2-alpine3.20 || true - -echo "manifest: ${dockername}:15-3.4-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ - --target ${dockername}:15-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine \ + --target ${dockername}:15-3.4.3rc1-alpine || true # ----- 15-3.4-bookworm ----- -echo "manifest: ${dockername}:15-3.4-bookworm" +echo "manifest: ${dockername}:15-3.4.3rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ - --target ${dockername}:15-3.4-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bookworm \ + --target ${dockername}:15-3.4.3rc1-bookworm || true echo "manifest: ${dockername}:15-3.4.2-bookworm" manifest-tool push from-args \ @@ -358,19 +310,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.2-bookworm \ --target ${dockername}:15-3.4.2-bookworm || true -echo "manifest: ${dockername}:15-3.4" +echo "manifest: ${dockername}:15-3.4.3rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4 \ - --target ${dockername}:15-3.4 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1 \ + --target ${dockername}:15-3.4.3rc1 || true # ----- 15-3.4-bullseye ----- -echo "manifest: ${dockername}:15-3.4-bullseye" +echo "manifest: ${dockername}:15-3.4.3rc1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ - --target ${dockername}:15-3.4-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bullseye \ + --target ${dockername}:15-3.4.3rc1-bullseye || true echo "manifest: ${dockername}:15-3.4.2-bullseye" manifest-tool push from-args \ @@ -380,11 +332,11 @@ manifest-tool push from-args \ # ----- 15-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:15-3.4-bundle0-bookworm" +echo "manifest: ${dockername}:15-3.4.3rc1-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ - --target ${dockername}:15-3.4-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bundle0-bookworm \ + --target ${dockername}:15-3.4.3rc1-bundle0-bookworm || true echo "manifest: ${dockername}:15-3.4.2-bundle0-bookworm" manifest-tool push from-args \ @@ -392,11 +344,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.2-bundle0-bookworm \ --target ${dockername}:15-3.4.2-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4-bundle0" +echo "manifest: ${dockername}:15-3.4.3rc1-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ - --target ${dockername}:15-3.4-bundle0 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bundle0 \ + --target ${dockername}:15-3.4.3rc1-bundle0 || true # ----- 15-master-bookworm ----- @@ -460,51 +412,33 @@ manifest-tool push from-args \ # ----- 16-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:16-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ - --target ${dockername}:16-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:16-3.4.2-alpine3.19" +echo "manifest: ${dockername}:16-3.4.3rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.19 \ - --target ${dockername}:16-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine3.19 \ + --target ${dockername}:16-3.4.3rc1-alpine3.19 || true # ----- 16-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:16-3.4-alpine3.20" +echo "manifest: ${dockername}:16-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ - --target ${dockername}:16-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine3.20 \ + --target ${dockername}:16-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:16-3.4.2-alpine3.20" +echo "manifest: ${dockername}:16-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.20 \ - --target ${dockername}:16-3.4.2-alpine3.20 || true - -echo "manifest: ${dockername}:16-3.4-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ - --target ${dockername}:16-3.4-alpine || true - -echo "manifest: ${dockername}:alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:alpine \ - --target ${dockername}:alpine || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine \ + --target ${dockername}:16-3.4.3rc1-alpine || true # ----- 16-3.4-bookworm ----- -echo "manifest: ${dockername}:16-3.4-bookworm" +echo "manifest: ${dockername}:16-3.4.3rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ - --target ${dockername}:16-3.4-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bookworm \ + --target ${dockername}:16-3.4.3rc1-bookworm || true echo "manifest: ${dockername}:16-3.4.2-bookworm" manifest-tool push from-args \ @@ -512,25 +446,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.2-bookworm \ --target ${dockername}:16-3.4.2-bookworm || true -echo "manifest: ${dockername}:16-3.4" +echo "manifest: ${dockername}:16-3.4.3rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4 \ - --target ${dockername}:16-3.4 || true - -echo "manifest: ${dockername}:latest" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:latest \ - --target ${dockername}:latest || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1 \ + --target ${dockername}:16-3.4.3rc1 || true # ----- 16-3.4-bullseye ----- -echo "manifest: ${dockername}:16-3.4-bullseye" +echo "manifest: ${dockername}:16-3.4.3rc1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ - --target ${dockername}:16-3.4-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bullseye \ + --target ${dockername}:16-3.4.3rc1-bullseye || true echo "manifest: ${dockername}:16-3.4.2-bullseye" manifest-tool push from-args \ @@ -540,11 +468,11 @@ manifest-tool push from-args \ # ----- 16-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:16-3.4-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.4.3rc1-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ - --target ${dockername}:16-3.4-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bundle0-bookworm \ + --target ${dockername}:16-3.4.3rc1-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.4.2-bundle0-bookworm" manifest-tool push from-args \ @@ -552,17 +480,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.2-bundle0-bookworm \ --target ${dockername}:16-3.4.2-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4-bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ - --target ${dockername}:16-3.4-bundle0 || true - -echo "manifest: ${dockername}:bundle0" +echo "manifest: ${dockername}:16-3.4.3rc1-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:bundle0 \ - --target ${dockername}:bundle0 || true + --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bundle0 \ + --target ${dockername}:16-3.4.3rc1-bundle0 || true # ----- 16-master-bookworm ----- @@ -612,23 +534,17 @@ manifest-tool push from-args \ # ----- 17beta3-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:17beta3-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \ - --target ${dockername}:17beta3-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:17beta3-3.4.2-alpine3.20" +echo "manifest: ${dockername}:17beta3-3.4.3rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4.2-alpine3.20 \ - --target ${dockername}:17beta3-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4.3rc1-alpine3.20 \ + --target ${dockername}:17beta3-3.4.3rc1-alpine3.20 || true -echo "manifest: ${dockername}:17beta3-3.4-alpine" +echo "manifest: ${dockername}:17beta3-3.4.3rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine \ - --target ${dockername}:17beta3-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4.3rc1-alpine \ + --target ${dockername}:17beta3-3.4.3rc1-alpine || true # ----- 17beta3-master-bookworm ----- diff --git a/versions.json b/versions.json index 7b802b9cb..bb9dc47a0 100644 --- a/versions.json +++ b/versions.json @@ -17,9 +17,9 @@ }, "12-3.4": { "bullseye": { - "tags": "12-3.4-bullseye 12-3.4.2-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", + "tags": "12-3.4.3rc1-bullseye 12-3.4.2-bullseye", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "12", "PG_DOCKER": "12", "arch": "amd64 arm64", @@ -29,9 +29,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", - "postgis": "3.4", - "readme_group": "bookworm", + "tags": "12-3.4.3rc1-bookworm 12-3.4.2-bookworm 12-3.4.3rc1", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "12", "PG_DOCKER": "12", "arch": "amd64 arm64", @@ -41,32 +41,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19", - "readme_group": "alpine3.19", - "postgis": "3.4", + "tags": "12-3.4.3rc1-alpine3.19", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" }, "alpine3.20": { - "tags": "12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine", - "readme_group": "alpine3.20", - "postgis": "3.4", + "tags": "12-3.4.3rc1-alpine3.20 12-3.4.3rc1-alpine", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "13-3.3": { @@ -87,9 +87,9 @@ }, "13-3.4": { "bullseye": { - "tags": "13-3.4-bullseye 13-3.4.2-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", + "tags": "13-3.4.3rc1-bullseye 13-3.4.2-bullseye", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "13", "PG_DOCKER": "13", "arch": "amd64 arm64", @@ -99,9 +99,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", - "postgis": "3.4", - "readme_group": "bookworm", + "tags": "13-3.4.3rc1-bookworm 13-3.4.2-bookworm 13-3.4.3rc1", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "13", "PG_DOCKER": "13", "arch": "amd64 arm64", @@ -111,32 +111,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19", - "readme_group": "alpine3.19", - "postgis": "3.4", + "tags": "13-3.4.3rc1-alpine3.19", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" }, "alpine3.20": { - "tags": "13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine", - "readme_group": "alpine3.20", - "postgis": "3.4", + "tags": "13-3.4.3rc1-alpine3.20 13-3.4.3rc1-alpine", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "14-3.3": { @@ -157,9 +157,9 @@ }, "14-3.4": { "bullseye": { - "tags": "14-3.4-bullseye 14-3.4.2-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", + "tags": "14-3.4.3rc1-bullseye 14-3.4.2-bullseye", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "14", "PG_DOCKER": "14", "arch": "amd64 arm64", @@ -169,9 +169,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", - "postgis": "3.4", - "readme_group": "bookworm", + "tags": "14-3.4.3rc1-bookworm 14-3.4.2-bookworm 14-3.4.3rc1", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "14", "PG_DOCKER": "14", "arch": "amd64 arm64", @@ -181,32 +181,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19", - "readme_group": "alpine3.19", - "postgis": "3.4", + "tags": "14-3.4.3rc1-alpine3.19", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" }, "alpine3.20": { - "tags": "14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine", - "readme_group": "alpine3.20", - "postgis": "3.4", + "tags": "14-3.4.3rc1-alpine3.20 14-3.4.3rc1-alpine", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "15-3.3": { @@ -227,9 +227,9 @@ }, "15-3.4": { "bullseye": { - "tags": "15-3.4-bullseye 15-3.4.2-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", + "tags": "15-3.4.3rc1-bullseye 15-3.4.2-bullseye", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", @@ -239,9 +239,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", - "postgis": "3.4", - "readme_group": "bookworm", + "tags": "15-3.4.3rc1-bookworm 15-3.4.2-bookworm 15-3.4.3rc1", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", @@ -251,38 +251,38 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19", - "readme_group": "alpine3.19", - "postgis": "3.4", + "tags": "15-3.4.3rc1-alpine3.19", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" }, "alpine3.20": { - "tags": "15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine", - "readme_group": "alpine3.20", - "postgis": "3.4", + "tags": "15-3.4.3rc1-alpine3.20 15-3.4.3rc1-alpine", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", - "postgis": "3.4", + "tags": "15-3.4.3rc1-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4.3rc1-bundle0", + "postgis": "3.4.3rc1", "readme_group": "bundle0", "PG_MAJOR": "15", "PG_DOCKER": "15", @@ -375,9 +375,9 @@ }, "16-3.4": { "bullseye": { - "tags": "16-3.4-bullseye 16-3.4.2-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", + "tags": "16-3.4.3rc1-bullseye 16-3.4.2-bullseye", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", @@ -387,9 +387,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", - "postgis": "3.4", - "readme_group": "bookworm", + "tags": "16-3.4.3rc1-bookworm 16-3.4.2-bookworm 16-3.4.3rc1", + "postgis": "3.4.3rc1", + "readme_group": "test", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", @@ -399,38 +399,38 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19", - "readme_group": "alpine3.19", - "postgis": "3.4", + "tags": "16-3.4.3rc1-alpine3.19", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" }, "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine", - "readme_group": "alpine3.20", - "postgis": "3.4", + "tags": "16-3.4.3rc1-alpine3.20 16-3.4.3rc1-alpine", + "readme_group": "test", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", - "postgis": "3.4", + "tags": "16-3.4.3rc1-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4.3rc1-bundle0", + "postgis": "3.4.3rc1", "readme_group": "bundle0", "PG_MAJOR": "16", "PG_DOCKER": "16", @@ -507,18 +507,18 @@ }, "17beta3-3.4": { "alpine3.20": { - "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine", + "tags": "17beta3-3.4.3rc1-alpine3.20 17beta3-3.4.3rc1-alpine", "readme_group": "test", - "postgis": "3.4", + "postgis": "3.4.3rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "17beta3", "PG_DOCKER": "17beta3", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3rc1", + "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", + "POSTGIS_CHECKOUT": "tags/3.4.3rc1", + "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" } }, "17beta3-master": { From 1878445ba9efbf505a70080afb9b1c796edd4405 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 4 Sep 2024 11:22:16 +0200 Subject: [PATCH 106/167] =?UTF-8?q?Revert=20"=F0=9F=A4=96=20Bump=20version?= =?UTF-8?q?s:=20POSTGIS:3.4.3rc1"=20(#48)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 12-3.4/alpine3.19/Dockerfile | 4 +- 12-3.4/alpine3.19/tags | 2 +- 12-3.4/alpine3.20/Dockerfile | 4 +- 12-3.4/alpine3.20/tags | 2 +- 12-3.4/bookworm/tags | 2 +- 12-3.4/bullseye/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 4 +- 13-3.4/alpine3.19/tags | 2 +- 13-3.4/alpine3.20/Dockerfile | 4 +- 13-3.4/alpine3.20/tags | 2 +- 13-3.4/bookworm/tags | 2 +- 13-3.4/bullseye/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 4 +- 14-3.4/alpine3.19/tags | 2 +- 14-3.4/alpine3.20/Dockerfile | 4 +- 14-3.4/alpine3.20/tags | 2 +- 14-3.4/bookworm/tags | 2 +- 14-3.4/bullseye/tags | 2 +- 15-3.4-bundle0/bookworm/Dockerfile | 6 +- 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 4 +- 15-3.4/alpine3.19/tags | 2 +- 15-3.4/alpine3.20/Dockerfile | 4 +- 15-3.4/alpine3.20/tags | 2 +- 15-3.4/bookworm/tags | 2 +- 15-3.4/bullseye/tags | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 6 +- 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 4 +- 16-3.4/alpine3.19/tags | 2 +- 16-3.4/alpine3.20/Dockerfile | 4 +- 16-3.4/alpine3.20/tags | 2 +- 16-3.4/bookworm/tags | 2 +- 16-3.4/bullseye/tags | 2 +- 17beta3-3.4/alpine3.20/Dockerfile | 4 +- 17beta3-3.4/alpine3.20/tags | 2 +- README.md | 48 ++--- manifest.sh | 300 ++++++++++++++++++----------- versions.json | 220 ++++++++++----------- 39 files changed, 377 insertions(+), 293 deletions(-) diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index 3d9ede4cd..e4a1ce40f 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index 1b3fc0be5..798bdf3d8 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4.3rc1-alpine3.19 +12-3.4-alpine3.19 12-3.4.2-alpine3.19 diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile index 22750409f..a8bf18a5e 100644 --- a/12-3.4/alpine3.20/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags index ffac99786..8b804f9fb 100644 --- a/12-3.4/alpine3.20/tags +++ b/12-3.4/alpine3.20/tags @@ -1 +1 @@ -12-3.4.3rc1-alpine3.20 12-3.4.3rc1-alpine +12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags index 138eef16e..0088f5ff7 100644 --- a/12-3.4/bookworm/tags +++ b/12-3.4/bookworm/tags @@ -1 +1 @@ -12-3.4.3rc1-bookworm 12-3.4.2-bookworm 12-3.4.3rc1 +12-3.4-bookworm 12-3.4.2-bookworm 12-3.4 diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags index bef31e54d..26c97b435 100644 --- a/12-3.4/bullseye/tags +++ b/12-3.4/bullseye/tags @@ -1 +1 @@ -12-3.4.3rc1-bullseye 12-3.4.2-bullseye +12-3.4-bullseye 12-3.4.2-bullseye diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index 8b405cbe0..a95916535 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index 7580149a3..12d9f0286 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4.3rc1-alpine3.19 +13-3.4-alpine3.19 13-3.4.2-alpine3.19 diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile index 48459c720..396cbc13a 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags index 1ba479bf9..8539476b0 100644 --- a/13-3.4/alpine3.20/tags +++ b/13-3.4/alpine3.20/tags @@ -1 +1 @@ -13-3.4.3rc1-alpine3.20 13-3.4.3rc1-alpine +13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags index f0bd403c4..d35a8e788 100644 --- a/13-3.4/bookworm/tags +++ b/13-3.4/bookworm/tags @@ -1 +1 @@ -13-3.4.3rc1-bookworm 13-3.4.2-bookworm 13-3.4.3rc1 +13-3.4-bookworm 13-3.4.2-bookworm 13-3.4 diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags index fdc328c11..37db47727 100644 --- a/13-3.4/bullseye/tags +++ b/13-3.4/bullseye/tags @@ -1 +1 @@ -13-3.4.3rc1-bullseye 13-3.4.2-bullseye +13-3.4-bullseye 13-3.4.2-bullseye diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 53f4ad49f..7a1a09e70 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index acb6fd242..d555082f7 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4.3rc1-alpine3.19 +14-3.4-alpine3.19 14-3.4.2-alpine3.19 diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile index 382ae5e3a..e97d17111 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags index ded316b9c..a98dbc9ec 100644 --- a/14-3.4/alpine3.20/tags +++ b/14-3.4/alpine3.20/tags @@ -1 +1 @@ -14-3.4.3rc1-alpine3.20 14-3.4.3rc1-alpine +14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags index f027028f2..f44af9937 100644 --- a/14-3.4/bookworm/tags +++ b/14-3.4/bookworm/tags @@ -1 +1 @@ -14-3.4.3rc1-bookworm 14-3.4.2-bookworm 14-3.4.3rc1 +14-3.4-bookworm 14-3.4.2-bookworm 14-3.4 diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags index cdc59e218..cd8bb9fee 100644 --- a/14-3.4/bullseye/tags +++ b/14-3.4/bullseye/tags @@ -1 +1 @@ -14-3.4.3rc1-bullseye 14-3.4.2-bullseye +14-3.4-bullseye 14-3.4.2-bullseye diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 64766fba1..110e120ef 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4.3rc1-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 @@ -253,10 +253,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4.3rc1-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 15-3.4.3rc1-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 15-3.4-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index 0bcd93e4a..487b1a6b9 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4.3rc1-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4.3rc1-bundle0 +15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index 29f668bb8..774a8ebf9 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index 73b0112f5..a1f96453b 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4.3rc1-alpine3.19 +15-3.4-alpine3.19 15-3.4.2-alpine3.19 diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile index ad4ed508b..b6fc12014 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags index d6bc3505b..157d72013 100644 --- a/15-3.4/alpine3.20/tags +++ b/15-3.4/alpine3.20/tags @@ -1 +1 @@ -15-3.4.3rc1-alpine3.20 15-3.4.3rc1-alpine +15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index a5e2bfbcf..f45fa473e 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4.3rc1-bookworm 15-3.4.2-bookworm 15-3.4.3rc1 +15-3.4-bookworm 15-3.4.2-bookworm 15-3.4 diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags index 4a740d1bf..ca554ec60 100644 --- a/15-3.4/bullseye/tags +++ b/15-3.4/bullseye/tags @@ -1 +1 @@ -15-3.4.3rc1-bullseye 15-3.4.2-bullseye +15-3.4-bullseye 15-3.4.2-bullseye diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 325efecbb..d90d57990 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4.3rc1-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 @@ -248,10 +248,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4.3rc1-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 16-3.4.3rc1-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 16-3.4-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 3a4597fdb..693b1526c 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4.3rc1-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4.3rc1-bundle0 +16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index 12f5a31a2..375f65dba 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index d9653b511..2ca35a9f7 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4.3rc1-alpine3.19 +16-3.4-alpine3.19 16-3.4.2-alpine3.19 diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile index d968d1109..28bf27239 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index c0a931cd2..169894e6e 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4.3rc1-alpine3.20 16-3.4.3rc1-alpine +16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index 3da28d986..263a25f35 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4.3rc1-bookworm 16-3.4.2-bookworm 16-3.4.3rc1 +16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags index c90703d3a..925db2db4 100644 --- a/16-3.4/bullseye/tags +++ b/16-3.4/bullseye/tags @@ -1 +1 @@ -16-3.4.3rc1-bullseye 16-3.4.2-bullseye +16-3.4-bullseye 16-3.4.2-bullseye diff --git a/17beta3-3.4/alpine3.20/Dockerfile b/17beta3-3.4/alpine3.20/Dockerfile index 72650f575..066fe5b83 100644 --- a/17beta3-3.4/alpine3.20/Dockerfile +++ b/17beta3-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17beta3-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dd88eb5b435daea3525565d1bac66c00798746e5 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a FROM ${PGIS1_BASE_IMAGE} diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags index 7224611bf..4ebeba32a 100644 --- a/17beta3-3.4/alpine3.20/tags +++ b/17beta3-3.4/alpine3.20/tags @@ -1 +1 @@ -17beta3-3.4.3rc1-alpine3.20 17beta3-3.4.3rc1-alpine +17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine diff --git a/README.md b/README.md index 95948d6ab..92fb9ee54 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-03) +## Versions (2024-08-29) We provide multi-platform image support for the following architectures: @@ -71,6 +71,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | ### 📘Debian - bullseye @@ -82,6 +87,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | @@ -108,8 +118,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4.3rc1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4.3rc1-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`16-3.4.3rc1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4.3rc1-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | @@ -122,6 +132,11 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | ### ⛰️Alpine 3.20 based @@ -134,10 +149,15 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | | [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | | [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | | [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | @@ -161,29 +181,9 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.3rc1 | -| [`12-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine3.20), [`12-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3rc1 | -| [`12-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | -| [`12-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3rc1-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | -| [`13-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.3rc1 | -| [`13-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine3.20), [`13-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3rc1 | -| [`13-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | -| [`13-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3rc1-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | -| [`14-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.3rc1 | -| [`14-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine3.20), [`14-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3rc1 | -| [`14-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | -| [`14-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3rc1-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | -| [`15-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.3rc1 | -| [`15-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine3.20), [`15-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3rc1 | -| [`15-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`15-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3rc1-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`16-3.4.3rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.3rc1 | -| [`16-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine3.20), [`16-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3rc1 | -| [`16-3.4.3rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4.3rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | -| [`16-3.4.3rc1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3rc1-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-3.4.3rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3rc1-alpine3.20), [`17beta3-3.4.3rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.3rc1 | +| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.2-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.2 | | [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | diff --git a/manifest.sh b/manifest.sh index a72e905d9..691865737 100755 --- a/manifest.sh +++ b/manifest.sh @@ -34,33 +34,45 @@ manifest-tool push from-args \ # ----- 12-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:12-3.4.3rc1-alpine3.19" +echo "manifest: ${dockername}:12-3.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine3.19 \ - --target ${dockername}:12-3.4.3rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ + --target ${dockername}:12-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:12-3.4.2-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.19 \ + --target ${dockername}:12-3.4.2-alpine3.19 || true # ----- 12-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:12-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:12-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ + --target ${dockername}:12-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:12-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine3.20 \ - --target ${dockername}:12-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.20 \ + --target ${dockername}:12-3.4.2-alpine3.20 || true -echo "manifest: ${dockername}:12-3.4.3rc1-alpine" +echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-alpine \ - --target ${dockername}:12-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ + --target ${dockername}:12-3.4-alpine || true # ----- 12-3.4-bookworm ----- -echo "manifest: ${dockername}:12-3.4.3rc1-bookworm" +echo "manifest: ${dockername}:12-3.4-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-bookworm \ - --target ${dockername}:12-3.4.3rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ + --target ${dockername}:12-3.4-bookworm || true echo "manifest: ${dockername}:12-3.4.2-bookworm" manifest-tool push from-args \ @@ -68,19 +80,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.2-bookworm \ --target ${dockername}:12-3.4.2-bookworm || true -echo "manifest: ${dockername}:12-3.4.3rc1" +echo "manifest: ${dockername}:12-3.4" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1 \ - --target ${dockername}:12-3.4.3rc1 || true + --template ${dockername}-ARCHVARIANT:12-3.4 \ + --target ${dockername}:12-3.4 || true # ----- 12-3.4-bullseye ----- -echo "manifest: ${dockername}:12-3.4.3rc1-bullseye" +echo "manifest: ${dockername}:12-3.4-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3rc1-bullseye \ - --target ${dockername}:12-3.4.3rc1-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ + --target ${dockername}:12-3.4-bullseye || true echo "manifest: ${dockername}:12-3.4.2-bullseye" manifest-tool push from-args \ @@ -110,33 +122,45 @@ manifest-tool push from-args \ # ----- 13-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:13-3.4.3rc1-alpine3.19" +echo "manifest: ${dockername}:13-3.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine3.19 \ - --target ${dockername}:13-3.4.3rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ + --target ${dockername}:13-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:13-3.4.2-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.19 \ + --target ${dockername}:13-3.4.2-alpine3.19 || true # ----- 13-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:13-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:13-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine3.20 \ - --target ${dockername}:13-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ + --target ${dockername}:13-3.4-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4.3rc1-alpine" +echo "manifest: ${dockername}:13-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-alpine \ - --target ${dockername}:13-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.20 \ + --target ${dockername}:13-3.4.2-alpine3.20 || true + +echo "manifest: ${dockername}:13-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ + --target ${dockername}:13-3.4-alpine || true # ----- 13-3.4-bookworm ----- -echo "manifest: ${dockername}:13-3.4.3rc1-bookworm" +echo "manifest: ${dockername}:13-3.4-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-bookworm \ - --target ${dockername}:13-3.4.3rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ + --target ${dockername}:13-3.4-bookworm || true echo "manifest: ${dockername}:13-3.4.2-bookworm" manifest-tool push from-args \ @@ -144,19 +168,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.2-bookworm \ --target ${dockername}:13-3.4.2-bookworm || true -echo "manifest: ${dockername}:13-3.4.3rc1" +echo "manifest: ${dockername}:13-3.4" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1 \ - --target ${dockername}:13-3.4.3rc1 || true + --template ${dockername}-ARCHVARIANT:13-3.4 \ + --target ${dockername}:13-3.4 || true # ----- 13-3.4-bullseye ----- -echo "manifest: ${dockername}:13-3.4.3rc1-bullseye" +echo "manifest: ${dockername}:13-3.4-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3rc1-bullseye \ - --target ${dockername}:13-3.4.3rc1-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ + --target ${dockername}:13-3.4-bullseye || true echo "manifest: ${dockername}:13-3.4.2-bullseye" manifest-tool push from-args \ @@ -186,33 +210,45 @@ manifest-tool push from-args \ # ----- 14-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:14-3.4.3rc1-alpine3.19" +echo "manifest: ${dockername}:14-3.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine3.19 \ - --target ${dockername}:14-3.4.3rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ + --target ${dockername}:14-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:14-3.4.2-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.19 \ + --target ${dockername}:14-3.4.2-alpine3.19 || true # ----- 14-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:14-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:14-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ + --target ${dockername}:14-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:14-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine3.20 \ - --target ${dockername}:14-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.20 \ + --target ${dockername}:14-3.4.2-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4.3rc1-alpine" +echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-alpine \ - --target ${dockername}:14-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ + --target ${dockername}:14-3.4-alpine || true # ----- 14-3.4-bookworm ----- -echo "manifest: ${dockername}:14-3.4.3rc1-bookworm" +echo "manifest: ${dockername}:14-3.4-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-bookworm \ - --target ${dockername}:14-3.4.3rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ + --target ${dockername}:14-3.4-bookworm || true echo "manifest: ${dockername}:14-3.4.2-bookworm" manifest-tool push from-args \ @@ -220,19 +256,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.2-bookworm \ --target ${dockername}:14-3.4.2-bookworm || true -echo "manifest: ${dockername}:14-3.4.3rc1" +echo "manifest: ${dockername}:14-3.4" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1 \ - --target ${dockername}:14-3.4.3rc1 || true + --template ${dockername}-ARCHVARIANT:14-3.4 \ + --target ${dockername}:14-3.4 || true # ----- 14-3.4-bullseye ----- -echo "manifest: ${dockername}:14-3.4.3rc1-bullseye" +echo "manifest: ${dockername}:14-3.4-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3rc1-bullseye \ - --target ${dockername}:14-3.4.3rc1-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ + --target ${dockername}:14-3.4-bullseye || true echo "manifest: ${dockername}:14-3.4.2-bullseye" manifest-tool push from-args \ @@ -276,33 +312,45 @@ manifest-tool push from-args \ # ----- 15-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:15-3.4.3rc1-alpine3.19" +echo "manifest: ${dockername}:15-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ + --target ${dockername}:15-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:15-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine3.19 \ - --target ${dockername}:15-3.4.3rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.19 \ + --target ${dockername}:15-3.4.2-alpine3.19 || true # ----- 15-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:15-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:15-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine3.20 \ - --target ${dockername}:15-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ + --target ${dockername}:15-3.4-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4.3rc1-alpine" +echo "manifest: ${dockername}:15-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-alpine \ - --target ${dockername}:15-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.20 \ + --target ${dockername}:15-3.4.2-alpine3.20 || true + +echo "manifest: ${dockername}:15-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ + --target ${dockername}:15-3.4-alpine || true # ----- 15-3.4-bookworm ----- -echo "manifest: ${dockername}:15-3.4.3rc1-bookworm" +echo "manifest: ${dockername}:15-3.4-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bookworm \ - --target ${dockername}:15-3.4.3rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ + --target ${dockername}:15-3.4-bookworm || true echo "manifest: ${dockername}:15-3.4.2-bookworm" manifest-tool push from-args \ @@ -310,19 +358,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.2-bookworm \ --target ${dockername}:15-3.4.2-bookworm || true -echo "manifest: ${dockername}:15-3.4.3rc1" +echo "manifest: ${dockername}:15-3.4" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1 \ - --target ${dockername}:15-3.4.3rc1 || true + --template ${dockername}-ARCHVARIANT:15-3.4 \ + --target ${dockername}:15-3.4 || true # ----- 15-3.4-bullseye ----- -echo "manifest: ${dockername}:15-3.4.3rc1-bullseye" +echo "manifest: ${dockername}:15-3.4-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bullseye \ - --target ${dockername}:15-3.4.3rc1-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ + --target ${dockername}:15-3.4-bullseye || true echo "manifest: ${dockername}:15-3.4.2-bullseye" manifest-tool push from-args \ @@ -332,11 +380,11 @@ manifest-tool push from-args \ # ----- 15-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:15-3.4.3rc1-bundle0-bookworm" +echo "manifest: ${dockername}:15-3.4-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bundle0-bookworm \ - --target ${dockername}:15-3.4.3rc1-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ + --target ${dockername}:15-3.4-bundle0-bookworm || true echo "manifest: ${dockername}:15-3.4.2-bundle0-bookworm" manifest-tool push from-args \ @@ -344,11 +392,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.2-bundle0-bookworm \ --target ${dockername}:15-3.4.2-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4.3rc1-bundle0" +echo "manifest: ${dockername}:15-3.4-bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3rc1-bundle0 \ - --target ${dockername}:15-3.4.3rc1-bundle0 || true + --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ + --target ${dockername}:15-3.4-bundle0 || true # ----- 15-master-bookworm ----- @@ -412,33 +460,51 @@ manifest-tool push from-args \ # ----- 16-3.4-alpine3.19 ----- -echo "manifest: ${dockername}:16-3.4.3rc1-alpine3.19" +echo "manifest: ${dockername}:16-3.4-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ + --target ${dockername}:16-3.4-alpine3.19 || true + +echo "manifest: ${dockername}:16-3.4.2-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine3.19 \ - --target ${dockername}:16-3.4.3rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.19 \ + --target ${dockername}:16-3.4.2-alpine3.19 || true # ----- 16-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:16-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:16-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine3.20 \ - --target ${dockername}:16-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ + --target ${dockername}:16-3.4-alpine3.20 || true -echo "manifest: ${dockername}:16-3.4.3rc1-alpine" +echo "manifest: ${dockername}:16-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-alpine \ - --target ${dockername}:16-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.20 \ + --target ${dockername}:16-3.4.2-alpine3.20 || true + +echo "manifest: ${dockername}:16-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ + --target ${dockername}:16-3.4-alpine || true + +echo "manifest: ${dockername}:alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:alpine \ + --target ${dockername}:alpine || true # ----- 16-3.4-bookworm ----- -echo "manifest: ${dockername}:16-3.4.3rc1-bookworm" +echo "manifest: ${dockername}:16-3.4-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bookworm \ - --target ${dockername}:16-3.4.3rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ + --target ${dockername}:16-3.4-bookworm || true echo "manifest: ${dockername}:16-3.4.2-bookworm" manifest-tool push from-args \ @@ -446,19 +512,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.2-bookworm \ --target ${dockername}:16-3.4.2-bookworm || true -echo "manifest: ${dockername}:16-3.4.3rc1" +echo "manifest: ${dockername}:16-3.4" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1 \ - --target ${dockername}:16-3.4.3rc1 || true + --template ${dockername}-ARCHVARIANT:16-3.4 \ + --target ${dockername}:16-3.4 || true + +echo "manifest: ${dockername}:latest" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:latest \ + --target ${dockername}:latest || true # ----- 16-3.4-bullseye ----- -echo "manifest: ${dockername}:16-3.4.3rc1-bullseye" +echo "manifest: ${dockername}:16-3.4-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bullseye \ - --target ${dockername}:16-3.4.3rc1-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ + --target ${dockername}:16-3.4-bullseye || true echo "manifest: ${dockername}:16-3.4.2-bullseye" manifest-tool push from-args \ @@ -468,11 +540,11 @@ manifest-tool push from-args \ # ----- 16-3.4-bundle0-bookworm ----- -echo "manifest: ${dockername}:16-3.4.3rc1-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.4-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bundle0-bookworm \ - --target ${dockername}:16-3.4.3rc1-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ + --target ${dockername}:16-3.4-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.4.2-bundle0-bookworm" manifest-tool push from-args \ @@ -480,11 +552,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.2-bundle0-bookworm \ --target ${dockername}:16-3.4.2-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4.3rc1-bundle0" +echo "manifest: ${dockername}:16-3.4-bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ + --target ${dockername}:16-3.4-bundle0 || true + +echo "manifest: ${dockername}:bundle0" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3rc1-bundle0 \ - --target ${dockername}:16-3.4.3rc1-bundle0 || true + --template ${dockername}-ARCHVARIANT:bundle0 \ + --target ${dockername}:bundle0 || true # ----- 16-master-bookworm ----- @@ -534,17 +612,23 @@ manifest-tool push from-args \ # ----- 17beta3-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:17beta3-3.4.3rc1-alpine3.20" +echo "manifest: ${dockername}:17beta3-3.4-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \ + --target ${dockername}:17beta3-3.4-alpine3.20 || true + +echo "manifest: ${dockername}:17beta3-3.4.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4.3rc1-alpine3.20 \ - --target ${dockername}:17beta3-3.4.3rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4.2-alpine3.20 \ + --target ${dockername}:17beta3-3.4.2-alpine3.20 || true -echo "manifest: ${dockername}:17beta3-3.4.3rc1-alpine" +echo "manifest: ${dockername}:17beta3-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4.3rc1-alpine \ - --target ${dockername}:17beta3-3.4.3rc1-alpine || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine \ + --target ${dockername}:17beta3-3.4-alpine || true # ----- 17beta3-master-bookworm ----- diff --git a/versions.json b/versions.json index bb9dc47a0..7b802b9cb 100644 --- a/versions.json +++ b/versions.json @@ -17,9 +17,9 @@ }, "12-3.4": { "bullseye": { - "tags": "12-3.4.3rc1-bullseye 12-3.4.2-bullseye", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "12-3.4-bullseye 12-3.4.2-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", "PG_MAJOR": "12", "PG_DOCKER": "12", "arch": "amd64 arm64", @@ -29,9 +29,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.4.3rc1-bookworm 12-3.4.2-bookworm 12-3.4.3rc1", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", + "postgis": "3.4", + "readme_group": "bookworm", "PG_MAJOR": "12", "PG_DOCKER": "12", "arch": "amd64 arm64", @@ -41,32 +41,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "12-3.4.3rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.20": { - "tags": "12-3.4.3rc1-alpine3.20 12-3.4.3rc1-alpine", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine", + "readme_group": "alpine3.20", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "13-3.3": { @@ -87,9 +87,9 @@ }, "13-3.4": { "bullseye": { - "tags": "13-3.4.3rc1-bullseye 13-3.4.2-bullseye", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "13-3.4-bullseye 13-3.4.2-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", "PG_MAJOR": "13", "PG_DOCKER": "13", "arch": "amd64 arm64", @@ -99,9 +99,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.4.3rc1-bookworm 13-3.4.2-bookworm 13-3.4.3rc1", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", + "postgis": "3.4", + "readme_group": "bookworm", "PG_MAJOR": "13", "PG_DOCKER": "13", "arch": "amd64 arm64", @@ -111,32 +111,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "13-3.4.3rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.20": { - "tags": "13-3.4.3rc1-alpine3.20 13-3.4.3rc1-alpine", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine", + "readme_group": "alpine3.20", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "14-3.3": { @@ -157,9 +157,9 @@ }, "14-3.4": { "bullseye": { - "tags": "14-3.4.3rc1-bullseye 14-3.4.2-bullseye", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "14-3.4-bullseye 14-3.4.2-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", "PG_MAJOR": "14", "PG_DOCKER": "14", "arch": "amd64 arm64", @@ -169,9 +169,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.4.3rc1-bookworm 14-3.4.2-bookworm 14-3.4.3rc1", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", + "postgis": "3.4", + "readme_group": "bookworm", "PG_MAJOR": "14", "PG_DOCKER": "14", "arch": "amd64 arm64", @@ -181,32 +181,32 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "14-3.4.3rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.20": { - "tags": "14-3.4.3rc1-alpine3.20 14-3.4.3rc1-alpine", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine", + "readme_group": "alpine3.20", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "15-3.3": { @@ -227,9 +227,9 @@ }, "15-3.4": { "bullseye": { - "tags": "15-3.4.3rc1-bullseye 15-3.4.2-bullseye", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "15-3.4-bullseye 15-3.4.2-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", @@ -239,9 +239,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.4.3rc1-bookworm 15-3.4.2-bookworm 15-3.4.3rc1", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", + "postgis": "3.4", + "readme_group": "bookworm", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", @@ -251,38 +251,38 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "15-3.4.3rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.20": { - "tags": "15-3.4.3rc1-alpine3.20 15-3.4.3rc1-alpine", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine", + "readme_group": "alpine3.20", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4.3rc1-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4.3rc1-bundle0", - "postgis": "3.4.3rc1", + "tags": "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", + "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "15", "PG_DOCKER": "15", @@ -375,9 +375,9 @@ }, "16-3.4": { "bullseye": { - "tags": "16-3.4.3rc1-bullseye 16-3.4.2-bullseye", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "16-3.4-bullseye 16-3.4.2-bullseye", + "postgis": "3.4", + "readme_group": "bullseye", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", @@ -387,9 +387,9 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.4.3rc1-bookworm 16-3.4.2-bookworm 16-3.4.3rc1", - "postgis": "3.4.3rc1", - "readme_group": "test", + "tags": "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", + "postgis": "3.4", + "readme_group": "bookworm", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", @@ -399,38 +399,38 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "16-3.4.3rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" }, "alpine3.20": { - "tags": "16-3.4.3rc1-alpine3.20 16-3.4.3rc1-alpine", - "readme_group": "test", - "postgis": "3.4.3rc1", + "tags": "16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine", + "readme_group": "alpine3.20", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4.3rc1-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4.3rc1-bundle0", - "postgis": "3.4.3rc1", + "tags": "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", + "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "16", "PG_DOCKER": "16", @@ -507,18 +507,18 @@ }, "17beta3-3.4": { "alpine3.20": { - "tags": "17beta3-3.4.3rc1-alpine3.20 17beta3-3.4.3rc1-alpine", + "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine", "readme_group": "test", - "postgis": "3.4.3rc1", + "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "17beta3", "PG_DOCKER": "17beta3", - "POSTGIS_VERSION": "3.4.3rc1", - "POSTGIS_SHA256": "5eef7249e6c8cc00cc22025601c87ab19ff8b53d32df0b2c821d907f56d4b959", - "POSTGIS_CHECKOUT": "tags/3.4.3rc1", - "POSTGIS_CHECKOUT_SHA1": "dd88eb5b435daea3525565d1bac66c00798746e5" + "POSTGIS_VERSION": "3.4.2", + "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", + "POSTGIS_CHECKOUT": "tags/3.4.2", + "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" } }, "17beta3-master": { From a8e6ba0f4d9b03773b20dadb05e9a875fb4861ce Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 4 Sep 2024 14:11:44 +0200 Subject: [PATCH 107/167] fix postgis version detection --- README.md | 2 +- versions.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92fb9ee54..6185461b8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-08-29) +## Versions (2024-09-04) We provide multi-platform image support for the following architectures: diff --git a/versions.sh b/versions.sh index 728ab2304..99340ee27 100755 --- a/versions.sh +++ b/versions.sh @@ -346,7 +346,14 @@ declare -A postgisSrcSha256=() declare -A postgisSrcSha1=() for variant in ${postgis_versions}; do _postgisMinor=$(echo "$variant" | cut -d. -f2) - postgisLastTags[$variant]=$(echo "$postgis_all_v3_versions" | grep "^3\.${_postgisMinor}\." | version_reverse_sort | head -n 1 || true) + + # check the latest released 3.x version (so not alpha/beta/rc) + postgisLastTags[$variant]=$(echo "$postgis_all_v3_versions" | grep "^3\.${_postgisMinor}\." | grep -v '[a-zA-Z]' | version_reverse_sort | head -n 1 || true) + # Check if the result is empty + if [[ -z "${postgisLastTags[$variant]}" ]]; then + # If empty, run the command again without excluding pre-releases (alpha/beta/rc) + postgisLastTags[$variant]=$(echo "$postgis_all_v3_versions" | grep "^3\.${_postgisMinor}\." | version_reverse_sort | head -n 1 || true) + fi if [[ ${postgisLastTags[$variant]} =~ [a-zA-Z] ]]; then postgisLastDockerTags[$variant]=${postgisLastTags[$variant]} From 296ab26930a93db3758ed190628a052b0a7d1511 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 4 Sep 2024 22:32:44 +0200 Subject: [PATCH 108/167] update postgis 3.4.3 --- 12-3.4/alpine3.19/Dockerfile | 4 +- 12-3.4/alpine3.19/tags | 2 +- 12-3.4/alpine3.20/Dockerfile | 4 +- 12-3.4/alpine3.20/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 4 +- 13-3.4/alpine3.19/tags | 2 +- 13-3.4/alpine3.20/Dockerfile | 4 +- 13-3.4/alpine3.20/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 4 +- 14-3.4/alpine3.19/tags | 2 +- 14-3.4/alpine3.20/Dockerfile | 4 +- 14-3.4/alpine3.20/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 4 +- 15-3.4/alpine3.19/tags | 2 +- 15-3.4/alpine3.20/Dockerfile | 4 +- 15-3.4/alpine3.20/tags | 2 +- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 4 +- 16-3.4/alpine3.19/tags | 2 +- 16-3.4/alpine3.20/Dockerfile | 4 +- 16-3.4/alpine3.20/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17beta3-3.4/alpine3.20/Dockerfile | 4 +- 17beta3-3.4/alpine3.20/tags | 2 +- 17beta3-recent/bookworm/Dockerfile | 4 +- 17beta3-recent/bookworm/tags | 2 +- README.md | 28 +++---- manifest.sh | 84 +++++++++---------- versions.json | 128 ++++++++++++++--------------- 31 files changed, 162 insertions(+), 162 deletions(-) diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index e4a1ce40f..ae2edca0f 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index 798bdf3d8..d18b20ca4 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4-alpine3.19 12-3.4.2-alpine3.19 +12-3.4-alpine3.19 12-3.4.3-alpine3.19 diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile index a8bf18a5e..a2ca0ee0d 100644 --- a/12-3.4/alpine3.20/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags index 8b804f9fb..0dfba80e4 100644 --- a/12-3.4/alpine3.20/tags +++ b/12-3.4/alpine3.20/tags @@ -1 +1 @@ -12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine +12-3.4-alpine3.20 12-3.4.3-alpine3.20 12-3.4-alpine diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index a95916535..c8ac8cdc4 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index 12d9f0286..d455e2cf5 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4-alpine3.19 13-3.4.2-alpine3.19 +13-3.4-alpine3.19 13-3.4.3-alpine3.19 diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile index 396cbc13a..52dc445f8 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags index 8539476b0..fc62a43ec 100644 --- a/13-3.4/alpine3.20/tags +++ b/13-3.4/alpine3.20/tags @@ -1 +1 @@ -13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine +13-3.4-alpine3.20 13-3.4.3-alpine3.20 13-3.4-alpine diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 7a1a09e70..8ac8c3bd6 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index d555082f7..769999303 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4-alpine3.19 14-3.4.2-alpine3.19 +14-3.4-alpine3.19 14-3.4.3-alpine3.19 diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile index e97d17111..c8629edb5 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags index a98dbc9ec..3a70b7587 100644 --- a/14-3.4/alpine3.20/tags +++ b/14-3.4/alpine3.20/tags @@ -1 +1 @@ -14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine +14-3.4-alpine3.20 14-3.4.3-alpine3.20 14-3.4-alpine diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index 774a8ebf9..31b739472 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index a1f96453b..9561d271b 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4-alpine3.19 15-3.4.2-alpine3.19 +15-3.4-alpine3.19 15-3.4.3-alpine3.19 diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile index b6fc12014..ae9feee1c 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags index 157d72013..f1d9a97a2 100644 --- a/15-3.4/alpine3.20/tags +++ b/15-3.4/alpine3.20/tags @@ -1 +1 @@ -15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine +15-3.4-alpine3.20 15-3.4.3-alpine3.20 15-3.4-alpine diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 4c0c7fe9b..a21dd321a 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 4ae882472..ad7cf9f0d 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index 375f65dba..e7b68086e 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index 2ca35a9f7..2a2d42cbd 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4-alpine3.19 16-3.4.2-alpine3.19 +16-3.4-alpine3.19 16-3.4.3-alpine3.19 diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile index 28bf27239..5b73f50d2 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index 169894e6e..4ed961890 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine +16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine alpine diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index ba2ef1209..3c882bfcd 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 5c5dae7e9..ccf8d1604 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17beta3-3.4/alpine3.20/Dockerfile b/17beta3-3.4/alpine3.20/Dockerfile index 066fe5b83..93fed4d43 100644 --- a/17beta3-3.4/alpine3.20/Dockerfile +++ b/17beta3-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17beta3-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf FROM ${PGIS1_BASE_IMAGE} diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags index 4ebeba32a..4cf5bbf10 100644 --- a/17beta3-3.4/alpine3.20/tags +++ b/17beta3-3.4/alpine3.20/tags @@ -1 +1 @@ -17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine +17beta3-3.4-alpine3.20 17beta3-3.4.3-alpine3.20 17beta3-3.4-alpine diff --git a/17beta3-recent/bookworm/Dockerfile b/17beta3-recent/bookworm/Dockerfile index 6190b434a..a26589d51 100644 --- a/17beta3-recent/bookworm/Dockerfile +++ b/17beta3-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.2 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=c19ce56ca8982635026ba605f5b2fdce3622bb4a +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab diff --git a/17beta3-recent/bookworm/tags b/17beta3-recent/bookworm/tags index 53b7f856e..982a79447 100644 --- a/17beta3-recent/bookworm/tags +++ b/17beta3-recent/bookworm/tags @@ -1 +1 @@ -17beta3-recent-bookworm 17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent +17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent diff --git a/README.md b/README.md index 6185461b8..1d4bf02e1 100644 --- a/README.md +++ b/README.md @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -132,11 +132,11 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.2 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.2 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.2 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.2 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.2-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.2 | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.3 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.3 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.3 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.3 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.3 | ### ⛰️Alpine 3.20 based @@ -149,15 +149,15 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.2 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3 | | [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.2 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3 | | [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.2 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3 | | [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.2 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3 | | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.2 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | @@ -183,9 +183,9 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.2-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.2 | +| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.3 | | [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.2, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 691865737..d9d5f15bc 100755 --- a/manifest.sh +++ b/manifest.sh @@ -40,11 +40,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ --target ${dockername}:12-3.4-alpine3.19 || true -echo "manifest: ${dockername}:12-3.4.2-alpine3.19" +echo "manifest: ${dockername}:12-3.4.3-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.19 \ - --target ${dockername}:12-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4.3-alpine3.19 \ + --target ${dockername}:12-3.4.3-alpine3.19 || true # ----- 12-3.4-alpine3.20 ----- @@ -54,11 +54,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ --target ${dockername}:12-3.4-alpine3.20 || true -echo "manifest: ${dockername}:12-3.4.2-alpine3.20" +echo "manifest: ${dockername}:12-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-alpine3.20 \ - --target ${dockername}:12-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.4.3-alpine3.20 \ + --target ${dockername}:12-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ @@ -128,11 +128,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ --target ${dockername}:13-3.4-alpine3.19 || true -echo "manifest: ${dockername}:13-3.4.2-alpine3.19" +echo "manifest: ${dockername}:13-3.4.3-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.19 \ - --target ${dockername}:13-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4.3-alpine3.19 \ + --target ${dockername}:13-3.4.3-alpine3.19 || true # ----- 13-3.4-alpine3.20 ----- @@ -142,11 +142,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ --target ${dockername}:13-3.4-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4.2-alpine3.20" +echo "manifest: ${dockername}:13-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-alpine3.20 \ - --target ${dockername}:13-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4.3-alpine3.20 \ + --target ${dockername}:13-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ @@ -216,11 +216,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ --target ${dockername}:14-3.4-alpine3.19 || true -echo "manifest: ${dockername}:14-3.4.2-alpine3.19" +echo "manifest: ${dockername}:14-3.4.3-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.19 \ - --target ${dockername}:14-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4.3-alpine3.19 \ + --target ${dockername}:14-3.4.3-alpine3.19 || true # ----- 14-3.4-alpine3.20 ----- @@ -230,11 +230,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ --target ${dockername}:14-3.4-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4.2-alpine3.20" +echo "manifest: ${dockername}:14-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-alpine3.20 \ - --target ${dockername}:14-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4.3-alpine3.20 \ + --target ${dockername}:14-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ @@ -318,11 +318,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ --target ${dockername}:15-3.4-alpine3.19 || true -echo "manifest: ${dockername}:15-3.4.2-alpine3.19" +echo "manifest: ${dockername}:15-3.4.3-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.19 \ - --target ${dockername}:15-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3-alpine3.19 \ + --target ${dockername}:15-3.4.3-alpine3.19 || true # ----- 15-3.4-alpine3.20 ----- @@ -332,11 +332,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ --target ${dockername}:15-3.4-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4.2-alpine3.20" +echo "manifest: ${dockername}:15-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-alpine3.20 \ - --target ${dockername}:15-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4.3-alpine3.20 \ + --target ${dockername}:15-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -466,11 +466,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ --target ${dockername}:16-3.4-alpine3.19 || true -echo "manifest: ${dockername}:16-3.4.2-alpine3.19" +echo "manifest: ${dockername}:16-3.4.3-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.19 \ - --target ${dockername}:16-3.4.2-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.3-alpine3.19 \ + --target ${dockername}:16-3.4.3-alpine3.19 || true # ----- 16-3.4-alpine3.20 ----- @@ -480,11 +480,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ --target ${dockername}:16-3.4-alpine3.20 || true -echo "manifest: ${dockername}:16-3.4.2-alpine3.20" +echo "manifest: ${dockername}:16-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-alpine3.20 \ - --target ${dockername}:16-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4.3-alpine3.20 \ + --target ${dockername}:16-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ @@ -586,11 +586,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ @@ -618,11 +618,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \ --target ${dockername}:17beta3-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17beta3-3.4.2-alpine3.20" +echo "manifest: ${dockername}:17beta3-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4.2-alpine3.20 \ - --target ${dockername}:17beta3-3.4.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17beta3-3.4.3-alpine3.20 \ + --target ${dockername}:17beta3-3.4.3-alpine3.20 || true echo "manifest: ${dockername}:17beta3-3.4-alpine" manifest-tool push from-args \ @@ -652,11 +652,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17beta3-recent-bookworm \ --target ${dockername}:17beta3-recent-bookworm || true -echo "manifest: ${dockername}:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 7b802b9cb..32a0284ff 100644 --- a/versions.json +++ b/versions.json @@ -41,7 +41,7 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.2-alpine3.19", + "tags": "12-3.4-alpine3.19 12-3.4.3-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -49,13 +49,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "12-3.4-alpine3.20 12-3.4.2-alpine3.20 12-3.4-alpine", + "tags": "12-3.4-alpine3.20 12-3.4.3-alpine3.20 12-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -63,10 +63,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "13-3.3": { @@ -111,7 +111,7 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.2-alpine3.19", + "tags": "13-3.4-alpine3.19 13-3.4.3-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -119,13 +119,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "13-3.4-alpine3.20 13-3.4.2-alpine3.20 13-3.4-alpine", + "tags": "13-3.4-alpine3.20 13-3.4.3-alpine3.20 13-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -133,10 +133,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "14-3.3": { @@ -181,7 +181,7 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.2-alpine3.19", + "tags": "14-3.4-alpine3.19 14-3.4.3-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -189,13 +189,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "14-3.4-alpine3.20 14-3.4.2-alpine3.20 14-3.4-alpine", + "tags": "14-3.4-alpine3.20 14-3.4.3-alpine3.20 14-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -203,10 +203,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "15-3.3": { @@ -251,7 +251,7 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.2-alpine3.19", + "tags": "15-3.4-alpine3.19 15-3.4.3-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -259,13 +259,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "15-3.4-alpine3.20 15-3.4.2-alpine3.20 15-3.4-alpine", + "tags": "15-3.4-alpine3.20 15-3.4.3-alpine3.20 15-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -273,10 +273,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "15-3.4-bundle0": { @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -341,8 +341,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", @@ -399,7 +399,7 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.2-alpine3.19", + "tags": "16-3.4-alpine3.19 16-3.4.3-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -407,13 +407,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.2-alpine3.20 16-3.4-alpine alpine", + "tags": "16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -421,10 +421,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "16-3.4-bundle0": { @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -489,8 +489,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", @@ -507,7 +507,7 @@ }, "17beta3-3.4": { "alpine3.20": { - "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.2-alpine3.20 17beta3-3.4-alpine", + "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.3-alpine3.20 17beta3-3.4-alpine", "readme_group": "test", "postgis": "3.4", "arch": "amd64 arm64", @@ -515,10 +515,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17beta3", "PG_DOCKER": "17beta3", - "POSTGIS_VERSION": "3.4.2", - "POSTGIS_SHA256": "17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a" + "POSTGIS_VERSION": "3.4.3", + "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, "17beta3-master": { @@ -549,7 +549,7 @@ }, "17beta3-recent": { "bookworm": { - "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.2-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", + "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", "postgis": "recent", "readme_group": "test", "PG_MAJOR": "17beta3", @@ -557,8 +557,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.2", - "POSTGIS_CHECKOUT_SHA1": "c19ce56ca8982635026ba605f5b2fdce3622bb4a", + "POSTGIS_CHECKOUT": "tags/3.4.3", + "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", "PROJ_CHECKOUT": "tags/9.4.1", "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", "GDAL_BUILD": "with_extra", From 68b6cfcfbbf013a5c978c04147205c41dada93e0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 6 Sep 2024 20:00:07 +0000 Subject: [PATCH 109/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GEOS:?= =?UTF-8?q?3.13.0,POSTGIS:3.3.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 12-3.3/alpine3.20/Dockerfile | 4 +- 12-3.3/alpine3.20/tags | 2 +- 13-3.3/alpine3.20/Dockerfile | 4 +- 13-3.3/alpine3.20/tags | 2 +- 14-3.3/alpine3.20/Dockerfile | 4 +- 14-3.3/alpine3.20/tags | 2 +- 15-3.3/alpine3.20/Dockerfile | 4 +- 15-3.3/alpine3.20/tags | 2 +- 15-recent/bookworm/Dockerfile | 4 +- 15-recent/bookworm/tags | 2 +- 16-3.3/alpine3.20/Dockerfile | 4 +- 16-3.3/alpine3.20/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17beta3-recent/bookworm/Dockerfile | 4 +- 17beta3-recent/bookworm/tags | 2 +- README.md | 18 ++++---- manifest.sh | 66 ++++++++++++++--------------- versions.json | 68 +++++++++++++++--------------- 19 files changed, 100 insertions(+), 100 deletions(-) diff --git a/12-3.3/alpine3.20/Dockerfile b/12-3.3/alpine3.20/Dockerfile index 47bdc0e56..e01034f2b 100644 --- a/12-3.3/alpine3.20/Dockerfile +++ b/12-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.3/alpine3.20/tags b/12-3.3/alpine3.20/tags index 589ce2229..7eb40ee52 100644 --- a/12-3.3/alpine3.20/tags +++ b/12-3.3/alpine3.20/tags @@ -1 +1 @@ -12-3.3-alpine3.20 12-3.3.6-alpine3.20 12-3.3-alpine +12-3.3-alpine3.20 12-3.3.7-alpine3.20 12-3.3-alpine diff --git a/13-3.3/alpine3.20/Dockerfile b/13-3.3/alpine3.20/Dockerfile index 81733d707..6a9c61d1e 100644 --- a/13-3.3/alpine3.20/Dockerfile +++ b/13-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.3/alpine3.20/tags b/13-3.3/alpine3.20/tags index b5994c153..6a58d94ef 100644 --- a/13-3.3/alpine3.20/tags +++ b/13-3.3/alpine3.20/tags @@ -1 +1 @@ -13-3.3-alpine3.20 13-3.3.6-alpine3.20 13-3.3-alpine +13-3.3-alpine3.20 13-3.3.7-alpine3.20 13-3.3-alpine diff --git a/14-3.3/alpine3.20/Dockerfile b/14-3.3/alpine3.20/Dockerfile index 63411191b..c5a4ddbbb 100644 --- a/14-3.3/alpine3.20/Dockerfile +++ b/14-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.3/alpine3.20/tags b/14-3.3/alpine3.20/tags index 6e88e42b6..6347df270 100644 --- a/14-3.3/alpine3.20/tags +++ b/14-3.3/alpine3.20/tags @@ -1 +1 @@ -14-3.3-alpine3.20 14-3.3.6-alpine3.20 14-3.3-alpine +14-3.3-alpine3.20 14-3.3.7-alpine3.20 14-3.3-alpine diff --git a/15-3.3/alpine3.20/Dockerfile b/15-3.3/alpine3.20/Dockerfile index 8d19e93fc..8f32ed134 100644 --- a/15-3.3/alpine3.20/Dockerfile +++ b/15-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.3/alpine3.20/tags b/15-3.3/alpine3.20/tags index 5feadf883..7708eed1c 100644 --- a/15-3.3/alpine3.20/tags +++ b/15-3.3/alpine3.20/tags @@ -1 +1 @@ -15-3.3-alpine3.20 15-3.3.6-alpine3.20 15-3.3-alpine +15-3.3-alpine3.20 15-3.3.7-alpine3.20 15-3.3-alpine diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index a21dd321a..e1d8269bb 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf -ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 +ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index ad7cf9f0d..1f82f69d7 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.3/alpine3.20/Dockerfile b/16-3.3/alpine3.20/Dockerfile index 7bb648b5c..2b803356f 100644 --- a/16-3.3/alpine3.20/Dockerfile +++ b/16-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.6 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfe89b39940bae86a7a9c529b7961a641b5bf245 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.3/alpine3.20/tags b/16-3.3/alpine3.20/tags index a2b84d2b8..c34cf9302 100644 --- a/16-3.3/alpine3.20/tags +++ b/16-3.3/alpine3.20/tags @@ -1 +1 @@ -16-3.3-alpine3.20 16-3.3.6-alpine3.20 16-3.3-alpine +16-3.3-alpine3.20 16-3.3.7-alpine3.20 16-3.3-alpine diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 3c882bfcd..dca3e2255 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf -ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 +ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index ccf8d1604..bc675f1ca 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17beta3-recent/bookworm/Dockerfile b/17beta3-recent/bookworm/Dockerfile index a26589d51..ac94c6805 100644 --- a/17beta3-recent/bookworm/Dockerfile +++ b/17beta3-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_GEOS_CHECKOUT=tags/3.12.2 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf -ARG PGIS1_GEOS_CHECKOUT_SHA1=b74fefb7be4ba6c833760106f95f0f495b832c43 +ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc diff --git a/17beta3-recent/bookworm/tags b/17beta3-recent/bookworm/tags index 982a79447..45d251f8c 100644 --- a/17beta3-recent/bookworm/tags +++ b/17beta3-recent/bookworm/tags @@ -1 +1 @@ -17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent +17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent diff --git a/README.md b/README.md index 1d4bf02e1..75617f395 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-04) +## Versions (2024-09-06) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -148,15 +148,15 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.6-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.6 | +| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.7-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.7 | | [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3 | -| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.6-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.6 | +| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.7-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.7 | | [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3 | -| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.6-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.6 | +| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.7-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.7 | | [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3 | -| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.6-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.6 | +| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.7-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.7 | | [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3 | -| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.6-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.6-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.6 | +| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.7-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.7 | | [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | @@ -185,7 +185,7 @@ Please note that the included package list is subject to change as we continue t | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.3 | | [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.3, geos=tags/3.12.2, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index d9d5f15bc..a05700d21 100755 --- a/manifest.sh +++ b/manifest.sh @@ -20,11 +20,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.20 \ --target ${dockername}:12-3.3-alpine3.20 || true -echo "manifest: ${dockername}:12-3.3.6-alpine3.20" +echo "manifest: ${dockername}:12-3.3.7-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.6-alpine3.20 \ - --target ${dockername}:12-3.3.6-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.3.7-alpine3.20 \ + --target ${dockername}:12-3.3.7-alpine3.20 || true echo "manifest: ${dockername}:12-3.3-alpine" manifest-tool push from-args \ @@ -108,11 +108,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.20 \ --target ${dockername}:13-3.3-alpine3.20 || true -echo "manifest: ${dockername}:13-3.3.6-alpine3.20" +echo "manifest: ${dockername}:13-3.3.7-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3.6-alpine3.20 \ - --target ${dockername}:13-3.3.6-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.3.7-alpine3.20 \ + --target ${dockername}:13-3.3.7-alpine3.20 || true echo "manifest: ${dockername}:13-3.3-alpine" manifest-tool push from-args \ @@ -196,11 +196,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.20 \ --target ${dockername}:14-3.3-alpine3.20 || true -echo "manifest: ${dockername}:14-3.3.6-alpine3.20" +echo "manifest: ${dockername}:14-3.3.7-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3.6-alpine3.20 \ - --target ${dockername}:14-3.3.6-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.3.7-alpine3.20 \ + --target ${dockername}:14-3.3.7-alpine3.20 || true echo "manifest: ${dockername}:14-3.3-alpine" manifest-tool push from-args \ @@ -298,11 +298,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.20 \ --target ${dockername}:15-3.3-alpine3.20 || true -echo "manifest: ${dockername}:15-3.3.6-alpine3.20" +echo "manifest: ${dockername}:15-3.3.7-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3.6-alpine3.20 \ - --target ${dockername}:15-3.3.6-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.3.7-alpine3.20 \ + --target ${dockername}:15-3.3.7-alpine3.20 || true echo "manifest: ${dockername}:15-3.3-alpine" manifest-tool push from-args \ @@ -420,17 +420,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ @@ -446,11 +446,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.20 \ --target ${dockername}:16-3.3-alpine3.20 || true -echo "manifest: ${dockername}:16-3.3.6-alpine3.20" +echo "manifest: ${dockername}:16-3.3.7-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3.6-alpine3.20 \ - --target ${dockername}:16-3.3.6-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.3.7-alpine3.20 \ + --target ${dockername}:16-3.3.7-alpine3.20 || true echo "manifest: ${dockername}:16-3.3-alpine" manifest-tool push from-args \ @@ -586,17 +586,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -652,17 +652,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17beta3-recent-bookworm \ --target ${dockername}:17beta3-recent-bookworm || true -echo "manifest: ${dockername}:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:17beta3-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 32a0284ff..6a53756a4 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "12-3.3": { "alpine3.20": { - "tags": "12-3.3-alpine3.20 12-3.3.6-alpine3.20 12-3.3-alpine", + "tags": "12-3.3-alpine3.20 12-3.3.7-alpine3.20 12-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -9,10 +9,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.3.6", - "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", - "POSTGIS_CHECKOUT": "tags/3.3.6", - "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" + "POSTGIS_VERSION": "3.3.7", + "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", + "POSTGIS_CHECKOUT": "tags/3.3.7", + "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" } }, "12-3.4": { @@ -71,7 +71,7 @@ }, "13-3.3": { "alpine3.20": { - "tags": "13-3.3-alpine3.20 13-3.3.6-alpine3.20 13-3.3-alpine", + "tags": "13-3.3-alpine3.20 13-3.3.7-alpine3.20 13-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -79,10 +79,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.3.6", - "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", - "POSTGIS_CHECKOUT": "tags/3.3.6", - "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" + "POSTGIS_VERSION": "3.3.7", + "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", + "POSTGIS_CHECKOUT": "tags/3.3.7", + "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" } }, "13-3.4": { @@ -141,7 +141,7 @@ }, "14-3.3": { "alpine3.20": { - "tags": "14-3.3-alpine3.20 14-3.3.6-alpine3.20 14-3.3-alpine", + "tags": "14-3.3-alpine3.20 14-3.3.7-alpine3.20 14-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -149,10 +149,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.3.6", - "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", - "POSTGIS_CHECKOUT": "tags/3.3.6", - "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" + "POSTGIS_VERSION": "3.3.7", + "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", + "POSTGIS_CHECKOUT": "tags/3.3.7", + "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" } }, "14-3.4": { @@ -211,7 +211,7 @@ }, "15-3.3": { "alpine3.20": { - "tags": "15-3.3-alpine3.20 15-3.3.6-alpine3.20 15-3.3-alpine", + "tags": "15-3.3-alpine3.20 15-3.3.7-alpine3.20 15-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -219,10 +219,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.3.6", - "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", - "POSTGIS_CHECKOUT": "tags/3.3.6", - "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" + "POSTGIS_VERSION": "3.3.7", + "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", + "POSTGIS_CHECKOUT": "tags/3.3.7", + "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" } }, "15-3.4": { @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -348,8 +348,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GEOS_CHECKOUT": "tags/3.12.2", - "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", + "GEOS_CHECKOUT": "tags/3.13.0", + "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v1.5.2", "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", @@ -359,7 +359,7 @@ }, "16-3.3": { "alpine3.20": { - "tags": "16-3.3-alpine3.20 16-3.3.6-alpine3.20 16-3.3-alpine", + "tags": "16-3.3-alpine3.20 16-3.3.7-alpine3.20 16-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -367,10 +367,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.3.6", - "POSTGIS_SHA256": "6faae40a2fbc6c4b6a46d1aabaf30b8fdd85fd7f0628d88d3816786cdc6904cb", - "POSTGIS_CHECKOUT": "tags/3.3.6", - "POSTGIS_CHECKOUT_SHA1": "cfe89b39940bae86a7a9c529b7961a641b5bf245" + "POSTGIS_VERSION": "3.3.7", + "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", + "POSTGIS_CHECKOUT": "tags/3.3.7", + "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" } }, "16-3.4": { @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -496,8 +496,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GEOS_CHECKOUT": "tags/3.12.2", - "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", + "GEOS_CHECKOUT": "tags/3.13.0", + "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v1.5.2", "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", @@ -549,7 +549,7 @@ }, "17beta3-recent": { "bookworm": { - "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.12.2-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.12-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", + "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", "postgis": "recent", "readme_group": "test", "PG_MAJOR": "17beta3", @@ -564,8 +564,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GEOS_CHECKOUT": "tags/3.12.2", - "GEOS_CHECKOUT_SHA1": "b74fefb7be4ba6c833760106f95f0f495b832c43", + "GEOS_CHECKOUT": "tags/3.13.0", + "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v1.5.2", "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "CGAL_CHECKOUT": "tags/v5.6.1", From 5a781d4bb9944614f90badd0aa96476c1aa80941 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 7 Sep 2024 17:35:22 +0200 Subject: [PATCH 110/167] upgrade to 17rc1 --- .circleci/config.yml | 6 +- .github/workflows/main.yml | 6 +- 15-master/bookworm/Dockerfile | 2 +- 16-master/bookworm/Dockerfile | 2 +- 17beta3-3.4/alpine3.20/tags | 1 - 17beta3-master/bookworm/tags | 1 - 17beta3-recent/bookworm/tags | 1 - .../alpine3.20/Dockerfile | 4 +- .../alpine3.20/initdb-postgis.sh | 0 17rc1-3.4/alpine3.20/tags | 1 + .../alpine3.20/update-postgis.sh | 0 .../bookworm/Dockerfile | 6 +- .../bookworm/initdb-postgis.sh | 0 17rc1-master/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 .../bookworm/Dockerfile | 4 +- .../bookworm/initdb-postgis.sh | 0 17rc1-recent/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 README.md | 8 +-- manifest.sh | 60 +++++++++---------- versions.json | 30 +++++----- versions.sh | 7 +-- 23 files changed, 70 insertions(+), 71 deletions(-) delete mode 100644 17beta3-3.4/alpine3.20/tags delete mode 100644 17beta3-master/bookworm/tags delete mode 100644 17beta3-recent/bookworm/tags rename {17beta3-3.4 => 17rc1-3.4}/alpine3.20/Dockerfile (97%) rename {17beta3-3.4 => 17rc1-3.4}/alpine3.20/initdb-postgis.sh (100%) create mode 100644 17rc1-3.4/alpine3.20/tags rename {17beta3-3.4 => 17rc1-3.4}/alpine3.20/update-postgis.sh (100%) rename {17beta3-master => 17rc1-master}/bookworm/Dockerfile (99%) rename {17beta3-master => 17rc1-master}/bookworm/initdb-postgis.sh (100%) create mode 100644 17rc1-master/bookworm/tags rename {17beta3-master => 17rc1-master}/bookworm/update-postgis.sh (100%) rename {17beta3-recent => 17rc1-recent}/bookworm/Dockerfile (99%) rename {17beta3-recent => 17rc1-recent}/bookworm/initdb-postgis.sh (100%) create mode 100644 17rc1-recent/bookworm/tags rename {17beta3-recent => 17rc1-recent}/bookworm/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22a9cff97..c72dcec70 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,8 +155,8 @@ workflows: "16-3.4-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", - "17beta3-3.4-alpine3.20", - "17beta3-master-bookworm", - "17beta3-recent-bookworm", + "17rc1-3.4-alpine3.20", + "17rc1-master-bookworm", + "17rc1-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00d2d6a54..041deb43b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,9 +56,9 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - - { version: "17beta3-3.4", variant: "alpine3.20" } - - { version: "17beta3-master", variant: "bookworm" } - - { version: "17beta3-recent", variant: "bookworm" } + - { version: "17rc1-3.4", variant: "alpine3.20" } + - { version: "17rc1-master", variant: "bookworm" } + - { version: "17rc1-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 90979a036..6f530f9b7 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=3.12 +ARG PGIS1_GEOS_CHECKOUT=main ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 3267bcad2..cd9318b19 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=3.12 +ARG PGIS1_GEOS_CHECKOUT=main ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master diff --git a/17beta3-3.4/alpine3.20/tags b/17beta3-3.4/alpine3.20/tags deleted file mode 100644 index 4cf5bbf10..000000000 --- a/17beta3-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17beta3-3.4-alpine3.20 17beta3-3.4.3-alpine3.20 17beta3-3.4-alpine diff --git a/17beta3-master/bookworm/tags b/17beta3-master/bookworm/tags deleted file mode 100644 index 7d8f95113..000000000 --- a/17beta3-master/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta3-master-bookworm 17beta3-master diff --git a/17beta3-recent/bookworm/tags b/17beta3-recent/bookworm/tags deleted file mode 100644 index 45d251f8c..000000000 --- a/17beta3-recent/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent diff --git a/17beta3-3.4/alpine3.20/Dockerfile b/17rc1-3.4/alpine3.20/Dockerfile similarity index 97% rename from 17beta3-3.4/alpine3.20/Dockerfile rename to 17rc1-3.4/alpine3.20/Dockerfile index 93fed4d43..8de6b5bf6 100644 --- a/17beta3-3.4/alpine3.20/Dockerfile +++ b/17rc1-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17beta3-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17beta3 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17beta3-3.4/alpine3.20/initdb-postgis.sh b/17rc1-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 17beta3-3.4/alpine3.20/initdb-postgis.sh rename to 17rc1-3.4/alpine3.20/initdb-postgis.sh diff --git a/17rc1-3.4/alpine3.20/tags b/17rc1-3.4/alpine3.20/tags new file mode 100644 index 000000000..edbc4a9d8 --- /dev/null +++ b/17rc1-3.4/alpine3.20/tags @@ -0,0 +1 @@ +17rc1-3.4-alpine3.20 17rc1-3.4.3-alpine3.20 17rc1-3.4-alpine diff --git a/17beta3-3.4/alpine3.20/update-postgis.sh b/17rc1-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 17beta3-3.4/alpine3.20/update-postgis.sh rename to 17rc1-3.4/alpine3.20/update-postgis.sh diff --git a/17beta3-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile similarity index 99% rename from 17beta3-master/bookworm/Dockerfile rename to 17rc1-master/bookworm/Dockerfile index 59aa360a1..0a381b66e 100644 --- a/17beta3-master/bookworm/Dockerfile +++ b/17rc1-master/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta3-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=3.12 +ARG PGIS1_GEOS_CHECKOUT=main ARG PGIS1_GDAL_CHECKOUT=master ARG PGIS1_PROJ_CHECKOUT=master ARG PGIS1_SFCGAL_CHECKOUT=master @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta3-master spatial database extension with PostgreSQL 17beta3 bookworm" \ + org.opencontainers.image.description="PostGIS - 17rc1-master spatial database extension with PostgreSQL 17rc1 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta3-master/bookworm/initdb-postgis.sh b/17rc1-master/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta3-master/bookworm/initdb-postgis.sh rename to 17rc1-master/bookworm/initdb-postgis.sh diff --git a/17rc1-master/bookworm/tags b/17rc1-master/bookworm/tags new file mode 100644 index 000000000..ff1490101 --- /dev/null +++ b/17rc1-master/bookworm/tags @@ -0,0 +1 @@ +17rc1-master-bookworm 17rc1-master diff --git a/17beta3-master/bookworm/update-postgis.sh b/17rc1-master/bookworm/update-postgis.sh similarity index 100% rename from 17beta3-master/bookworm/update-postgis.sh rename to 17rc1-master/bookworm/update-postgis.sh diff --git a/17beta3-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile similarity index 99% rename from 17beta3-recent/bookworm/Dockerfile rename to 17rc1-recent/bookworm/Dockerfile index ac94c6805..9d8b0b331 100644 --- a/17beta3-recent/bookworm/Dockerfile +++ b/17rc1-recent/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:17beta3-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -434,7 +434,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17beta3-recent spatial database extension with PostgreSQL 17beta3 bookworm" \ + org.opencontainers.image.description="PostGIS - 17rc1-recent spatial database extension with PostgreSQL 17rc1 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17beta3-recent/bookworm/initdb-postgis.sh b/17rc1-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 17beta3-recent/bookworm/initdb-postgis.sh rename to 17rc1-recent/bookworm/initdb-postgis.sh diff --git a/17rc1-recent/bookworm/tags b/17rc1-recent/bookworm/tags new file mode 100644 index 000000000..0cd13c412 --- /dev/null +++ b/17rc1-recent/bookworm/tags @@ -0,0 +1 @@ +17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent diff --git a/17beta3-recent/bookworm/update-postgis.sh b/17rc1-recent/bookworm/update-postgis.sh similarity index 100% rename from 17beta3-recent/bookworm/update-postgis.sh rename to 17rc1-recent/bookworm/update-postgis.sh diff --git a/README.md b/README.md index 75617f395..5dcf6b041 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-06) +## Versions (2024-09-07) We provide multi-platform image support for the following architectures: @@ -183,9 +183,9 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine3.20), [`17beta3-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4.3-alpine3.20), [`17beta3-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17beta3 | 3.4.3 | -| [`17beta3-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master-bookworm), [`17beta3-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17beta3-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-bookworm), [`17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17beta3-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17beta3-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17beta3-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17beta3 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17rc1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine3.20), [`17rc1-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4.3-alpine3.20), [`17rc1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.4.3 | +| [`17rc1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master-bookworm), [`17rc1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index a05700d21..24de2b5f8 100755 --- a/manifest.sh +++ b/manifest.sh @@ -610,62 +610,62 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:recent \ --target ${dockername}:recent || true -# ----- 17beta3-3.4-alpine3.20 ----- +# ----- 17rc1-3.4-alpine3.20 ----- -echo "manifest: ${dockername}:17beta3-3.4-alpine3.20" +echo "manifest: ${dockername}:17rc1-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine3.20 \ - --target ${dockername}:17beta3-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine3.20 \ + --target ${dockername}:17rc1-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17beta3-3.4.3-alpine3.20" +echo "manifest: ${dockername}:17rc1-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4.3-alpine3.20 \ - --target ${dockername}:17beta3-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17rc1-3.4.3-alpine3.20 \ + --target ${dockername}:17rc1-3.4.3-alpine3.20 || true -echo "manifest: ${dockername}:17beta3-3.4-alpine" +echo "manifest: ${dockername}:17rc1-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-3.4-alpine \ - --target ${dockername}:17beta3-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine \ + --target ${dockername}:17rc1-3.4-alpine || true -# ----- 17beta3-master-bookworm ----- +# ----- 17rc1-master-bookworm ----- -echo "manifest: ${dockername}:17beta3-master-bookworm" +echo "manifest: ${dockername}:17rc1-master-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-master-bookworm \ - --target ${dockername}:17beta3-master-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-master-bookworm \ + --target ${dockername}:17rc1-master-bookworm || true -echo "manifest: ${dockername}:17beta3-master" +echo "manifest: ${dockername}:17rc1-master" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-master \ - --target ${dockername}:17beta3-master || true + --template ${dockername}-ARCHVARIANT:17rc1-master \ + --target ${dockername}:17rc1-master || true -# ----- 17beta3-recent-bookworm ----- +# ----- 17rc1-recent-bookworm ----- -echo "manifest: ${dockername}:17beta3-recent-bookworm" +echo "manifest: ${dockername}:17rc1-recent-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-bookworm \ - --target ${dockername}:17beta3-recent-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-recent-bookworm \ + --target ${dockername}:17rc1-recent-bookworm || true -echo "manifest: ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true -echo "manifest: ${dockername}:17beta3-recent" +echo "manifest: ${dockername}:17rc1-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17beta3-recent \ - --target ${dockername}:17beta3-recent || true + --template ${dockername}-ARCHVARIANT:17rc1-recent \ + --target ${dockername}:17rc1-recent || true diff --git a/versions.json b/versions.json index 6a53756a4..d16fc62d8 100644 --- a/versions.json +++ b/versions.json @@ -326,7 +326,7 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "3.12", + "GEOS_CHECKOUT": "main", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } @@ -474,7 +474,7 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "3.12", + "GEOS_CHECKOUT": "main", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } @@ -505,29 +505,29 @@ "BOOST_VERSION": "1.74.0" } }, - "17beta3-3.4": { + "17rc1-3.4": { "alpine3.20": { - "tags": "17beta3-3.4-alpine3.20 17beta3-3.4.3-alpine3.20 17beta3-3.4-alpine", + "tags": "17rc1-3.4-alpine3.20 17rc1-3.4.3-alpine3.20 17rc1-3.4-alpine", "readme_group": "test", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17beta3", - "PG_DOCKER": "17beta3", + "PG_MAJOR": "17rc1", + "PG_DOCKER": "17rc1", "POSTGIS_VERSION": "3.4.3", "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", "POSTGIS_CHECKOUT": "tags/3.4.3", "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, - "17beta3-master": { + "17rc1-master": { "bookworm": { - "tags": "17beta3-master-bookworm 17beta3-master", + "tags": "17rc1-master-bookworm 17rc1-master", "postgis": "master", "readme_group": "test", - "PG_MAJOR": "17beta3", - "PG_DOCKER": "17beta3", + "PG_MAJOR": "17rc1", + "PG_DOCKER": "17rc1", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", @@ -542,18 +542,18 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "master", "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "3.12", + "GEOS_CHECKOUT": "main", "GEOS_CHECKOUT_SHA1": "nocheck", "BOOST_VERSION": "1.74.0" } }, - "17beta3-recent": { + "17rc1-recent": { "bookworm": { - "tags": "17beta3-recent-bookworm 17beta3-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17beta3-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17beta3-recent", + "tags": "17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent", "postgis": "recent", "readme_group": "test", - "PG_MAJOR": "17beta3", - "PG_DOCKER": "17beta3", + "PG_MAJOR": "17rc1", + "PG_DOCKER": "17rc1", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", diff --git a/versions.sh b/versions.sh index 99340ee27..1c5b332d9 100755 --- a/versions.sh +++ b/versions.sh @@ -25,19 +25,17 @@ alpine_latest="alpine3.20" postgis_latest="3.4" postgres_latest="16" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="11 12 13 14 15 16 17beta3" +postgres_versions="11 12 13 14 15 16 17rc1" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used MASTER_BRANCH_MODE="flexible" POSTGIS_BRANCH="master" -#GEOS_BRANCH="main" -GEOS_BRANCH="3.12" +GEOS_BRANCH="main" GDAL_BRANCH="master" PROJ_BRANCH="master" SFCGAL_BRANCH="master" -#CGAL_BRANCH="5.6.x-branch" CGAL_BRANCH="master" # locked: extra locking versions for dependencies @@ -724,6 +722,7 @@ for version in "${versions[@]}"; do postgisDockerTag="${postgisLastDockerTags[$postgisVersion]}" + echo "postgresVersion=${postgresVersion}" mainTags="${postgresLastMainTags[$postgresVersion]}-${postgisLastDockerTags[$postgisVersion]}" if [[ ${mainTags} =~ [a-zA-Z] ]]; then readme_group="test" From ffafc96adc5ca26ecf7a9526dd2ff6abdb57cc43 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 9 Sep 2024 20:00:07 +0000 Subject: [PATCH 111/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 110e120ef..47601f1f8 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fabd97bd76361051b91c0e772eb819a45f3fd095 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index d90d57990..3fdf33e40 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.0.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 5dcf6b041..05bf63823 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-07) +## Versions (2024-09-09) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index d16fc62d8..9fc10cbfa 100644 --- a/versions.json +++ b/versions.json @@ -297,8 +297,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.16.1", "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", - "DUCKDB_CHECKOUT": "tags/v1.0.0", - "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", + "DUCKDB_CHECKOUT": "tags/v1.1.0", + "DUCKDB_CHECKOUT_SHA1": "fa5c2fe15f3da5f32397b009196c0895fce60820", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", "POSTGIS_MAJOR": "3", @@ -445,8 +445,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.16.1", "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", - "DUCKDB_CHECKOUT": "tags/v1.0.0", - "DUCKDB_CHECKOUT_SHA1": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", + "DUCKDB_CHECKOUT": "tags/v1.1.0", + "DUCKDB_CHECKOUT_SHA1": "fa5c2fe15f3da5f32397b009196c0895fce60820", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From b9595389639cd5949ee754324461bd23b0a6fc4d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 15 Sep 2024 12:31:37 +0000 Subject: [PATCH 112/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20PROJ:?= =?UTF-8?q?9.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-recent/bookworm/Dockerfile | 4 ++-- 15-recent/bookworm/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17rc1-recent/bookworm/Dockerfile | 4 ++-- 17rc1-recent/bookworm/tags | 2 +- README.md | 8 +++---- manifest.sh | 36 ++++++++++++++++---------------- versions.json | 18 ++++++++-------- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index e1d8269bb..0aba1780a 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab +ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags index 1f82f69d7..c7d537bec 100644 --- a/15-recent/bookworm/tags +++ b/15-recent/bookworm/tags @@ -1 +1 @@ -15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent +15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index dca3e2255..e4b55fe76 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab +ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index bc675f1ca..c868e5c2c 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile index 9d8b0b331..50a9c80ac 100644 --- a/17rc1-recent/bookworm/Dockerfile +++ b/17rc1-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.4.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=875a485fa5ef435c57f7682f904dd31ca92253ab +ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c diff --git a/17rc1-recent/bookworm/tags b/17rc1-recent/bookworm/tags index 0cd13c412..9ec93eee0 100644 --- a/17rc1-recent/bookworm/tags +++ b/17rc1-recent/bookworm/tags @@ -1 +1 @@ -17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent +17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent diff --git a/README.md b/README.md index 05bf63823..eadc8e852 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-09) +## Versions (2024-09-15) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -185,7 +185,7 @@ Please note that the included package list is subject to change as we continue t | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17rc1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine3.20), [`17rc1-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4.3-alpine3.20), [`17rc1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.4.3 | | [`17rc1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master-bookworm), [`17rc1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.4.1, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ## 🚀Usage diff --git a/manifest.sh b/manifest.sh index 24de2b5f8..1bcd1fb7e 100755 --- a/manifest.sh +++ b/manifest.sh @@ -420,17 +420,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ --target ${dockername}:15-recent-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:15-recent" manifest-tool push from-args \ @@ -586,17 +586,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -652,17 +652,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17rc1-recent-bookworm \ --target ${dockername}:17rc1-recent-bookworm || true -echo "manifest: ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ + --target ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ + --target ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:17rc1-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 9fc10cbfa..99ed3cf55 100644 --- a/versions.json +++ b/versions.json @@ -333,7 +333,7 @@ }, "15-recent": { "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", + "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "15", @@ -343,8 +343,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.3", "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", - "PROJ_CHECKOUT": "tags/9.4.1", - "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", + "PROJ_CHECKOUT": "tags/9.5.0", + "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", @@ -481,7 +481,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -491,8 +491,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.3", "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", - "PROJ_CHECKOUT": "tags/9.4.1", - "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", + "PROJ_CHECKOUT": "tags/9.5.0", + "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", @@ -549,7 +549,7 @@ }, "17rc1-recent": { "bookworm": { - "tags": "17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.4.1-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.4-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent", + "tags": "17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent", "postgis": "recent", "readme_group": "test", "PG_MAJOR": "17rc1", @@ -559,8 +559,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.4.3", "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", - "PROJ_CHECKOUT": "tags/9.4.1", - "PROJ_CHECKOUT_SHA1": "875a485fa5ef435c57f7682f904dd31ca92253ab", + "PROJ_CHECKOUT": "tags/9.5.0", + "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.9.2", "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", From 153719ee417f2b24d1ddf328f2210b42d7a13558 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 17 Sep 2024 18:53:03 +0200 Subject: [PATCH 113/167] add postgis 3.5.0beta1 images --- .circleci/config.yml | 14 + .coderabbit.yaml | 36 + .github/workflows/main.yml | 14 + 12-3.5/alpine3.19/Dockerfile | 140 ++++ 12-3.5/alpine3.19/initdb-postgis.sh | 25 + 12-3.5/alpine3.19/tags | 1 + 12-3.5/alpine3.19/update-postgis.sh | 28 + 12-3.5/alpine3.20/Dockerfile | 140 ++++ 12-3.5/alpine3.20/initdb-postgis.sh | 25 + 12-3.5/alpine3.20/tags | 1 + 12-3.5/alpine3.20/update-postgis.sh | 28 + 13-3.5/alpine3.19/Dockerfile | 140 ++++ 13-3.5/alpine3.19/initdb-postgis.sh | 25 + 13-3.5/alpine3.19/tags | 1 + 13-3.5/alpine3.19/update-postgis.sh | 28 + 13-3.5/alpine3.20/Dockerfile | 140 ++++ 13-3.5/alpine3.20/initdb-postgis.sh | 25 + 13-3.5/alpine3.20/tags | 1 + 13-3.5/alpine3.20/update-postgis.sh | 28 + 14-3.5/alpine3.19/Dockerfile | 140 ++++ 14-3.5/alpine3.19/initdb-postgis.sh | 25 + 14-3.5/alpine3.19/tags | 1 + 14-3.5/alpine3.19/update-postgis.sh | 28 + 14-3.5/alpine3.20/Dockerfile | 140 ++++ 14-3.5/alpine3.20/initdb-postgis.sh | 25 + 14-3.5/alpine3.20/tags | 1 + 14-3.5/alpine3.20/update-postgis.sh | 28 + 15-3.5/alpine3.19/Dockerfile | 140 ++++ 15-3.5/alpine3.19/initdb-postgis.sh | 25 + 15-3.5/alpine3.19/tags | 1 + 15-3.5/alpine3.19/update-postgis.sh | 28 + 15-3.5/alpine3.20/Dockerfile | 140 ++++ 15-3.5/alpine3.20/initdb-postgis.sh | 25 + 15-3.5/alpine3.20/tags | 1 + 15-3.5/alpine3.20/update-postgis.sh | 28 + 16-3.5/alpine3.19/Dockerfile | 140 ++++ 16-3.5/alpine3.19/initdb-postgis.sh | 25 + 16-3.5/alpine3.19/tags | 1 + 16-3.5/alpine3.19/update-postgis.sh | 28 + 16-3.5/alpine3.20/Dockerfile | 140 ++++ 16-3.5/alpine3.20/initdb-postgis.sh | 25 + 16-3.5/alpine3.20/tags | 1 + 16-3.5/alpine3.20/update-postgis.sh | 28 + 16-l3.5.0beta1/bookworm/Dockerfile | 726 +++++++++++++++++++ 16-l3.5.0beta1/bookworm/initdb-postgis.sh | 25 + 16-l3.5.0beta1/bookworm/tags | 1 + 16-l3.5.0beta1/bookworm/update-postgis.sh | 28 + 17rc1-3.5/alpine3.19/Dockerfile | 140 ++++ 17rc1-3.5/alpine3.19/initdb-postgis.sh | 25 + 17rc1-3.5/alpine3.19/tags | 1 + 17rc1-3.5/alpine3.19/update-postgis.sh | 28 + 17rc1-3.5/alpine3.20/Dockerfile | 140 ++++ 17rc1-3.5/alpine3.20/initdb-postgis.sh | 25 + 17rc1-3.5/alpine3.20/tags | 1 + 17rc1-3.5/alpine3.20/update-postgis.sh | 28 + 17rc1-l3.5.0beta1/bookworm/Dockerfile | 726 +++++++++++++++++++ 17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh | 25 + 17rc1-l3.5.0beta1/bookworm/tags | 1 + 17rc1-l3.5.0beta1/bookworm/update-postgis.sh | 28 + README.md | 16 +- locked.yml | 58 +- manifest.sh | 160 ++++ versions.json | 234 ++++++ 63 files changed, 4418 insertions(+), 2 deletions(-) create mode 100644 .coderabbit.yaml create mode 100644 12-3.5/alpine3.19/Dockerfile create mode 100644 12-3.5/alpine3.19/initdb-postgis.sh create mode 100644 12-3.5/alpine3.19/tags create mode 100755 12-3.5/alpine3.19/update-postgis.sh create mode 100644 12-3.5/alpine3.20/Dockerfile create mode 100644 12-3.5/alpine3.20/initdb-postgis.sh create mode 100644 12-3.5/alpine3.20/tags create mode 100755 12-3.5/alpine3.20/update-postgis.sh create mode 100644 13-3.5/alpine3.19/Dockerfile create mode 100644 13-3.5/alpine3.19/initdb-postgis.sh create mode 100644 13-3.5/alpine3.19/tags create mode 100755 13-3.5/alpine3.19/update-postgis.sh create mode 100644 13-3.5/alpine3.20/Dockerfile create mode 100644 13-3.5/alpine3.20/initdb-postgis.sh create mode 100644 13-3.5/alpine3.20/tags create mode 100755 13-3.5/alpine3.20/update-postgis.sh create mode 100644 14-3.5/alpine3.19/Dockerfile create mode 100644 14-3.5/alpine3.19/initdb-postgis.sh create mode 100644 14-3.5/alpine3.19/tags create mode 100755 14-3.5/alpine3.19/update-postgis.sh create mode 100644 14-3.5/alpine3.20/Dockerfile create mode 100644 14-3.5/alpine3.20/initdb-postgis.sh create mode 100644 14-3.5/alpine3.20/tags create mode 100755 14-3.5/alpine3.20/update-postgis.sh create mode 100644 15-3.5/alpine3.19/Dockerfile create mode 100644 15-3.5/alpine3.19/initdb-postgis.sh create mode 100644 15-3.5/alpine3.19/tags create mode 100755 15-3.5/alpine3.19/update-postgis.sh create mode 100644 15-3.5/alpine3.20/Dockerfile create mode 100644 15-3.5/alpine3.20/initdb-postgis.sh create mode 100644 15-3.5/alpine3.20/tags create mode 100755 15-3.5/alpine3.20/update-postgis.sh create mode 100644 16-3.5/alpine3.19/Dockerfile create mode 100644 16-3.5/alpine3.19/initdb-postgis.sh create mode 100644 16-3.5/alpine3.19/tags create mode 100755 16-3.5/alpine3.19/update-postgis.sh create mode 100644 16-3.5/alpine3.20/Dockerfile create mode 100644 16-3.5/alpine3.20/initdb-postgis.sh create mode 100644 16-3.5/alpine3.20/tags create mode 100755 16-3.5/alpine3.20/update-postgis.sh create mode 100644 16-l3.5.0beta1/bookworm/Dockerfile create mode 100644 16-l3.5.0beta1/bookworm/initdb-postgis.sh create mode 100644 16-l3.5.0beta1/bookworm/tags create mode 100755 16-l3.5.0beta1/bookworm/update-postgis.sh create mode 100644 17rc1-3.5/alpine3.19/Dockerfile create mode 100644 17rc1-3.5/alpine3.19/initdb-postgis.sh create mode 100644 17rc1-3.5/alpine3.19/tags create mode 100755 17rc1-3.5/alpine3.19/update-postgis.sh create mode 100644 17rc1-3.5/alpine3.20/Dockerfile create mode 100644 17rc1-3.5/alpine3.20/initdb-postgis.sh create mode 100644 17rc1-3.5/alpine3.20/tags create mode 100755 17rc1-3.5/alpine3.20/update-postgis.sh create mode 100644 17rc1-l3.5.0beta1/bookworm/Dockerfile create mode 100644 17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh create mode 100644 17rc1-l3.5.0beta1/bookworm/tags create mode 100755 17rc1-l3.5.0beta1/bookworm/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index c72dcec70..359d6f3e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,16 +128,22 @@ workflows: "12-3.4-alpine3.20", "12-3.4-bookworm", "12-3.4-bullseye", + "12-3.5-alpine3.19", + "12-3.5-alpine3.20", "13-3.3-alpine3.20", "13-3.4-alpine3.19", "13-3.4-alpine3.20", "13-3.4-bookworm", "13-3.4-bullseye", + "13-3.5-alpine3.19", + "13-3.5-alpine3.20", "14-3.3-alpine3.20", "14-3.4-alpine3.19", "14-3.4-alpine3.20", "14-3.4-bookworm", "14-3.4-bullseye", + "14-3.5-alpine3.19", + "14-3.5-alpine3.20", "14-l3.1.9gcp-bookworm", "15-3.3-alpine3.20", "15-3.4-alpine3.19", @@ -145,6 +151,8 @@ workflows: # --skip-- "15-3.4-bookworm", --> generated with the related bundle job! "15-3.4-bullseye", "15-3.4-bundle0-bookworm", + "15-3.5-alpine3.19", + "15-3.5-alpine3.20", "15-master-bookworm", "15-recent-bookworm", "16-3.3-alpine3.20", @@ -153,9 +161,15 @@ workflows: # --skip-- "16-3.4-bookworm", --> generated with the related bundle job! "16-3.4-bullseye", "16-3.4-bundle0-bookworm", + "16-3.5-alpine3.19", + "16-3.5-alpine3.20", + "16-l3.5.0beta1-bookworm", "16-master-bookworm", "16-recent-bookworm", "17rc1-3.4-alpine3.20", + "17rc1-3.5-alpine3.19", + "17rc1-3.5-alpine3.20", + "17rc1-l3.5.0beta1-bookworm", "17rc1-master-bookworm", "17rc1-recent-bookworm", #circleci-targets-end diff --git a/.coderabbit.yaml b/.coderabbit.yaml new file mode 100644 index 000000000..b5eca3fed --- /dev/null +++ b/.coderabbit.yaml @@ -0,0 +1,36 @@ +# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json +# see - https://docs.coderabbit.ai/configure-coderabbit/ + +language: "en-US" + +early_access: true + +# we(docker-postgis) always need a human to approve (and merge), we don't use this, +reviews: + profile: "chill" + request_changes_workflow: false + high_level_summary: false + poem: false + review_status: false + collapse_walkthrough: true + auto_review: + enabled: false + drafts: false + +# chat is allowed +chat: + auto_reply: true + + +# https://docs.coderabbit.ai/guides/commands +# +# The following commands are available (invoked as PR comments): +# @coderabbitai pause : to pause the reviews on a PR. +# @coderabbitai resume : to resume the paused reviews. +# @coderabbitai review : to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. +# @coderabbitai full review : to do a full review from scratch and review all the files again. +# @coderabbitai summary : to regenerate the summary of the PR. +# @coderabbitai resolve : resolve all the CodeRabbit review comments. +# @coderabbitai configuration : to show the current CodeRabbit configuration for the repository. +# @coderabbitai help : to get help. + diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 041deb43b..74a83c42b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,16 +29,22 @@ jobs: - { version: "12-3.4", variant: "alpine3.20" } - { version: "12-3.4", variant: "bookworm" } - { version: "12-3.4", variant: "bullseye" } + - { version: "12-3.5", variant: "alpine3.19" } + - { version: "12-3.5", variant: "alpine3.20" } - { version: "13-3.3", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.19" } - { version: "13-3.4", variant: "alpine3.20" } - { version: "13-3.4", variant: "bookworm" } - { version: "13-3.4", variant: "bullseye" } + - { version: "13-3.5", variant: "alpine3.19" } + - { version: "13-3.5", variant: "alpine3.20" } - { version: "14-3.3", variant: "alpine3.20" } - { version: "14-3.4", variant: "alpine3.19" } - { version: "14-3.4", variant: "alpine3.20" } - { version: "14-3.4", variant: "bookworm" } - { version: "14-3.4", variant: "bullseye" } + - { version: "14-3.5", variant: "alpine3.19" } + - { version: "14-3.5", variant: "alpine3.20" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - { version: "15-3.3", variant: "alpine3.20" } - { version: "15-3.4", variant: "alpine3.19" } @@ -46,6 +52,8 @@ jobs: # --skip-- - { version: "15-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "15-3.4", variant: "bullseye" } - { version: "15-3.4-bundle0", variant: "bookworm" } + - { version: "15-3.5", variant: "alpine3.19" } + - { version: "15-3.5", variant: "alpine3.20" } - { version: "15-master", variant: "bookworm" } - { version: "15-recent", variant: "bookworm" } - { version: "16-3.3", variant: "alpine3.20" } @@ -54,9 +62,15 @@ jobs: # --skip-- - { version: "16-3.4", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.4", variant: "bullseye" } - { version: "16-3.4-bundle0", variant: "bookworm" } + - { version: "16-3.5", variant: "alpine3.19" } + - { version: "16-3.5", variant: "alpine3.20" } + - { version: "16-l3.5.0beta1", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17rc1-3.4", variant: "alpine3.20" } + - { version: "17rc1-3.5", variant: "alpine3.19" } + - { version: "17rc1-3.5", variant: "alpine3.20" } + - { version: "17rc1-l3.5.0beta1", variant: "bookworm" } - { version: "17rc1-master", variant: "bookworm" } - { version: "17rc1-recent", variant: "bookworm" } #matrix-include-end diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..e2fe3752e --- /dev/null +++ b/12-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/alpine3.19/initdb-postgis.sh b/12-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.5/alpine3.19/tags b/12-3.5/alpine3.19/tags new file mode 100644 index 000000000..157a63f7d --- /dev/null +++ b/12-3.5/alpine3.19/tags @@ -0,0 +1 @@ +12-3.5.0beta1-alpine3.19 diff --git a/12-3.5/alpine3.19/update-postgis.sh b/12-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..ef216df9e --- /dev/null +++ b/12-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/alpine3.20/initdb-postgis.sh b/12-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags new file mode 100644 index 000000000..5a3e9118b --- /dev/null +++ b/12-3.5/alpine3.20/tags @@ -0,0 +1 @@ +12-3.5.0beta1-alpine3.20 12-3.5.0beta1-alpine diff --git a/12-3.5/alpine3.20/update-postgis.sh b/12-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..974b11df5 --- /dev/null +++ b/13-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.5/alpine3.19/initdb-postgis.sh b/13-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.5/alpine3.19/tags b/13-3.5/alpine3.19/tags new file mode 100644 index 000000000..358ad0784 --- /dev/null +++ b/13-3.5/alpine3.19/tags @@ -0,0 +1 @@ +13-3.5.0beta1-alpine3.19 diff --git a/13-3.5/alpine3.19/update-postgis.sh b/13-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..4425cc661 --- /dev/null +++ b/13-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.5/alpine3.20/initdb-postgis.sh b/13-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags new file mode 100644 index 000000000..4fa4eb1c4 --- /dev/null +++ b/13-3.5/alpine3.20/tags @@ -0,0 +1 @@ +13-3.5.0beta1-alpine3.20 13-3.5.0beta1-alpine diff --git a/13-3.5/alpine3.20/update-postgis.sh b/13-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..49c0cde55 --- /dev/null +++ b/14-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.5/alpine3.19/initdb-postgis.sh b/14-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.5/alpine3.19/tags b/14-3.5/alpine3.19/tags new file mode 100644 index 000000000..0d2c56b85 --- /dev/null +++ b/14-3.5/alpine3.19/tags @@ -0,0 +1 @@ +14-3.5.0beta1-alpine3.19 diff --git a/14-3.5/alpine3.19/update-postgis.sh b/14-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..653f48b5b --- /dev/null +++ b/14-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.5/alpine3.20/initdb-postgis.sh b/14-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags new file mode 100644 index 000000000..ad52250f8 --- /dev/null +++ b/14-3.5/alpine3.20/tags @@ -0,0 +1 @@ +14-3.5.0beta1-alpine3.20 14-3.5.0beta1-alpine diff --git a/14-3.5/alpine3.20/update-postgis.sh b/14-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..2e4ea3b4a --- /dev/null +++ b/15-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.5/alpine3.19/initdb-postgis.sh b/15-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.5/alpine3.19/tags b/15-3.5/alpine3.19/tags new file mode 100644 index 000000000..04ae472b7 --- /dev/null +++ b/15-3.5/alpine3.19/tags @@ -0,0 +1 @@ +15-3.5.0beta1-alpine3.19 diff --git a/15-3.5/alpine3.19/update-postgis.sh b/15-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..b870d1533 --- /dev/null +++ b/15-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.5/alpine3.20/initdb-postgis.sh b/15-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags new file mode 100644 index 000000000..a18baa1f6 --- /dev/null +++ b/15-3.5/alpine3.20/tags @@ -0,0 +1 @@ +15-3.5.0beta1-alpine3.20 15-3.5.0beta1-alpine diff --git a/15-3.5/alpine3.20/update-postgis.sh b/15-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..25b664787 --- /dev/null +++ b/16-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.5/alpine3.19/initdb-postgis.sh b/16-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.5/alpine3.19/tags b/16-3.5/alpine3.19/tags new file mode 100644 index 000000000..50a804363 --- /dev/null +++ b/16-3.5/alpine3.19/tags @@ -0,0 +1 @@ +16-3.5.0beta1-alpine3.19 diff --git a/16-3.5/alpine3.19/update-postgis.sh b/16-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..4d1d9eff2 --- /dev/null +++ b/16-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.5/alpine3.20/initdb-postgis.sh b/16-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags new file mode 100644 index 000000000..b5519b1da --- /dev/null +++ b/16-3.5/alpine3.20/tags @@ -0,0 +1 @@ +16-3.5.0beta1-alpine3.20 16-3.5.0beta1-alpine diff --git a/16-3.5/alpine3.20/update-postgis.sh b/16-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0beta1/bookworm/Dockerfile new file mode 100644 index 000000000..57dfe8290 --- /dev/null +++ b/16-l3.5.0beta1/bookworm/Dockerfile @@ -0,0 +1,726 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:16-bookworm + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab +ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 +ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc +ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 16-l3.5.0beta1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/16-l3.5.0beta1/bookworm/initdb-postgis.sh b/16-l3.5.0beta1/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-l3.5.0beta1/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-l3.5.0beta1/bookworm/tags b/16-l3.5.0beta1/bookworm/tags new file mode 100644 index 000000000..62ef1fb8a --- /dev/null +++ b/16-l3.5.0beta1/bookworm/tags @@ -0,0 +1 @@ +16-l3.5.0beta1-bookworm 16-l3.5.0beta1 diff --git a/16-l3.5.0beta1/bookworm/update-postgis.sh b/16-l3.5.0beta1/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-l3.5.0beta1/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile new file mode 100644 index 000000000..ad8d9a28f --- /dev/null +++ b/17rc1-3.5/alpine3.19/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.19 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.19" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/17rc1-3.5/alpine3.19/initdb-postgis.sh b/17rc1-3.5/alpine3.19/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17rc1-3.5/alpine3.19/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17rc1-3.5/alpine3.19/tags b/17rc1-3.5/alpine3.19/tags new file mode 100644 index 000000000..a082c3c21 --- /dev/null +++ b/17rc1-3.5/alpine3.19/tags @@ -0,0 +1 @@ +17rc1-3.5.0beta1-alpine3.19 diff --git a/17rc1-3.5/alpine3.19/update-postgis.sh b/17rc1-3.5/alpine3.19/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17rc1-3.5/alpine3.19/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile new file mode 100644 index 000000000..e4cb53dc5 --- /dev/null +++ b/17rc1-3.5/alpine3.20/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.20 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.20" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +RUN set -eux \ + && apk add --no-cache --virtual .build-deps \ + \ + ca-certificates \ + gdal-dev \ + geos-dev \ + proj-dev \ + proj-util \ + sfcgal-dev \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgis_last_commit.txt \ +# build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ + \ +# This section is for refreshing the proj data for the regression tests. +# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 +# This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ +# This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + \ + gdal \ + geos \ + proj \ + sfcgal \ + \ + json-c \ + libstdc++ \ + pcre \ + protobuf-c \ + \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl \ + # ca-certificates: for accessing remote raster files + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ +# clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + #&& apk del .fetch-deps \ +# At the end of the build, we print the collected information +# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/17rc1-3.5/alpine3.20/initdb-postgis.sh b/17rc1-3.5/alpine3.20/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17rc1-3.5/alpine3.20/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17rc1-3.5/alpine3.20/tags b/17rc1-3.5/alpine3.20/tags new file mode 100644 index 000000000..059ced091 --- /dev/null +++ b/17rc1-3.5/alpine3.20/tags @@ -0,0 +1 @@ +17rc1-3.5.0beta1-alpine3.20 17rc1-3.5.0beta1-alpine diff --git a/17rc1-3.5/alpine3.20/update-postgis.sh b/17rc1-3.5/alpine3.20/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17rc1-3.5/alpine3.20/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0beta1/bookworm/Dockerfile new file mode 100644 index 000000000..985f14647 --- /dev/null +++ b/17rc1-l3.5.0beta1/bookworm/Dockerfile @@ -0,0 +1,726 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 +ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab +ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 +ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc +ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS - 17rc1-l3.5.0beta1 spatial database extension with PostgreSQL 17rc1 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + && apt-get update \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh b/17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17rc1-l3.5.0beta1/bookworm/tags b/17rc1-l3.5.0beta1/bookworm/tags new file mode 100644 index 000000000..285e3f0b2 --- /dev/null +++ b/17rc1-l3.5.0beta1/bookworm/tags @@ -0,0 +1 @@ +17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1 diff --git a/17rc1-l3.5.0beta1/bookworm/update-postgis.sh b/17rc1-l3.5.0beta1/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17rc1-l3.5.0beta1/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/README.md b/README.md index eadc8e852..b88c22740 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-15) +## Versions (2024-09-17) We provide multi-platform image support for the following architectures: @@ -181,9 +181,23 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`12-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0beta1 | +| [`12-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine3.20), [`12-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0beta1 | +| [`13-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0beta1 | +| [`13-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine3.20), [`13-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0beta1 | +| [`14-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0beta1 | +| [`14-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine3.20), [`14-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0beta1 | +| [`15-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0beta1 | +| [`15-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine3.20), [`15-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0beta1 | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`16-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0beta1 | +| [`16-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine3.20), [`16-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0beta1 | +| [`16-l3.5.0beta1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0beta1-bookworm), [`16-l3.5.0beta1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0beta1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-l3.5.0beta1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | null | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17rc1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine3.20), [`17rc1-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4.3-alpine3.20), [`17rc1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.4.3 | +| [`17rc1-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17rc1 | 3.5.0beta1 | +| [`17rc1-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine3.20), [`17rc1-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.5.0beta1 | +| [`17rc1-l3.5.0beta1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0beta1-bookworm), [`17rc1-l3.5.0beta1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0beta1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-l3.5.0beta1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | null | | [`17rc1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master-bookworm), [`17rc1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | diff --git a/locked.yml b/locked.yml index 5c7ec33e8..0d76f4e84 100644 --- a/locked.yml +++ b/locked.yml @@ -1,8 +1,12 @@ + # unique locked versions we want to build # initialize directory with : touch 14-l3.1.9gcp/bookworm/Dockerfile # this file will be append to 'version.json' +# - edited by manually, for locking/creating special versions. +# - this can be used for testing new debian based posgis versions - created from recent(master) template + '14-l3.1.9gcp': 'bookworm': _comment: "source: ./locked.yml" @@ -27,4 +31,56 @@ SFCGAL_CHECKOUT_SHA1: '61f3b08ade49493b56c6bafa98c7c1f84addbc10' CGAL_CHECKOUT: 'tags/v5.6' CGAL_CHECKOUT_SHA1: 'de4fa0d7d57b5a997012f2804161386ff4bc0d0f' - BOOST_VERSION: '1.74.0' \ No newline at end of file + BOOST_VERSION: '1.74.0' + +'16-l3.5.0beta1': + 'bookworm': + _comment: "source: ./locked.yml" + arch: 'amd64 arm64' + BOOST_VERSION: '1.74.0' + CGAL_CHECKOUT_SHA1: '188e51bad36ffc30e49dbabda29620b71a84664c' + CGAL_CHECKOUT: 'tags/v5.6.1' + GDAL_BUILD: 'with_extra' + GDAL_CHECKOUT_SHA1: '3aae5b4cf30c958ab339157b4f8115922e2f2562' + GDAL_CHECKOUT: 'tags/v3.9.2' + GEOS_CHECKOUT_SHA1: 'd7957246c588aa9c690efe67924fd70e741a06ab' + GEOS_CHECKOUT: 'tags/3.13.0' + initfile: 'initdb-postgis.sh' + PG_DOCKER: '16' + PG_MAJOR: '16' + POSTGIS_CHECKOUT_SHA1: '880fca31f541369d246400f9d9268a793c7466dd' + POSTGIS_CHECKOUT: 'tags/3.5.0beta1' + postgis: 'l3.5.0beta1' + PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' + PROJ_CHECKOUT: 'tags/9.5.0' + readme_group: 'test' + SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' + SFCGAL_CHECKOUT: 'tags/v1.5.2' + tags: '16-l3.5.0beta1-bookworm 16-l3.5.0beta1' + template: 'Dockerfile.master.template' + +'17rc1-l3.5.0beta1': + 'bookworm': + _comment: "source: ./locked.yml" + arch: 'amd64 arm64' + BOOST_VERSION: '1.74.0' + CGAL_CHECKOUT_SHA1: '188e51bad36ffc30e49dbabda29620b71a84664c' + CGAL_CHECKOUT: 'tags/v5.6.1' + GDAL_BUILD: 'with_extra' + GDAL_CHECKOUT_SHA1: '3aae5b4cf30c958ab339157b4f8115922e2f2562' + GDAL_CHECKOUT: 'tags/v3.9.2' + GEOS_CHECKOUT_SHA1: 'd7957246c588aa9c690efe67924fd70e741a06ab' + GEOS_CHECKOUT: 'tags/3.13.0' + initfile: 'initdb-postgis.sh' + PG_DOCKER: '17rc1' + PG_MAJOR: '17rc1' + POSTGIS_CHECKOUT_SHA1: '880fca31f541369d246400f9d9268a793c7466dd' + POSTGIS_CHECKOUT: 'tags/3.5.0beta1' + postgis: 'l3.5.0beta1' + PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' + PROJ_CHECKOUT: 'tags/9.5.0' + readme_group: 'test' + SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' + SFCGAL_CHECKOUT: 'tags/v1.5.2' + tags: '17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1' + template: 'Dockerfile.master.template' diff --git a/manifest.sh b/manifest.sh index 1bcd1fb7e..8eff0748f 100755 --- a/manifest.sh +++ b/manifest.sh @@ -100,6 +100,28 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.2-bullseye \ --target ${dockername}:12-3.4.2-bullseye || true +# ----- 12-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:12-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine3.19 \ + --target ${dockername}:12-3.5.0beta1-alpine3.19 || true + +# ----- 12-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:12-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine3.20 \ + --target ${dockername}:12-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:12-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine \ + --target ${dockername}:12-3.5.0beta1-alpine || true + # ----- 13-3.3-alpine3.20 ----- echo "manifest: ${dockername}:13-3.3-alpine3.20" @@ -188,6 +210,28 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.2-bullseye \ --target ${dockername}:13-3.4.2-bullseye || true +# ----- 13-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:13-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine3.19 \ + --target ${dockername}:13-3.5.0beta1-alpine3.19 || true + +# ----- 13-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:13-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine3.20 \ + --target ${dockername}:13-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:13-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine \ + --target ${dockername}:13-3.5.0beta1-alpine || true + # ----- 14-3.3-alpine3.20 ----- echo "manifest: ${dockername}:14-3.3-alpine3.20" @@ -276,6 +320,28 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.2-bullseye \ --target ${dockername}:14-3.4.2-bullseye || true +# ----- 14-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:14-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine3.19 \ + --target ${dockername}:14-3.5.0beta1-alpine3.19 || true + +# ----- 14-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:14-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine3.20 \ + --target ${dockername}:14-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:14-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine \ + --target ${dockername}:14-3.5.0beta1-alpine || true + # ----- 14-l3.1.9gcp-bookworm ----- echo "manifest: ${dockername}:14-l3.1.9gcp-bookworm" @@ -398,6 +464,28 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ --target ${dockername}:15-3.4-bundle0 || true +# ----- 15-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:15-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine3.19 \ + --target ${dockername}:15-3.5.0beta1-alpine3.19 || true + +# ----- 15-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:15-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine3.20 \ + --target ${dockername}:15-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:15-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine \ + --target ${dockername}:15-3.5.0beta1-alpine || true + # ----- 15-master-bookworm ----- echo "manifest: ${dockername}:15-master-bookworm" @@ -564,6 +652,42 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:bundle0 \ --target ${dockername}:bundle0 || true +# ----- 16-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:16-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine3.19 \ + --target ${dockername}:16-3.5.0beta1-alpine3.19 || true + +# ----- 16-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:16-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine3.20 \ + --target ${dockername}:16-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:16-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine \ + --target ${dockername}:16-3.5.0beta1-alpine || true + +# ----- 16-l3.5.0beta1-bookworm ----- + +echo "manifest: ${dockername}:16-l3.5.0beta1-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-l3.5.0beta1-bookworm \ + --target ${dockername}:16-l3.5.0beta1-bookworm || true + +echo "manifest: ${dockername}:16-l3.5.0beta1" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-l3.5.0beta1 \ + --target ${dockername}:16-l3.5.0beta1 || true + # ----- 16-master-bookworm ----- echo "manifest: ${dockername}:16-master-bookworm" @@ -630,6 +754,42 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine \ --target ${dockername}:17rc1-3.4-alpine || true +# ----- 17rc1-3.5-alpine3.19 ----- + +echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine3.19 \ + --target ${dockername}:17rc1-3.5.0beta1-alpine3.19 || true + +# ----- 17rc1-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine3.20 \ + --target ${dockername}:17rc1-3.5.0beta1-alpine3.20 || true + +echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine \ + --target ${dockername}:17rc1-3.5.0beta1-alpine || true + +# ----- 17rc1-l3.5.0beta1-bookworm ----- + +echo "manifest: ${dockername}:17rc1-l3.5.0beta1-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0beta1-bookworm \ + --target ${dockername}:17rc1-l3.5.0beta1-bookworm || true + +echo "manifest: ${dockername}:17rc1-l3.5.0beta1" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0beta1 \ + --target ${dockername}:17rc1-l3.5.0beta1 || true + # ----- 17rc1-master-bookworm ----- echo "manifest: ${dockername}:17rc1-master-bookworm" diff --git a/versions.json b/versions.json index 99ed3cf55..6783e9b47 100644 --- a/versions.json +++ b/versions.json @@ -69,6 +69,36 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, + "12-3.5": { + "alpine3.19": { + "tags": "12-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "12-3.5.0beta1-alpine3.20 12-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "13-3.3": { "alpine3.20": { "tags": "13-3.3-alpine3.20 13-3.3.7-alpine3.20 13-3.3-alpine", @@ -139,6 +169,36 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, + "13-3.5": { + "alpine3.19": { + "tags": "13-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "13-3.5.0beta1-alpine3.20 13-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "14-3.3": { "alpine3.20": { "tags": "14-3.3-alpine3.20 14-3.3.7-alpine3.20 14-3.3-alpine", @@ -209,6 +269,36 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, + "14-3.5": { + "alpine3.19": { + "tags": "14-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "14-3.5.0beta1-alpine3.20 14-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "15-3.3": { "alpine3.20": { "tags": "15-3.3-alpine3.20 15-3.3.7-alpine3.20 15-3.3-alpine", @@ -305,6 +395,36 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } }, + "15-3.5": { + "alpine3.19": { + "tags": "15-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "15-3.5.0beta1-alpine3.20 15-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "15-master": { "bookworm": { "tags": "15-master-bookworm 15-master", @@ -453,6 +573,36 @@ "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" } }, + "16-3.5": { + "alpine3.19": { + "tags": "16-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "16-3.5.0beta1-alpine3.20 16-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "16-master": { "bookworm": { "tags": "16-master-bookworm 16-master", @@ -521,6 +671,36 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, + "17rc1-3.5": { + "alpine3.19": { + "tags": "17rc1-3.5.0beta1-alpine3.19", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "17rc1", + "PG_DOCKER": "17rc1", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + }, + "alpine3.20": { + "tags": "17rc1-3.5.0beta1-alpine3.20 17rc1-3.5.0beta1-alpine", + "readme_group": "test", + "postgis": "3.5.0beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "17rc1", + "PG_DOCKER": "17rc1", + "POSTGIS_VERSION": "3.5.0beta1", + "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + } + }, "17rc1-master": { "bookworm": { "tags": "17rc1-master-bookworm 17rc1-master", @@ -599,5 +779,59 @@ "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" } + }, + "16-l3.5.0beta1": { + "bookworm": { + "_comment": "source: ./locked.yml", + "arch": "amd64 arm64", + "BOOST_VERSION": "1.74.0", + "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", + "CGAL_CHECKOUT": "tags/v5.6.1", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", + "GDAL_CHECKOUT": "tags/v3.9.2", + "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", + "GEOS_CHECKOUT": "tags/3.13.0", + "initfile": "initdb-postgis.sh", + "PG_DOCKER": "16", + "PG_MAJOR": "16", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "postgis": "l3.5.0beta1", + "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", + "PROJ_CHECKOUT": "tags/9.5.0", + "readme_group": "test", + "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", + "SFCGAL_CHECKOUT": "tags/v1.5.2", + "tags": "16-l3.5.0beta1-bookworm 16-l3.5.0beta1", + "template": "Dockerfile.master.template" + } + }, + "17rc1-l3.5.0beta1": { + "bookworm": { + "_comment": "source: ./locked.yml", + "arch": "amd64 arm64", + "BOOST_VERSION": "1.74.0", + "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", + "CGAL_CHECKOUT": "tags/v5.6.1", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", + "GDAL_CHECKOUT": "tags/v3.9.2", + "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", + "GEOS_CHECKOUT": "tags/3.13.0", + "initfile": "initdb-postgis.sh", + "PG_DOCKER": "17rc1", + "PG_MAJOR": "17rc1", + "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd", + "POSTGIS_CHECKOUT": "tags/3.5.0beta1", + "postgis": "l3.5.0beta1", + "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", + "PROJ_CHECKOUT": "tags/9.5.0", + "readme_group": "test", + "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", + "SFCGAL_CHECKOUT": "tags/v1.5.2", + "tags": "17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1", + "template": "Dockerfile.master.template" + } } } From b965da69f6ca987ee7a9388eecf2d42841795f9e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 17 Sep 2024 20:47:30 +0200 Subject: [PATCH 114/167] limit parallel build jobs --- .circleci/config.yml | 5 ++++- .github/workflows/main.yml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 359d6f3e5..721bd1b98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ version: 2.1 orbs: # https://circleci.com/developer/orbs/orb/circleci/docker - docker: circleci/docker@2.5.0 + docker: circleci/docker@2.7.1 # https://circleci.com/developer/orbs/orb/circleci/python python: circleci/python@2.1.1 # https://circleci.com/developer/orbs/orb/circleci/shellcheck @@ -13,6 +13,9 @@ orbs: jobs: build-arm64: + # We limit this to prevent overloading external servers (e.g., OSGeo, PROJ). + # Note: Include parallel GitHub CI jobs when calculating the total load, as they run simultaneously! + parallelism: 6 machine: image: ubuntu-2204:current resource_class: arm.medium diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 74a83c42b..5ff4fe811 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,9 @@ defaults: jobs: make-docker-images: strategy: + # We limit this to prevent overloading external servers (e.g., OSGeo, PROJ). + # Note: Include parallel Circle CI jobs when calculating the total load, as they run simultaneously! + max-parallel: 6 matrix: include: # From 75ed703118b6d0f4e8a6c4a8c18ed1dcf67a667d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 17 Sep 2024 21:23:39 +0200 Subject: [PATCH 115/167] fix some descriptions ... --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b88c22740..6d29ec860 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ Notes: For those new to PostGIS, we recommend the following image versions: -- `imresamu/postgis:16-3.4`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. -- `imresamu/postgis:16-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal +- `imresamu/postgis:16-3.4-bookworm`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. ( debian bookworm based, easy to extend with debian packages ) +- `imresamu/postgis:16-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal. ( debian based, extending is complex ! ) - `imresamu/postgis:16-3.4-bundle0-bookworm`: (experimental) This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. ### 🥇Debian - bookworm (recommended) @@ -65,7 +65,7 @@ For those new to PostGIS, we recommend the following image versions: - This Docker-PostGIS version has a cautious release cycle to guarantee high stability. - By "cautious", we mean it does not always have the latest versions of geos, proj, gdal, and sfcgal packages. - We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. - - In the Debian Bullseye repository, the versions are: geos=3.9, gdal=3.2, proj=7.2, and sfcgal=1.3.9. + - In the Debian Bullseye repository, the versions are: geos=3.11, gdal=3.6, proj=9.1, and sfcgal=1.4. - This version is easy to extend and has matured over time. From 80703b068d986e017ef878c70abbd1909572d970 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 18 Sep 2024 02:27:25 +0200 Subject: [PATCH 116/167] temporary postgis 3.5.0beta1 build -j1 workaround --- 12-3.5/alpine3.19/Dockerfile | 3 ++- 12-3.5/alpine3.20/Dockerfile | 3 ++- 13-3.5/alpine3.19/Dockerfile | 3 ++- 13-3.5/alpine3.20/Dockerfile | 3 ++- 14-3.5/alpine3.19/Dockerfile | 3 ++- 14-3.5/alpine3.20/Dockerfile | 3 ++- 14-l3.1.9gcp/bookworm/Dockerfile | 4 +++- 15-3.5/alpine3.19/Dockerfile | 3 ++- 15-3.5/alpine3.20/Dockerfile | 3 ++- 15-master/bookworm/Dockerfile | 8 ++++++-- 15-recent/bookworm/Dockerfile | 8 ++++++-- 16-3.5/alpine3.19/Dockerfile | 3 ++- 16-3.5/alpine3.20/Dockerfile | 3 ++- 16-l3.5.0beta1/bookworm/Dockerfile | 11 ++++++++--- 16-master/bookworm/Dockerfile | 8 ++++++-- 16-recent/bookworm/Dockerfile | 8 ++++++-- 17rc1-3.5/alpine3.19/Dockerfile | 3 ++- 17rc1-3.5/alpine3.20/Dockerfile | 3 ++- 17rc1-l3.5.0beta1/bookworm/Dockerfile | 11 ++++++++--- 17rc1-master/bookworm/Dockerfile | 8 ++++++-- 17rc1-recent/bookworm/Dockerfile | 8 ++++++-- Dockerfile.alpine.template | 5 +++++ Dockerfile.master.template | 13 +++++++++++-- README.md | 2 +- 24 files changed, 96 insertions(+), 34 deletions(-) diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index e2fe3752e..8d710ac88 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index ef216df9e..c390cf564 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index 974b11df5..742b5e423 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 4425cc661..7eea8d57b 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index 49c0cde55..67c1f8cbb 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index 653f48b5b..e72432192 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 8c085367d..b944bf59e 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 2e4ea3b4a..8d0f80ea2 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index b870d1533..24c0c533f 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 6f530f9b7..95485e036 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 0aba1780a..ab57c7d85 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index 25b664787..bec0dd3a4 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 4d1d9eff2..9a096a978 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0beta1/bookworm/Dockerfile index 57dfe8290..e81996580 100644 --- a/16-l3.5.0beta1/bookworm/Dockerfile +++ b/16-l3.5.0beta1/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end @@ -630,7 +634,8 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index cd9318b19..86aec9961 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e4b55fe76..c9ed960a1 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile index ad8d9a28f..90be58223 100644 --- a/17rc1-3.5/alpine3.19/Dockerfile +++ b/17rc1-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile index e4cb53dc5..01f36a029 100644 --- a/17rc1-3.5/alpine3.20/Dockerfile +++ b/17rc1-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0beta1/bookworm/Dockerfile index 985f14647..35e6184e5 100644 --- a/17rc1-l3.5.0beta1/bookworm/Dockerfile +++ b/17rc1-l3.5.0beta1/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end @@ -630,7 +634,8 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/17rc1-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile index 0a381b66e..0ef1bf56a 100644 --- a/17rc1-master/bookworm/Dockerfile +++ b/17rc1-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile index 50a9c80ac..9a11abc92 100644 --- a/17rc1-recent/bookworm/Dockerfile +++ b/17rc1-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index d24e58eca..734375f0c 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -67,7 +67,12 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ +{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ +{{ ) else ( -}} && make -j$(nproc) \ +{{ ) end -}} && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/Dockerfile.master.template b/Dockerfile.master.template index ab48f18e2..0b2656ed7 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -103,7 +103,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -328,7 +330,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {{ ) else ( -}} # {{ ) end -}} @@ -653,7 +657,12 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ +{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ +{{ ) else ( -}} && make -j$(nproc) \ +{{ ) end -}} && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/README.md b/README.md index 6d29ec860..8e1923796 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-17) +## Versions (2024-09-18) We provide multi-platform image support for the following architectures: From 32f99f5788eed7ded86d521a5aa3d8d4ff14a7c0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 18 Sep 2024 20:46:45 +0200 Subject: [PATCH 117/167] revert 3.5.0beta1 workaround --- Dockerfile.alpine.template | 5 ----- Dockerfile.master.template | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 734375f0c..d24e58eca 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -67,12 +67,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ -{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ -{{ ) else ( -}} && make -j$(nproc) \ -{{ ) end -}} && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 0b2656ed7..7fd3220bd 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -657,12 +657,7 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ -{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ -{{ ) else ( -}} && make -j$(nproc) \ -{{ ) end -}} && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ @@ -753,6 +748,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt From 158c89e9e778cf719f85d48043ebfdc4525aab7f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 18 Sep 2024 20:57:48 +0200 Subject: [PATCH 118/167] arm64 test cases --- .circleci/config.yml | 4 ++-- 12-3.5/alpine3.19/Dockerfile | 3 +-- 12-3.5/alpine3.20/Dockerfile | 3 +-- 13-3.5/alpine3.19/Dockerfile | 3 +-- 13-3.5/alpine3.20/Dockerfile | 3 +-- 14-3.5/alpine3.19/Dockerfile | 3 +-- 14-3.5/alpine3.20/Dockerfile | 3 +-- 14-l3.1.9gcp/bookworm/Dockerfile | 2 +- 15-3.5/alpine3.19/Dockerfile | 3 +-- 15-3.5/alpine3.20/Dockerfile | 3 +-- 15-master/bookworm/Dockerfile | 2 +- 15-recent/bookworm/Dockerfile | 2 +- 16-3.5/alpine3.19/Dockerfile | 3 +-- 16-3.5/alpine3.20/Dockerfile | 3 +-- 16-l3.5.0beta1/bookworm/Dockerfile | 5 ++--- 16-master/bookworm/Dockerfile | 2 +- 16-recent/bookworm/Dockerfile | 2 +- 17rc1-3.5/alpine3.19/Dockerfile | 3 +-- 17rc1-3.5/alpine3.20/Dockerfile | 3 +-- 17rc1-l3.5.0beta1/bookworm/Dockerfile | 5 ++--- 17rc1-master/bookworm/Dockerfile | 2 +- 17rc1-recent/bookworm/Dockerfile | 2 +- 22 files changed, 25 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 721bd1b98..6910b29fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,10 +15,10 @@ jobs: build-arm64: # We limit this to prevent overloading external servers (e.g., OSGeo, PROJ). # Note: Include parallel GitHub CI jobs when calculating the total load, as they run simultaneously! - parallelism: 6 + parallelism: 8 machine: image: ubuntu-2204:current - resource_class: arm.medium + resource_class: arm.xlarge environment: BUILDX_PLATFORMS: linux/arm64v8 DOCKER_BUILDKIT: '1' diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index 8d710ac88..e2fe3752e 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index c390cf564..ef216df9e 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index 742b5e423..974b11df5 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 7eea8d57b..4425cc661 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index 67c1f8cbb..49c0cde55 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index e72432192..653f48b5b 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index b944bf59e..46b4663a7 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -629,6 +629,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 8d0f80ea2..2e4ea3b4a 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index 24c0c533f..b870d1533 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 95485e036..ac8f3d116 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index ab57c7d85..fda6ffb34 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index bec0dd3a4..25b664787 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 9a096a978..4d1d9eff2 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0beta1/bookworm/Dockerfile index e81996580..71c95d365 100644 --- a/16-l3.5.0beta1/bookworm/Dockerfile +++ b/16-l3.5.0beta1/bookworm/Dockerfile @@ -634,8 +634,7 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ @@ -726,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 86aec9961..57973a8b1 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index c9ed960a1..57f9f9d38 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile index 90be58223..ad8d9a28f 100644 --- a/17rc1-3.5/alpine3.19/Dockerfile +++ b/17rc1-3.5/alpine3.19/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile index 01f36a029..e4cb53dc5 100644 --- a/17rc1-3.5/alpine3.20/Dockerfile +++ b/17rc1-3.5/alpine3.20/Dockerfile @@ -72,8 +72,7 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0beta1/bookworm/Dockerfile index 35e6184e5..a15bb83fb 100644 --- a/17rc1-l3.5.0beta1/bookworm/Dockerfile +++ b/17rc1-l3.5.0beta1/bookworm/Dockerfile @@ -634,8 +634,7 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 - && make -j1 \ + && make -j$(nproc) \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ @@ -726,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/17rc1-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile index 0ef1bf56a..528818137 100644 --- a/17rc1-master/bookworm/Dockerfile +++ b/17rc1-master/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile index 9a11abc92..060b6443b 100644 --- a/17rc1-recent/bookworm/Dockerfile +++ b/17rc1-recent/bookworm/Dockerfile @@ -725,6 +725,6 @@ RUN set -eux \ && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ \ # list last commits. - && find /_pgis_*_last_commit.txt -type f -print -exec cat {} \; \ + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ # list postgresql, postgis version && cat _pgis_full_version.txt From fd8bd6a4d80900579b4d9ed5a2fee2e271b153a4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 18 Sep 2024 21:08:07 +0200 Subject: [PATCH 119/167] fix arm circle-ci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6910b29fa..43604edb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: parallelism: 8 machine: image: ubuntu-2204:current - resource_class: arm.xlarge + resource_class: arm.large environment: BUILDX_PLATFORMS: linux/arm64v8 DOCKER_BUILDKIT: '1' From 31df64cf965eb8c1d5c1958e37ff66cdac23eb1f Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 19 Sep 2024 19:42:18 +0200 Subject: [PATCH 120/167] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e1923796..95f1d3130 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-18) +## Versions (2024-09-19) We provide multi-platform image support for the following architectures: From 126fccb81d0d1c05d04ac6029c08e152aada73df Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 23 Sep 2024 16:09:34 +0200 Subject: [PATCH 121/167] update to postgis 3.5.0rc1 --- .circleci/config.yml | 4 +- .github/workflows/main.yml | 4 +- 12-3.5/alpine3.19/Dockerfile | 4 +- 12-3.5/alpine3.19/tags | 2 +- 12-3.5/alpine3.20/Dockerfile | 4 +- 12-3.5/alpine3.20/tags | 2 +- 13-3.5/alpine3.19/Dockerfile | 4 +- 13-3.5/alpine3.19/tags | 2 +- 13-3.5/alpine3.20/Dockerfile | 4 +- 13-3.5/alpine3.20/tags | 2 +- 14-3.5/alpine3.19/Dockerfile | 4 +- 14-3.5/alpine3.19/tags | 2 +- 14-3.5/alpine3.20/Dockerfile | 4 +- 14-3.5/alpine3.20/tags | 2 +- 15-3.5/alpine3.19/Dockerfile | 4 +- 15-3.5/alpine3.19/tags | 2 +- 15-3.5/alpine3.20/Dockerfile | 4 +- 15-3.5/alpine3.20/tags | 2 +- 16-3.5/alpine3.19/Dockerfile | 4 +- 16-3.5/alpine3.19/tags | 2 +- 16-3.5/alpine3.20/Dockerfile | 4 +- 16-3.5/alpine3.20/tags | 2 +- 16-l3.5.0beta1/bookworm/tags | 1 - .../bookworm/Dockerfile | 6 +- .../bookworm/initdb-postgis.sh | 0 16-l3.5.0rc1/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 17rc1-3.5/alpine3.19/Dockerfile | 4 +- 17rc1-3.5/alpine3.19/tags | 2 +- 17rc1-3.5/alpine3.20/Dockerfile | 4 +- 17rc1-3.5/alpine3.20/tags | 2 +- 17rc1-l3.5.0beta1/bookworm/tags | 1 - .../bookworm/Dockerfile | 6 +- .../bookworm/initdb-postgis.sh | 0 17rc1-l3.5.0rc1/bookworm/tags | 1 + .../bookworm/update-postgis.sh | 0 README.md | 30 ++-- locked.yml | 20 +-- manifest.sh | 136 +++++++-------- versions.json | 164 +++++++++--------- 40 files changed, 223 insertions(+), 223 deletions(-) delete mode 100644 16-l3.5.0beta1/bookworm/tags rename {16-l3.5.0beta1 => 16-l3.5.0rc1}/bookworm/Dockerfile (99%) rename {16-l3.5.0beta1 => 16-l3.5.0rc1}/bookworm/initdb-postgis.sh (100%) create mode 100644 16-l3.5.0rc1/bookworm/tags rename {16-l3.5.0beta1 => 16-l3.5.0rc1}/bookworm/update-postgis.sh (100%) delete mode 100644 17rc1-l3.5.0beta1/bookworm/tags rename {17rc1-l3.5.0beta1 => 17rc1-l3.5.0rc1}/bookworm/Dockerfile (99%) rename {17rc1-l3.5.0beta1 => 17rc1-l3.5.0rc1}/bookworm/initdb-postgis.sh (100%) create mode 100644 17rc1-l3.5.0rc1/bookworm/tags rename {17rc1-l3.5.0beta1 => 17rc1-l3.5.0rc1}/bookworm/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 43604edb9..1cab849d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,13 +166,13 @@ workflows: "16-3.4-bundle0-bookworm", "16-3.5-alpine3.19", "16-3.5-alpine3.20", - "16-l3.5.0beta1-bookworm", + "16-l3.5.0rc1-bookworm", "16-master-bookworm", "16-recent-bookworm", "17rc1-3.4-alpine3.20", "17rc1-3.5-alpine3.19", "17rc1-3.5-alpine3.20", - "17rc1-l3.5.0beta1-bookworm", + "17rc1-l3.5.0rc1-bookworm", "17rc1-master-bookworm", "17rc1-recent-bookworm", #circleci-targets-end diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ff4fe811..da233f713 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,13 +67,13 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-3.5", variant: "alpine3.19" } - { version: "16-3.5", variant: "alpine3.20" } - - { version: "16-l3.5.0beta1", variant: "bookworm" } + - { version: "16-l3.5.0rc1", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17rc1-3.4", variant: "alpine3.20" } - { version: "17rc1-3.5", variant: "alpine3.19" } - { version: "17rc1-3.5", variant: "alpine3.20" } - - { version: "17rc1-l3.5.0beta1", variant: "bookworm" } + - { version: "17rc1-l3.5.0rc1", variant: "bookworm" } - { version: "17rc1-master", variant: "bookworm" } - { version: "17rc1-recent", variant: "bookworm" } #matrix-include-end diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index e2fe3752e..fe0242cfc 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.19/tags b/12-3.5/alpine3.19/tags index 157a63f7d..a553ba9d5 100644 --- a/12-3.5/alpine3.19/tags +++ b/12-3.5/alpine3.19/tags @@ -1 +1 @@ -12-3.5.0beta1-alpine3.19 +12-3.5.0rc1-alpine3.19 diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index ef216df9e..43d043882 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags index 5a3e9118b..7e104ef28 100644 --- a/12-3.5/alpine3.20/tags +++ b/12-3.5/alpine3.20/tags @@ -1 +1 @@ -12-3.5.0beta1-alpine3.20 12-3.5.0beta1-alpine +12-3.5.0rc1-alpine3.20 12-3.5.0rc1-alpine diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index 974b11df5..e5e90ba0c 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.19/tags b/13-3.5/alpine3.19/tags index 358ad0784..6ea49c4a3 100644 --- a/13-3.5/alpine3.19/tags +++ b/13-3.5/alpine3.19/tags @@ -1 +1 @@ -13-3.5.0beta1-alpine3.19 +13-3.5.0rc1-alpine3.19 diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 4425cc661..b548e1a4e 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index 4fa4eb1c4..d581587dc 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5.0beta1-alpine3.20 13-3.5.0beta1-alpine +13-3.5.0rc1-alpine3.20 13-3.5.0rc1-alpine diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index 49c0cde55..fabb66ae0 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.19/tags b/14-3.5/alpine3.19/tags index 0d2c56b85..8d27cf16b 100644 --- a/14-3.5/alpine3.19/tags +++ b/14-3.5/alpine3.19/tags @@ -1 +1 @@ -14-3.5.0beta1-alpine3.19 +14-3.5.0rc1-alpine3.19 diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index 653f48b5b..e30b93c02 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index ad52250f8..681addef1 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5.0beta1-alpine3.20 14-3.5.0beta1-alpine +14-3.5.0rc1-alpine3.20 14-3.5.0rc1-alpine diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 2e4ea3b4a..11c10ae67 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.19/tags b/15-3.5/alpine3.19/tags index 04ae472b7..84fcb6711 100644 --- a/15-3.5/alpine3.19/tags +++ b/15-3.5/alpine3.19/tags @@ -1 +1 @@ -15-3.5.0beta1-alpine3.19 +15-3.5.0rc1-alpine3.19 diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index b870d1533..e8a38674f 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index a18baa1f6..a1a6cd67a 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5.0beta1-alpine3.20 15-3.5.0beta1-alpine +15-3.5.0rc1-alpine3.20 15-3.5.0rc1-alpine diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index 25b664787..054c4884e 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.19/tags b/16-3.5/alpine3.19/tags index 50a804363..9a921ab8e 100644 --- a/16-3.5/alpine3.19/tags +++ b/16-3.5/alpine3.19/tags @@ -1 +1 @@ -16-3.5.0beta1-alpine3.19 +16-3.5.0rc1-alpine3.19 diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 4d1d9eff2..83985b874 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index b5519b1da..3bc2c924e 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5.0beta1-alpine3.20 16-3.5.0beta1-alpine +16-3.5.0rc1-alpine3.20 16-3.5.0rc1-alpine diff --git a/16-l3.5.0beta1/bookworm/tags b/16-l3.5.0beta1/bookworm/tags deleted file mode 100644 index 62ef1fb8a..000000000 --- a/16-l3.5.0beta1/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-l3.5.0beta1-bookworm 16-l3.5.0beta1 diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0rc1/bookworm/Dockerfile similarity index 99% rename from 16-l3.5.0beta1/bookworm/Dockerfile rename to 16-l3.5.0rc1/bookworm/Dockerfile index 71c95d365..cf149a3db 100644 --- a/16-l3.5.0beta1/bookworm/Dockerfile +++ b/16-l3.5.0rc1/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 @@ -438,7 +438,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 16-l3.5.0beta1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS - 16-l3.5.0rc1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/16-l3.5.0beta1/bookworm/initdb-postgis.sh b/16-l3.5.0rc1/bookworm/initdb-postgis.sh similarity index 100% rename from 16-l3.5.0beta1/bookworm/initdb-postgis.sh rename to 16-l3.5.0rc1/bookworm/initdb-postgis.sh diff --git a/16-l3.5.0rc1/bookworm/tags b/16-l3.5.0rc1/bookworm/tags new file mode 100644 index 000000000..52f62487d --- /dev/null +++ b/16-l3.5.0rc1/bookworm/tags @@ -0,0 +1 @@ +16-l3.5.0rc1-bookworm 16-l3.5.0rc1 diff --git a/16-l3.5.0beta1/bookworm/update-postgis.sh b/16-l3.5.0rc1/bookworm/update-postgis.sh similarity index 100% rename from 16-l3.5.0beta1/bookworm/update-postgis.sh rename to 16-l3.5.0rc1/bookworm/update-postgis.sh diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile index ad8d9a28f..e2109cc2b 100644 --- a/17rc1-3.5/alpine3.19/Dockerfile +++ b/17rc1-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/17rc1-3.5/alpine3.19/tags b/17rc1-3.5/alpine3.19/tags index a082c3c21..8a24298ac 100644 --- a/17rc1-3.5/alpine3.19/tags +++ b/17rc1-3.5/alpine3.19/tags @@ -1 +1 @@ -17rc1-3.5.0beta1-alpine3.19 +17rc1-3.5.0rc1-alpine3.19 diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile index e4cb53dc5..6c759cd3d 100644 --- a/17rc1-3.5/alpine3.20/Dockerfile +++ b/17rc1-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 FROM ${PGIS1_BASE_IMAGE} diff --git a/17rc1-3.5/alpine3.20/tags b/17rc1-3.5/alpine3.20/tags index 059ced091..9358e8766 100644 --- a/17rc1-3.5/alpine3.20/tags +++ b/17rc1-3.5/alpine3.20/tags @@ -1 +1 @@ -17rc1-3.5.0beta1-alpine3.20 17rc1-3.5.0beta1-alpine +17rc1-3.5.0rc1-alpine3.20 17rc1-3.5.0rc1-alpine diff --git a/17rc1-l3.5.0beta1/bookworm/tags b/17rc1-l3.5.0beta1/bookworm/tags deleted file mode 100644 index 285e3f0b2..000000000 --- a/17rc1-l3.5.0beta1/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1 diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0rc1/bookworm/Dockerfile similarity index 99% rename from 17rc1-l3.5.0beta1/bookworm/Dockerfile rename to 17rc1-l3.5.0rc1/bookworm/Dockerfile index a15bb83fb..d5773b1a1 100644 --- a/17rc1-l3.5.0beta1/bookworm/Dockerfile +++ b/17rc1-l3.5.0rc1/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0beta1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=880fca31f541369d246400f9d9268a793c7466dd +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 @@ -438,7 +438,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17rc1-l3.5.0beta1 spatial database extension with PostgreSQL 17rc1 bookworm" \ + org.opencontainers.image.description="PostGIS - 17rc1-l3.5.0rc1 spatial database extension with PostgreSQL 17rc1 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh b/17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh similarity index 100% rename from 17rc1-l3.5.0beta1/bookworm/initdb-postgis.sh rename to 17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh diff --git a/17rc1-l3.5.0rc1/bookworm/tags b/17rc1-l3.5.0rc1/bookworm/tags new file mode 100644 index 000000000..fb889c36b --- /dev/null +++ b/17rc1-l3.5.0rc1/bookworm/tags @@ -0,0 +1 @@ +17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1 diff --git a/17rc1-l3.5.0beta1/bookworm/update-postgis.sh b/17rc1-l3.5.0rc1/bookworm/update-postgis.sh similarity index 100% rename from 17rc1-l3.5.0beta1/bookworm/update-postgis.sh rename to 17rc1-l3.5.0rc1/bookworm/update-postgis.sh diff --git a/README.md b/README.md index 95f1d3130..1c89549ad 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-19) +## Versions (2024-09-23) We provide multi-platform image support for the following architectures: @@ -181,23 +181,23 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0beta1 | -| [`12-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine3.20), [`12-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0beta1 | -| [`13-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0beta1 | -| [`13-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine3.20), [`13-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0beta1 | -| [`14-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0beta1 | -| [`14-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine3.20), [`14-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0beta1 | -| [`15-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0beta1 | -| [`15-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine3.20), [`15-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0beta1 | +| [`12-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0rc1 | +| [`12-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine3.20), [`12-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0rc1 | +| [`13-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0rc1 | +| [`13-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine3.20), [`13-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0rc1 | +| [`14-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0rc1 | +| [`14-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine3.20), [`14-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0rc1 | +| [`15-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0rc1 | +| [`15-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine3.20), [`15-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0rc1 | | [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`16-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0beta1 | -| [`16-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine3.20), [`16-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0beta1 | -| [`16-l3.5.0beta1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0beta1-bookworm), [`16-l3.5.0beta1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0beta1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-l3.5.0beta1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | null | +| [`16-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0rc1 | +| [`16-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine3.20), [`16-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0rc1 | +| [`16-l3.5.0rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0rc1-bookworm), [`16-l3.5.0rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-l3.5.0rc1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | null | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17rc1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine3.20), [`17rc1-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4.3-alpine3.20), [`17rc1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.4.3 | -| [`17rc1-3.5.0beta1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17rc1 | 3.5.0beta1 | -| [`17rc1-3.5.0beta1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine3.20), [`17rc1-3.5.0beta1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0beta1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.5.0beta1 | -| [`17rc1-l3.5.0beta1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0beta1-bookworm), [`17rc1-l3.5.0beta1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0beta1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-l3.5.0beta1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | null | +| [`17rc1-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17rc1 | 3.5.0rc1 | +| [`17rc1-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine3.20), [`17rc1-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.5.0rc1 | +| [`17rc1-l3.5.0rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0rc1-bookworm), [`17rc1-l3.5.0rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-l3.5.0rc1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | null | | [`17rc1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master-bookworm), [`17rc1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | development: postgis, geos, proj, gdal, cgal, sfcgal | | [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | diff --git a/locked.yml b/locked.yml index 0d76f4e84..b2ca79f9c 100644 --- a/locked.yml +++ b/locked.yml @@ -33,7 +33,7 @@ CGAL_CHECKOUT_SHA1: 'de4fa0d7d57b5a997012f2804161386ff4bc0d0f' BOOST_VERSION: '1.74.0' -'16-l3.5.0beta1': +'16-l3.5.0rc1': 'bookworm': _comment: "source: ./locked.yml" arch: 'amd64 arm64' @@ -48,18 +48,18 @@ initfile: 'initdb-postgis.sh' PG_DOCKER: '16' PG_MAJOR: '16' - POSTGIS_CHECKOUT_SHA1: '880fca31f541369d246400f9d9268a793c7466dd' - POSTGIS_CHECKOUT: 'tags/3.5.0beta1' - postgis: 'l3.5.0beta1' + POSTGIS_CHECKOUT_SHA1: 'df9317741170e86ff8346decdd555b54a0432072' + POSTGIS_CHECKOUT: 'tags/3.5.0rc1' + postgis: 'l3.5.0rc1' PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' PROJ_CHECKOUT: 'tags/9.5.0' readme_group: 'test' SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' SFCGAL_CHECKOUT: 'tags/v1.5.2' - tags: '16-l3.5.0beta1-bookworm 16-l3.5.0beta1' + tags: '16-l3.5.0rc1-bookworm 16-l3.5.0rc1' template: 'Dockerfile.master.template' -'17rc1-l3.5.0beta1': +'17rc1-l3.5.0rc1': 'bookworm': _comment: "source: ./locked.yml" arch: 'amd64 arm64' @@ -74,13 +74,13 @@ initfile: 'initdb-postgis.sh' PG_DOCKER: '17rc1' PG_MAJOR: '17rc1' - POSTGIS_CHECKOUT_SHA1: '880fca31f541369d246400f9d9268a793c7466dd' - POSTGIS_CHECKOUT: 'tags/3.5.0beta1' - postgis: 'l3.5.0beta1' + POSTGIS_CHECKOUT_SHA1: 'df9317741170e86ff8346decdd555b54a0432072' + POSTGIS_CHECKOUT: 'tags/3.5.0rc1' + postgis: 'l3.5.0rc1' PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' PROJ_CHECKOUT: 'tags/9.5.0' readme_group: 'test' SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' SFCGAL_CHECKOUT: 'tags/v1.5.2' - tags: '17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1' + tags: '17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1' template: 'Dockerfile.master.template' diff --git a/manifest.sh b/manifest.sh index 8eff0748f..c2e7b0dc2 100755 --- a/manifest.sh +++ b/manifest.sh @@ -102,25 +102,25 @@ manifest-tool push from-args \ # ----- 12-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:12-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:12-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine3.19 \ - --target ${dockername}:12-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine3.19 \ + --target ${dockername}:12-3.5.0rc1-alpine3.19 || true # ----- 12-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:12-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:12-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine3.20 \ - --target ${dockername}:12-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine3.20 \ + --target ${dockername}:12-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:12-3.5.0beta1-alpine" +echo "manifest: ${dockername}:12-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0beta1-alpine \ - --target ${dockername}:12-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine \ + --target ${dockername}:12-3.5.0rc1-alpine || true # ----- 13-3.3-alpine3.20 ----- @@ -212,25 +212,25 @@ manifest-tool push from-args \ # ----- 13-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:13-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:13-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine3.19 \ - --target ${dockername}:13-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine3.19 \ + --target ${dockername}:13-3.5.0rc1-alpine3.19 || true # ----- 13-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:13-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:13-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine3.20 \ - --target ${dockername}:13-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine3.20 \ + --target ${dockername}:13-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:13-3.5.0beta1-alpine" +echo "manifest: ${dockername}:13-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0beta1-alpine \ - --target ${dockername}:13-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine \ + --target ${dockername}:13-3.5.0rc1-alpine || true # ----- 14-3.3-alpine3.20 ----- @@ -322,25 +322,25 @@ manifest-tool push from-args \ # ----- 14-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:14-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:14-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine3.19 \ - --target ${dockername}:14-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine3.19 \ + --target ${dockername}:14-3.5.0rc1-alpine3.19 || true # ----- 14-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:14-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:14-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine3.20 \ - --target ${dockername}:14-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine3.20 \ + --target ${dockername}:14-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:14-3.5.0beta1-alpine" +echo "manifest: ${dockername}:14-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0beta1-alpine \ - --target ${dockername}:14-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine \ + --target ${dockername}:14-3.5.0rc1-alpine || true # ----- 14-l3.1.9gcp-bookworm ----- @@ -466,25 +466,25 @@ manifest-tool push from-args \ # ----- 15-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:15-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:15-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine3.19 \ - --target ${dockername}:15-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine3.19 \ + --target ${dockername}:15-3.5.0rc1-alpine3.19 || true # ----- 15-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:15-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:15-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine3.20 \ - --target ${dockername}:15-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine3.20 \ + --target ${dockername}:15-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:15-3.5.0beta1-alpine" +echo "manifest: ${dockername}:15-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0beta1-alpine \ - --target ${dockername}:15-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine \ + --target ${dockername}:15-3.5.0rc1-alpine || true # ----- 15-master-bookworm ----- @@ -654,39 +654,39 @@ manifest-tool push from-args \ # ----- 16-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:16-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:16-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine3.19 \ - --target ${dockername}:16-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine3.19 \ + --target ${dockername}:16-3.5.0rc1-alpine3.19 || true # ----- 16-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:16-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:16-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine3.20 \ - --target ${dockername}:16-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine3.20 \ + --target ${dockername}:16-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:16-3.5.0beta1-alpine" +echo "manifest: ${dockername}:16-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0beta1-alpine \ - --target ${dockername}:16-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine \ + --target ${dockername}:16-3.5.0rc1-alpine || true -# ----- 16-l3.5.0beta1-bookworm ----- +# ----- 16-l3.5.0rc1-bookworm ----- -echo "manifest: ${dockername}:16-l3.5.0beta1-bookworm" +echo "manifest: ${dockername}:16-l3.5.0rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-l3.5.0beta1-bookworm \ - --target ${dockername}:16-l3.5.0beta1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-l3.5.0rc1-bookworm \ + --target ${dockername}:16-l3.5.0rc1-bookworm || true -echo "manifest: ${dockername}:16-l3.5.0beta1" +echo "manifest: ${dockername}:16-l3.5.0rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-l3.5.0beta1 \ - --target ${dockername}:16-l3.5.0beta1 || true + --template ${dockername}-ARCHVARIANT:16-l3.5.0rc1 \ + --target ${dockername}:16-l3.5.0rc1 || true # ----- 16-master-bookworm ----- @@ -756,39 +756,39 @@ manifest-tool push from-args \ # ----- 17rc1-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine3.19" +echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine3.19 \ - --target ${dockername}:17rc1-3.5.0beta1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine3.19 \ + --target ${dockername}:17rc1-3.5.0rc1-alpine3.19 || true # ----- 17rc1-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine3.20" +echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine3.20 \ - --target ${dockername}:17rc1-3.5.0beta1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine3.20 \ + --target ${dockername}:17rc1-3.5.0rc1-alpine3.20 || true -echo "manifest: ${dockername}:17rc1-3.5.0beta1-alpine" +echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0beta1-alpine \ - --target ${dockername}:17rc1-3.5.0beta1-alpine || true + --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine \ + --target ${dockername}:17rc1-3.5.0rc1-alpine || true -# ----- 17rc1-l3.5.0beta1-bookworm ----- +# ----- 17rc1-l3.5.0rc1-bookworm ----- -echo "manifest: ${dockername}:17rc1-l3.5.0beta1-bookworm" +echo "manifest: ${dockername}:17rc1-l3.5.0rc1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0beta1-bookworm \ - --target ${dockername}:17rc1-l3.5.0beta1-bookworm || true + --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0rc1-bookworm \ + --target ${dockername}:17rc1-l3.5.0rc1-bookworm || true -echo "manifest: ${dockername}:17rc1-l3.5.0beta1" +echo "manifest: ${dockername}:17rc1-l3.5.0rc1" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0beta1 \ - --target ${dockername}:17rc1-l3.5.0beta1 || true + --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0rc1 \ + --target ${dockername}:17rc1-l3.5.0rc1 || true # ----- 17rc1-master-bookworm ----- diff --git a/versions.json b/versions.json index 6783e9b47..f8ee4a919 100644 --- a/versions.json +++ b/versions.json @@ -71,32 +71,32 @@ }, "12-3.5": { "alpine3.19": { - "tags": "12-3.5.0beta1-alpine3.19", + "tags": "12-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "12-3.5.0beta1-alpine3.20 12-3.5.0beta1-alpine", + "tags": "12-3.5.0rc1-alpine3.20 12-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "13-3.3": { @@ -171,32 +171,32 @@ }, "13-3.5": { "alpine3.19": { - "tags": "13-3.5.0beta1-alpine3.19", + "tags": "13-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "13-3.5.0beta1-alpine3.20 13-3.5.0beta1-alpine", + "tags": "13-3.5.0rc1-alpine3.20 13-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "14-3.3": { @@ -271,32 +271,32 @@ }, "14-3.5": { "alpine3.19": { - "tags": "14-3.5.0beta1-alpine3.19", + "tags": "14-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "14-3.5.0beta1-alpine3.20 14-3.5.0beta1-alpine", + "tags": "14-3.5.0rc1-alpine3.20 14-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "15-3.3": { @@ -397,32 +397,32 @@ }, "15-3.5": { "alpine3.19": { - "tags": "15-3.5.0beta1-alpine3.19", + "tags": "15-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "15-3.5.0beta1-alpine3.20 15-3.5.0beta1-alpine", + "tags": "15-3.5.0rc1-alpine3.20 15-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "15-master": { @@ -575,32 +575,32 @@ }, "16-3.5": { "alpine3.19": { - "tags": "16-3.5.0beta1-alpine3.19", + "tags": "16-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "16-3.5.0beta1-alpine3.20 16-3.5.0beta1-alpine", + "tags": "16-3.5.0rc1-alpine3.20 16-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "16-master": { @@ -673,32 +673,32 @@ }, "17rc1-3.5": { "alpine3.19": { - "tags": "17rc1-3.5.0beta1-alpine3.19", + "tags": "17rc1-3.5.0rc1-alpine3.19", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "17rc1", "PG_DOCKER": "17rc1", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" }, "alpine3.20": { - "tags": "17rc1-3.5.0beta1-alpine3.20 17rc1-3.5.0beta1-alpine", + "tags": "17rc1-3.5.0rc1-alpine3.20 17rc1-3.5.0rc1-alpine", "readme_group": "test", - "postgis": "3.5.0beta1", + "postgis": "3.5.0rc1", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "17rc1", "PG_DOCKER": "17rc1", - "POSTGIS_VERSION": "3.5.0beta1", - "POSTGIS_SHA256": "d8d0a4b6a97aef6ca18fd7d2e22fb1353e344f9e1f477af3f4cf025fd9163aae", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd" + "POSTGIS_VERSION": "3.5.0rc1", + "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" } }, "17rc1-master": { @@ -780,7 +780,7 @@ "BOOST_VERSION": "1.74.0" } }, - "16-l3.5.0beta1": { + "16-l3.5.0rc1": { "bookworm": { "_comment": "source: ./locked.yml", "arch": "amd64 arm64", @@ -795,19 +795,19 @@ "initfile": "initdb-postgis.sh", "PG_DOCKER": "16", "PG_MAJOR": "16", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "postgis": "l3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "postgis": "l3.5.0rc1", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "PROJ_CHECKOUT": "tags/9.5.0", "readme_group": "test", "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "SFCGAL_CHECKOUT": "tags/v1.5.2", - "tags": "16-l3.5.0beta1-bookworm 16-l3.5.0beta1", + "tags": "16-l3.5.0rc1-bookworm 16-l3.5.0rc1", "template": "Dockerfile.master.template" } }, - "17rc1-l3.5.0beta1": { + "17rc1-l3.5.0rc1": { "bookworm": { "_comment": "source: ./locked.yml", "arch": "amd64 arm64", @@ -822,15 +822,15 @@ "initfile": "initdb-postgis.sh", "PG_DOCKER": "17rc1", "PG_MAJOR": "17rc1", - "POSTGIS_CHECKOUT_SHA1": "880fca31f541369d246400f9d9268a793c7466dd", - "POSTGIS_CHECKOUT": "tags/3.5.0beta1", - "postgis": "l3.5.0beta1", + "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072", + "POSTGIS_CHECKOUT": "tags/3.5.0rc1", + "postgis": "l3.5.0rc1", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "PROJ_CHECKOUT": "tags/9.5.0", "readme_group": "test", "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", "SFCGAL_CHECKOUT": "tags/v1.5.2", - "tags": "17rc1-l3.5.0beta1-bookworm 17rc1-l3.5.0beta1", + "tags": "17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1", "template": "Dockerfile.master.template" } } From ddc6ece99baf9f9837cf67c53a414b787df79c91 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 24 Sep 2024 20:01:27 +0000 Subject: [PATCH 122/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.1.1,MOBILITYDB:v1.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 6 +++--- 16-3.4-bundle0/bookworm/Dockerfile | 6 +++--- README.md | 2 +- versions.json | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 47601f1f8..adcdfa119 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=4273bdd4f70ee6fb8b28cd269385d83da6eeba31 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fabd97bd76361051b91c0e772eb819a45f3fd095 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 3fdf33e40..2589ffabd 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.1 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=4273bdd4f70ee6fb8b28cd269385d83da6eeba31 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 1c89549ad..b3e7d8ccb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-23) +## Versions (2024-09-24) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index f8ee4a919..42f9d35d2 100644 --- a/versions.json +++ b/versions.json @@ -379,16 +379,16 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.1", - "MOBILITYDB_CHECKOUT_SHA1": "4273bdd4f70ee6fb8b28cd269385d83da6eeba31", + "MOBILITYDB_CHECKOUT": "tags/v1.1.2", + "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.16.1", "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", - "DUCKDB_CHECKOUT": "tags/v1.1.0", - "DUCKDB_CHECKOUT_SHA1": "fa5c2fe15f3da5f32397b009196c0895fce60820", + "DUCKDB_CHECKOUT": "tags/v1.1.1", + "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", "POSTGIS_MAJOR": "3", @@ -557,16 +557,16 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.1", - "MOBILITYDB_CHECKOUT_SHA1": "4273bdd4f70ee6fb8b28cd269385d83da6eeba31", + "MOBILITYDB_CHECKOUT": "tags/v1.1.2", + "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.16.1", "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", - "DUCKDB_CHECKOUT": "tags/v1.1.0", - "DUCKDB_CHECKOUT_SHA1": "fa5c2fe15f3da5f32397b009196c0895fce60820", + "DUCKDB_CHECKOUT": "tags/v1.1.1", + "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From b2e711449870ad59356aa9b9d8aa56f5a96deeba Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 28 Sep 2024 04:51:42 +0200 Subject: [PATCH 123/167] update Postgres17, Postgis 3.5, etc --- .circleci/config.yml | 14 +- .github/workflows/main.yml | 14 +- 12-3.4/bookworm/Dockerfile | 4 +- 12-3.4/bookworm/tags | 2 +- 12-3.4/bullseye/Dockerfile | 4 +- 12-3.4/bullseye/tags | 2 +- 12-3.5/alpine3.19/Dockerfile | 4 +- 12-3.5/alpine3.19/tags | 2 +- 12-3.5/alpine3.20/Dockerfile | 4 +- 12-3.5/alpine3.20/tags | 2 +- 13-3.4/bookworm/Dockerfile | 4 +- 13-3.4/bookworm/tags | 2 +- 13-3.4/bullseye/Dockerfile | 4 +- 13-3.4/bullseye/tags | 2 +- 13-3.5/alpine3.19/Dockerfile | 4 +- 13-3.5/alpine3.19/tags | 2 +- 13-3.5/alpine3.20/Dockerfile | 4 +- 13-3.5/alpine3.20/tags | 2 +- 14-3.4/bookworm/Dockerfile | 4 +- 14-3.4/bookworm/tags | 2 +- 14-3.4/bullseye/Dockerfile | 4 +- 14-3.4/bullseye/tags | 2 +- 14-3.5/alpine3.19/Dockerfile | 4 +- 14-3.5/alpine3.19/tags | 2 +- 14-3.5/alpine3.20/Dockerfile | 4 +- 14-3.5/alpine3.20/tags | 2 +- 15-3.4-bundle0/bookworm/tags | 2 +- 15-3.4/bookworm/Dockerfile | 4 +- 15-3.4/bookworm/tags | 2 +- 15-3.4/bullseye/Dockerfile | 4 +- 15-3.4/bullseye/tags | 2 +- 15-3.5/alpine3.19/Dockerfile | 4 +- 15-3.5/alpine3.19/tags | 2 +- 15-3.5/alpine3.20/Dockerfile | 4 +- 15-3.5/alpine3.20/tags | 2 +- 15-master/bookworm/tags | 1 - 15-recent/bookworm/tags | 1 - 16-3.4-bundle0/bookworm/tags | 2 +- 16-3.4/alpine3.20/tags | 2 +- 16-3.4/bookworm/Dockerfile | 4 +- 16-3.4/bookworm/tags | 2 +- 16-3.4/bullseye/Dockerfile | 4 +- 16-3.4/bullseye/tags | 2 +- 16-3.5/alpine3.19/Dockerfile | 4 +- 16-3.5/alpine3.19/tags | 2 +- 16-3.5/alpine3.20/Dockerfile | 4 +- 16-3.5/alpine3.20/tags | 2 +- 16-l3.5.0rc1/bookworm/Dockerfile | 730 ------------------ 16-l3.5.0rc1/bookworm/tags | 1 - 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- {17rc1-3.4 => 17-3.4}/alpine3.20/Dockerfile | 4 +- .../alpine3.20}/initdb-postgis.sh | 0 17-3.4/alpine3.20/tags | 1 + .../alpine3.20}/update-postgis.sh | 0 {17rc1-3.5 => 17-3.5}/alpine3.19/Dockerfile | 8 +- .../alpine3.19}/initdb-postgis.sh | 0 17-3.5/alpine3.19/tags | 1 + .../alpine3.19}/update-postgis.sh | 0 {17rc1-3.5 => 17-3.5}/alpine3.20/Dockerfile | 8 +- .../alpine3.20}/initdb-postgis.sh | 0 17-3.5/alpine3.20/tags | 1 + .../alpine3.20}/update-postgis.sh | 0 {15-master => 17-master}/bookworm/Dockerfile | 4 +- .../bookworm}/initdb-postgis.sh | 0 17-master/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 {15-recent => 17-recent}/bookworm/Dockerfile | 8 +- .../bookworm}/initdb-postgis.sh | 0 17-recent/bookworm/tags | 1 + .../bookworm}/update-postgis.sh | 0 17rc1-3.4/alpine3.20/tags | 1 - 17rc1-3.5/alpine3.19/tags | 1 - 17rc1-3.5/alpine3.20/initdb-postgis.sh | 25 - 17rc1-3.5/alpine3.20/tags | 1 - 17rc1-3.5/alpine3.20/update-postgis.sh | 28 - 17rc1-l3.5.0rc1/bookworm/Dockerfile | 730 ------------------ 17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh | 25 - 17rc1-l3.5.0rc1/bookworm/tags | 1 - 17rc1-l3.5.0rc1/bookworm/update-postgis.sh | 28 - 17rc1-master/bookworm/Dockerfile | 730 ------------------ 17rc1-master/bookworm/initdb-postgis.sh | 25 - 17rc1-master/bookworm/tags | 1 - 17rc1-master/bookworm/update-postgis.sh | 28 - 17rc1-recent/bookworm/Dockerfile | 730 ------------------ 17rc1-recent/bookworm/initdb-postgis.sh | 25 - 17rc1-recent/bookworm/tags | 1 - 17rc1-recent/bookworm/update-postgis.sh | 28 - README.md | 64 +- locked.yml | 52 -- manifest.sh | 400 +++++----- versions.json | 372 ++++----- versions.sh | 4 +- 93 files changed, 458 insertions(+), 3772 deletions(-) delete mode 100644 15-master/bookworm/tags delete mode 100644 15-recent/bookworm/tags delete mode 100644 16-l3.5.0rc1/bookworm/Dockerfile delete mode 100644 16-l3.5.0rc1/bookworm/tags rename {17rc1-3.4 => 17-3.4}/alpine3.20/Dockerfile (97%) rename {15-master/bookworm => 17-3.4/alpine3.20}/initdb-postgis.sh (100%) create mode 100644 17-3.4/alpine3.20/tags rename {15-master/bookworm => 17-3.4/alpine3.20}/update-postgis.sh (100%) rename {17rc1-3.5 => 17-3.5}/alpine3.19/Dockerfile (95%) rename {15-recent/bookworm => 17-3.5/alpine3.19}/initdb-postgis.sh (100%) create mode 100644 17-3.5/alpine3.19/tags rename {15-recent/bookworm => 17-3.5/alpine3.19}/update-postgis.sh (100%) rename {17rc1-3.5 => 17-3.5}/alpine3.20/Dockerfile (95%) rename {16-l3.5.0rc1/bookworm => 17-3.5/alpine3.20}/initdb-postgis.sh (100%) create mode 100644 17-3.5/alpine3.20/tags rename {16-l3.5.0rc1/bookworm => 17-3.5/alpine3.20}/update-postgis.sh (100%) rename {15-master => 17-master}/bookworm/Dockerfile (99%) rename {17rc1-3.4/alpine3.20 => 17-master/bookworm}/initdb-postgis.sh (100%) create mode 100644 17-master/bookworm/tags rename {17rc1-3.4/alpine3.20 => 17-master/bookworm}/update-postgis.sh (100%) rename {15-recent => 17-recent}/bookworm/Dockerfile (98%) rename {17rc1-3.5/alpine3.19 => 17-recent/bookworm}/initdb-postgis.sh (100%) create mode 100644 17-recent/bookworm/tags rename {17rc1-3.5/alpine3.19 => 17-recent/bookworm}/update-postgis.sh (100%) delete mode 100644 17rc1-3.4/alpine3.20/tags delete mode 100644 17rc1-3.5/alpine3.19/tags delete mode 100644 17rc1-3.5/alpine3.20/initdb-postgis.sh delete mode 100644 17rc1-3.5/alpine3.20/tags delete mode 100755 17rc1-3.5/alpine3.20/update-postgis.sh delete mode 100644 17rc1-l3.5.0rc1/bookworm/Dockerfile delete mode 100644 17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh delete mode 100644 17rc1-l3.5.0rc1/bookworm/tags delete mode 100755 17rc1-l3.5.0rc1/bookworm/update-postgis.sh delete mode 100644 17rc1-master/bookworm/Dockerfile delete mode 100644 17rc1-master/bookworm/initdb-postgis.sh delete mode 100644 17rc1-master/bookworm/tags delete mode 100755 17rc1-master/bookworm/update-postgis.sh delete mode 100644 17rc1-recent/bookworm/Dockerfile delete mode 100644 17rc1-recent/bookworm/initdb-postgis.sh delete mode 100644 17rc1-recent/bookworm/tags delete mode 100755 17rc1-recent/bookworm/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cab849d1..dc88a7040 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,8 +156,6 @@ workflows: "15-3.4-bundle0-bookworm", "15-3.5-alpine3.19", "15-3.5-alpine3.20", - "15-master-bookworm", - "15-recent-bookworm", "16-3.3-alpine3.20", "16-3.4-alpine3.19", "16-3.4-alpine3.20", @@ -166,14 +164,12 @@ workflows: "16-3.4-bundle0-bookworm", "16-3.5-alpine3.19", "16-3.5-alpine3.20", - "16-l3.5.0rc1-bookworm", "16-master-bookworm", "16-recent-bookworm", - "17rc1-3.4-alpine3.20", - "17rc1-3.5-alpine3.19", - "17rc1-3.5-alpine3.20", - "17rc1-l3.5.0rc1-bookworm", - "17rc1-master-bookworm", - "17rc1-recent-bookworm", + "17-3.4-alpine3.20", + "17-3.5-alpine3.19", + "17-3.5-alpine3.20", + "17-master-bookworm", + "17-recent-bookworm", #circleci-targets-end ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da233f713..628475f32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,8 +57,6 @@ jobs: - { version: "15-3.4-bundle0", variant: "bookworm" } - { version: "15-3.5", variant: "alpine3.19" } - { version: "15-3.5", variant: "alpine3.20" } - - { version: "15-master", variant: "bookworm" } - - { version: "15-recent", variant: "bookworm" } - { version: "16-3.3", variant: "alpine3.20" } - { version: "16-3.4", variant: "alpine3.19" } - { version: "16-3.4", variant: "alpine3.20" } @@ -67,15 +65,13 @@ jobs: - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-3.5", variant: "alpine3.19" } - { version: "16-3.5", variant: "alpine3.20" } - - { version: "16-l3.5.0rc1", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - - { version: "17rc1-3.4", variant: "alpine3.20" } - - { version: "17rc1-3.5", variant: "alpine3.19" } - - { version: "17rc1-3.5", variant: "alpine3.20" } - - { version: "17rc1-l3.5.0rc1", variant: "bookworm" } - - { version: "17rc1-master", variant: "bookworm" } - - { version: "17rc1-recent", variant: "bookworm" } + - { version: "17-3.4", variant: "alpine3.20" } + - { version: "17-3.5", variant: "alpine3.19" } + - { version: "17-3.5", variant: "alpine3.20" } + - { version: "17-master", variant: "bookworm" } + - { version: "17-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile index 3743e48b7..9c849f2a8 100644 --- a/12-3.4/bookworm/Dockerfile +++ b/12-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags index 0088f5ff7..a8b775788 100644 --- a/12-3.4/bookworm/tags +++ b/12-3.4/bookworm/tags @@ -1 +1 @@ -12-3.4-bookworm 12-3.4.2-bookworm 12-3.4 +12-3.4-bookworm 12-3.4.3-bookworm 12-3.4 diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile index 3bf932ca1..d225ba351 100644 --- a/12-3.4/bullseye/Dockerfile +++ b/12-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags index 26c97b435..bc96f84b2 100644 --- a/12-3.4/bullseye/tags +++ b/12-3.4/bullseye/tags @@ -1 +1 @@ -12-3.4-bullseye 12-3.4.2-bullseye +12-3.4-bullseye 12-3.4.3-bullseye diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index fe0242cfc..c7df6bf37 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.19/tags b/12-3.5/alpine3.19/tags index a553ba9d5..25d7c1e17 100644 --- a/12-3.5/alpine3.19/tags +++ b/12-3.5/alpine3.19/tags @@ -1 +1 @@ -12-3.5.0rc1-alpine3.19 +12-3.5-alpine3.19 12-3.5.0-alpine3.19 diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index 43d043882..a018bd004 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags index 7e104ef28..799eed3e6 100644 --- a/12-3.5/alpine3.20/tags +++ b/12-3.5/alpine3.20/tags @@ -1 +1 @@ -12-3.5.0rc1-alpine3.20 12-3.5.0rc1-alpine +12-3.5-alpine3.20 12-3.5.0-alpine3.20 12-3.5-alpine diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile index 12020cf16..526f3624a 100644 --- a/13-3.4/bookworm/Dockerfile +++ b/13-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags index d35a8e788..6d6aa6b85 100644 --- a/13-3.4/bookworm/tags +++ b/13-3.4/bookworm/tags @@ -1 +1 @@ -13-3.4-bookworm 13-3.4.2-bookworm 13-3.4 +13-3.4-bookworm 13-3.4.3-bookworm 13-3.4 diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile index a554eb21f..4807b90fe 100644 --- a/13-3.4/bullseye/Dockerfile +++ b/13-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags index 37db47727..0b6193d30 100644 --- a/13-3.4/bullseye/tags +++ b/13-3.4/bullseye/tags @@ -1 +1 @@ -13-3.4-bullseye 13-3.4.2-bullseye +13-3.4-bullseye 13-3.4.3-bullseye diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index e5e90ba0c..fed4b0176 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.19/tags b/13-3.5/alpine3.19/tags index 6ea49c4a3..2604f04bd 100644 --- a/13-3.5/alpine3.19/tags +++ b/13-3.5/alpine3.19/tags @@ -1 +1 @@ -13-3.5.0rc1-alpine3.19 +13-3.5-alpine3.19 13-3.5.0-alpine3.19 diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index b548e1a4e..865b6ee64 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index d581587dc..2906c5c50 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5.0rc1-alpine3.20 13-3.5.0rc1-alpine +13-3.5-alpine3.20 13-3.5.0-alpine3.20 13-3.5-alpine diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile index 58d9c8854..af91d7c8d 100644 --- a/14-3.4/bookworm/Dockerfile +++ b/14-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags index f44af9937..f954963b8 100644 --- a/14-3.4/bookworm/tags +++ b/14-3.4/bookworm/tags @@ -1 +1 @@ -14-3.4-bookworm 14-3.4.2-bookworm 14-3.4 +14-3.4-bookworm 14-3.4.3-bookworm 14-3.4 diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile index 45a609314..c9cab5391 100644 --- a/14-3.4/bullseye/Dockerfile +++ b/14-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags index cd8bb9fee..e022878a4 100644 --- a/14-3.4/bullseye/tags +++ b/14-3.4/bullseye/tags @@ -1 +1 @@ -14-3.4-bullseye 14-3.4.2-bullseye +14-3.4-bullseye 14-3.4.3-bullseye diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index fabb66ae0..75592a901 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.19/tags b/14-3.5/alpine3.19/tags index 8d27cf16b..268dcff1b 100644 --- a/14-3.5/alpine3.19/tags +++ b/14-3.5/alpine3.19/tags @@ -1 +1 @@ -14-3.5.0rc1-alpine3.19 +14-3.5-alpine3.19 14-3.5.0-alpine3.19 diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index e30b93c02..a82afcd53 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index 681addef1..17ff69249 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5.0rc1-alpine3.20 14-3.5.0rc1-alpine +14-3.5-alpine3.20 14-3.5.0-alpine3.20 14-3.5-alpine diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags index 487b1a6b9..67c8f721d 100644 --- a/15-3.4-bundle0/bookworm/tags +++ b/15-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0 +15-3.4-bundle0-bookworm 15-3.4.3-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile index 85aeb569c..c8a0fad1c 100644 --- a/15-3.4/bookworm/Dockerfile +++ b/15-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags index f45fa473e..d1915f763 100644 --- a/15-3.4/bookworm/tags +++ b/15-3.4/bookworm/tags @@ -1 +1 @@ -15-3.4-bookworm 15-3.4.2-bookworm 15-3.4 +15-3.4-bookworm 15-3.4.3-bookworm 15-3.4 diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile index 4a2d7ed74..e069c976a 100644 --- a/15-3.4/bullseye/Dockerfile +++ b/15-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags index ca554ec60..c379f1160 100644 --- a/15-3.4/bullseye/tags +++ b/15-3.4/bullseye/tags @@ -1 +1 @@ -15-3.4-bullseye 15-3.4.2-bullseye +15-3.4-bullseye 15-3.4.3-bullseye diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 11c10ae67..6155ce6f5 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.19/tags b/15-3.5/alpine3.19/tags index 84fcb6711..2be00231d 100644 --- a/15-3.5/alpine3.19/tags +++ b/15-3.5/alpine3.19/tags @@ -1 +1 @@ -15-3.5.0rc1-alpine3.19 +15-3.5-alpine3.19 15-3.5.0-alpine3.19 diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index e8a38674f..63a02c991 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index a1a6cd67a..a438c715b 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5.0rc1-alpine3.20 15-3.5.0rc1-alpine +15-3.5-alpine3.20 15-3.5.0-alpine3.20 15-3.5-alpine diff --git a/15-master/bookworm/tags b/15-master/bookworm/tags deleted file mode 100644 index 36ce3a2ac..000000000 --- a/15-master/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-master-bookworm 15-master diff --git a/15-recent/bookworm/tags b/15-recent/bookworm/tags deleted file mode 100644 index c7d537bec..000000000 --- a/15-recent/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags index 693b1526c..40a07e675 100644 --- a/16-3.4-bundle0/bookworm/tags +++ b/16-3.4-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0 +16-3.4-bundle0-bookworm 16-3.4.3-bundle0-bookworm 16-3.4-bundle0 diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index 4ed961890..ee68de5cd 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine alpine +16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile index 31d631904..500553b96 100644 --- a/16-3.4/bookworm/Dockerfile +++ b/16-3.4/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags index 263a25f35..6a87d154b 100644 --- a/16-3.4/bookworm/tags +++ b/16-3.4/bookworm/tags @@ -1 +1 @@ -16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest +16-3.4-bookworm 16-3.4.3-bookworm 16-3.4 diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile index 11921c37f..157a88dd3 100644 --- a/16-3.4/bullseye/Dockerfile +++ b/16-3.4/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags index 925db2db4..0bf553b21 100644 --- a/16-3.4/bullseye/tags +++ b/16-3.4/bullseye/tags @@ -1 +1 @@ -16-3.4-bullseye 16-3.4.2-bullseye +16-3.4-bullseye 16-3.4.3-bullseye diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index 054c4884e..ff20df952 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.19/tags b/16-3.5/alpine3.19/tags index 9a921ab8e..01925efa6 100644 --- a/16-3.5/alpine3.19/tags +++ b/16-3.5/alpine3.19/tags @@ -1 +1 @@ -16-3.5.0rc1-alpine3.19 +16-3.5-alpine3.19 16-3.5.0-alpine3.19 diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 83985b874..840e95fa6 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index 3bc2c924e..7db4f3d44 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5.0rc1-alpine3.20 16-3.5.0rc1-alpine +16-3.5-alpine3.20 16-3.5.0-alpine3.20 16-3.5-alpine diff --git a/16-l3.5.0rc1/bookworm/Dockerfile b/16-l3.5.0rc1/bookworm/Dockerfile deleted file mode 100644 index cf149a3db..000000000 --- a/16-l3.5.0rc1/bookworm/Dockerfile +++ /dev/null @@ -1,730 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -# "Experimental"; solely for testing purposes. Anticipate frequent changes! -# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. - -ARG PGIS1_BASE_IMAGE=postgres:16-bookworm - -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git -ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git - -# Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 - -# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' -# Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 -ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc -ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c - -ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS1_CMAKE_BUILD_TYPE=Release - -ARG PGIS1_GDAL_BUILD=with_extra -# Full GDAL build ; with arrow, parquet and extra dependencies - -FROM ${PGIS1_BASE_IMAGE} as builder - -WORKDIR / - -ARG PGIS1_BOOST_VERSION -ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -# apt-get install -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - # build dependency - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libpq-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - make \ - pkg-config \ - protobuf-c-compiler \ - xsltproc \ - # gdal+ - liblz4-dev \ - liblzma-dev \ - libwebp-dev \ - libzstd-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ARG PGIS1_CMAKE_BUILD_TYPE -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} - -FROM builder as cgal-sfcgal-builder - -# cgal & sfcgal -ARG PGIS1_SFCGAL_REPOSITORY -ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} -ARG PGIS1_SFCGAL_CHECKOUT -ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS1_SFCGAL_CHECKOUT_SHA1 - -ARG PGIS1_CGAL_REPOSITORY -ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} -ARG PGIS1_CGAL_CHECKOUT -ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -ARG PGIS1_CGAL_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir cgal \ - && cd cgal \ - && git init \ - && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping CGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ - echo "CGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_cgal_last_commit.txt \ - && cd /usr/src \ - && mkdir SFCGAL \ - && cd SFCGAL \ - && git init \ - && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping SFCGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ - echo "SFCGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_sfcgal_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. \ - -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DSFCGAL_BUILD_BENCH=OFF \ - -DSFCGAL_BUILD_EXAMPLES=OFF \ - -DSFCGAL_BUILD_TESTS=OFF \ - -DSFCGAL_WITH_OSG=OFF \ - && make -j$(nproc) \ - && make install \ - # clean - && rm -fr /usr/src/SFCGAL \ - && rm -fr /usr/src/cgal - - -FROM builder as proj-builder - -# proj -ARG PGIS1_PROJ_REPOSITORY -ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} -ARG PGIS1_PROJ_CHECKOUT -ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} -ARG PGIS1_PROJ_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir PROJ \ - && cd PROJ \ - && git init \ - && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 - && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping PROJ SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ - echo "PROJ SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_proj_last_commit.txt \ - # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 - && if [ -f "autogen.sh" ] ; then \ - set -eux \ - && echo "autotools version: 'autogen.sh' exists! Older version!" \ - && ./autogen.sh \ - && ./configure --disable-static \ - && make -j$(nproc) \ - && make install \ - ; \ - else \ - set -eux \ - && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - ; \ - fi \ - \ - && rm -fr /usr/src/PROJ - - -FROM builder as geos-builder - -# geos -ARG PGIS1_GEOS_REPOSITORY -ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} -ARG PGIS1_GEOS_CHECKOUT -ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} -ARG PGIS1_GEOS_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir geos \ - && cd geos \ - && git init \ - && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GEOS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ - echo "GEOS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_geos_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/geos - - -FROM builder as stage0-builder - -COPY --from=cgal-sfcgal-builder /_pgis*.* / -COPY --from=cgal-sfcgal-builder /usr/local /usr/local - -COPY --from=proj-builder /_pgis*.* / -COPY --from=proj-builder /usr/local /usr/local - -COPY --from=geos-builder /_pgis*.* / -COPY --from=geos-builder /usr/local /usr/local -# gdal -ARG PGIS1_GDAL_REPOSITORY -ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} -ARG PGIS1_GDAL_CHECKOUT -ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -ARG PGIS1_GDAL_CHECKOUT_SHA1 - - - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Automatically determine the latest PGIS1 Arrow version and SOVERSION - && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ - && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ - && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ - && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ - && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - # Backup the version variables - reusing in a later stage - && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ - && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ - # Install Arrow C++ - && apt-get install -y --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ - \ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libheif-dev \ - libkml-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libpng-dev \ - libqhull-dev \ - libspatialite-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -## GDAL_build-end - -RUN set -eux \ - && ldconfig \ - && cd /usr/src \ - && mkdir gdal \ - && cd gdal \ - && git init \ - && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GDAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ - echo "GDAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_gdal_last_commit.txt \ - \ - # gdal project directory structure - has been changed ! - && if [ -d "gdal" ] ; then \ - echo "Directory 'gdal' dir exists -> older version!" ; \ - cd gdal ; \ - else \ - echo "Directory 'gdal' does not exists! Newer version! " ; \ - fi \ - \ - && if [ -f "./autogen.sh" ]; then \ - # Building with autoconf ( old/deprecated ) - set -eux \ - && ./autogen.sh \ - && ./configure --disable-static \ - ; \ - else \ - # Building with cmake - set -eux \ - && mkdir build \ - && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DBUILD_TESTING=OFF \ - -DBUILD_DOCS=OFF \ - \ - -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ - -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ - -DGDAL_USE_GEOS=ON \ - -DGDAL_USE_JSONC=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LIBXML2=ON \ - -DGDAL_USE_LZ4=ON \ - -DGDAL_USE_POSTGRESQL=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ - \ - -DGDAL_USE_ARROW=ON \ - -DGDAL_USE_ARROWDATASET=ON \ - -DGDAL_USE_BLOSC=ON \ - -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_FREEXL=ON \ - -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_HDF5=ON \ - -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_LERC_INTERNAL=ON \ - -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_NETCDF=ON \ - -DGDAL_USE_OPENJPEG=ON \ - -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_PNG=ON \ - -DGDAL_USE_QHULL=ON \ - -DGDAL_USE_SPATIALITE=ON \ - ; \ - fi \ - \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/gdal - -# Minimal command line test. -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - && pcre-config --version - -# ------------------------------------------- -# final stage -# ------------------------------------------- -FROM ${PGIS1_BASE_IMAGE} - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 16-l3.5.0rc1 spatial database extension with PostgreSQL 16 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ARG PGIS1_CMAKE_BUILD_TYPE -ARG PGIS1_BASE_IMAGE -ARG PGIS1_BOOST_VERSION - -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ - PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -RUN set -eux \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libpcre3 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage0-builder /_pgis*.* / -COPY --from=stage0-builder /usr/local /usr/local - -# Install Arrow + Parquet + other GDAL extra dependencies - -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Load the PGIS1_ARROW version variables - && . /_pgis1_arrow_environment.env \ - # Use the PGIS1_ARROW_SOVERSION as needed - && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libcrypto++8 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libpng16-16 \ - libqhull-r8.0 \ - librasterlite2-1 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -ARG PGIS1_GDAL_CHECKOUT -ARG PGIS1_GDAL_REPOSITORY -ARG PGIS1_GEOS_CHECKOUT -ARG PGIS1_GEOS_REPOSITORY -ARG PGIS1_PROJ_CHECKOUT -ARG PGIS1_PROJ_REPOSITORY -ARG PGIS1_SFCGAL_CHECKOUT -ARG PGIS1_SFCGAL_REPOSITORY -ARG PGIS1_CGAL_REPOSITORY -ARG PGIS1_CGAL_CHECKOUT - -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ - PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ - PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ - PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ - PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ - PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ - PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ - PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ - PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ - PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ - PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ - PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} - -# Minimal command line test ( fail fast ) -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - \ - # Testing ogr2ogr PostgreSQL driver. - && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ - || echo "ogr2ogr missing PostgreSQL driver" && exit 1 - -# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; -# The arm64 build is very senitive. -ENV GDAL_CONFIG /usr/local/bin/gdal-config -ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - -# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables -# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 -RUN set -eux \ - && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcunit1-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && cd \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping POSTGIS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ - echo "POSTGIS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_last_commit.txt \ - && ldconfig \ - && ./autogen.sh \ -# configure options taken from: -# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ -# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && if command -v projsync >/dev/null 2>&1; then \ - projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn ; \ - fi \ -# regress check - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && ldconfig \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# clean - && cd / \ - && rm -rf /usr/src/postgis \ - && apt-get purge -y --autoremove \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - -# last final test -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - # check any missing dependencies - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ - \ - # Is the "ca-certificates" package installed? (for accessing remote raster files) - # https://github.com/postgis/docker-postgis/issues/307 - && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ - \ - # list last commits. - && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ - # list postgresql, postgis version - && cat _pgis_full_version.txt diff --git a/16-l3.5.0rc1/bookworm/tags b/16-l3.5.0rc1/bookworm/tags deleted file mode 100644 index 52f62487d..000000000 --- a/16-l3.5.0rc1/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-l3.5.0rc1-bookworm 16-l3.5.0rc1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 57f9f9d38..e9ee47ff8 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index c868e5c2c..f468409d1 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent diff --git a/17rc1-3.4/alpine3.20/Dockerfile b/17-3.4/alpine3.20/Dockerfile similarity index 97% rename from 17rc1-3.4/alpine3.20/Dockerfile rename to 17-3.4/alpine3.20/Dockerfile index 8de6b5bf6..fcc34ce08 100644 --- a/17rc1-3.4/alpine3.20/Dockerfile +++ b/17-3.4/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-master/bookworm/initdb-postgis.sh b/17-3.4/alpine3.20/initdb-postgis.sh similarity index 100% rename from 15-master/bookworm/initdb-postgis.sh rename to 17-3.4/alpine3.20/initdb-postgis.sh diff --git a/17-3.4/alpine3.20/tags b/17-3.4/alpine3.20/tags new file mode 100644 index 000000000..4124951f1 --- /dev/null +++ b/17-3.4/alpine3.20/tags @@ -0,0 +1 @@ +17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine alpine diff --git a/15-master/bookworm/update-postgis.sh b/17-3.4/alpine3.20/update-postgis.sh similarity index 100% rename from 15-master/bookworm/update-postgis.sh rename to 17-3.4/alpine3.20/update-postgis.sh diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17-3.5/alpine3.19/Dockerfile similarity index 95% rename from 17rc1-3.5/alpine3.19/Dockerfile rename to 17-3.5/alpine3.19/Dockerfile index e2109cc2b..30583cdc4 100644 --- a/17rc1-3.5/alpine3.19/Dockerfile +++ b/17-3.5/alpine3.19/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.19" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-recent/bookworm/initdb-postgis.sh b/17-3.5/alpine3.19/initdb-postgis.sh similarity index 100% rename from 15-recent/bookworm/initdb-postgis.sh rename to 17-3.5/alpine3.19/initdb-postgis.sh diff --git a/17-3.5/alpine3.19/tags b/17-3.5/alpine3.19/tags new file mode 100644 index 000000000..64852a2e1 --- /dev/null +++ b/17-3.5/alpine3.19/tags @@ -0,0 +1 @@ +17-3.5-alpine3.19 17-3.5.0-alpine3.19 diff --git a/15-recent/bookworm/update-postgis.sh b/17-3.5/alpine3.19/update-postgis.sh similarity index 100% rename from 15-recent/bookworm/update-postgis.sh rename to 17-3.5/alpine3.19/update-postgis.sh diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.20/Dockerfile similarity index 95% rename from 17rc1-3.5/alpine3.20/Dockerfile rename to 17-3.5/alpine3.20/Dockerfile index 6c759cd3d..1632abba0 100644 --- a/17rc1-3.5/alpine3.20/Dockerfile +++ b/17-3.5/alpine3.20/Dockerfile @@ -4,10 +4,10 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17rc1-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 FROM ${PGIS1_BASE_IMAGE} @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17rc1 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.20" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-l3.5.0rc1/bookworm/initdb-postgis.sh b/17-3.5/alpine3.20/initdb-postgis.sh similarity index 100% rename from 16-l3.5.0rc1/bookworm/initdb-postgis.sh rename to 17-3.5/alpine3.20/initdb-postgis.sh diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags new file mode 100644 index 000000000..6119f9380 --- /dev/null +++ b/17-3.5/alpine3.20/tags @@ -0,0 +1 @@ +17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine diff --git a/16-l3.5.0rc1/bookworm/update-postgis.sh b/17-3.5/alpine3.20/update-postgis.sh similarity index 100% rename from 16-l3.5.0rc1/bookworm/update-postgis.sh rename to 17-3.5/alpine3.20/update-postgis.sh diff --git a/15-master/bookworm/Dockerfile b/17-master/bookworm/Dockerfile similarity index 99% rename from 15-master/bookworm/Dockerfile rename to 17-master/bookworm/Dockerfile index ac8f3d116..030daa588 100644 --- a/15-master/bookworm/Dockerfile +++ b/17-master/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:15-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -438,7 +438,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 15-master spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS - 17-master spatial database extension with PostgreSQL 17 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17rc1-3.4/alpine3.20/initdb-postgis.sh b/17-master/bookworm/initdb-postgis.sh similarity index 100% rename from 17rc1-3.4/alpine3.20/initdb-postgis.sh rename to 17-master/bookworm/initdb-postgis.sh diff --git a/17-master/bookworm/tags b/17-master/bookworm/tags new file mode 100644 index 000000000..1358267c6 --- /dev/null +++ b/17-master/bookworm/tags @@ -0,0 +1 @@ +17-master-bookworm 17-master diff --git a/17rc1-3.4/alpine3.20/update-postgis.sh b/17-master/bookworm/update-postgis.sh similarity index 100% rename from 17rc1-3.4/alpine3.20/update-postgis.sh rename to 17-master/bookworm/update-postgis.sh diff --git a/15-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile similarity index 98% rename from 15-recent/bookworm/Dockerfile rename to 17-recent/bookworm/Dockerfile index fda6ffb34..441f37395 100644 --- a/15-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -6,7 +6,7 @@ # "Experimental"; solely for testing purposes. Anticipate frequent changes! # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. -ARG PGIS1_BASE_IMAGE=postgres:15-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17-bookworm ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 @@ -438,7 +438,7 @@ RUN set -eux \ FROM ${PGIS1_BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 15-recent spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS - 17-recent spatial database extension with PostgreSQL 17 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ARG PGIS1_CMAKE_BUILD_TYPE diff --git a/17rc1-3.5/alpine3.19/initdb-postgis.sh b/17-recent/bookworm/initdb-postgis.sh similarity index 100% rename from 17rc1-3.5/alpine3.19/initdb-postgis.sh rename to 17-recent/bookworm/initdb-postgis.sh diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags new file mode 100644 index 000000000..f303294d8 --- /dev/null +++ b/17-recent/bookworm/tags @@ -0,0 +1 @@ +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17-recent recent diff --git a/17rc1-3.5/alpine3.19/update-postgis.sh b/17-recent/bookworm/update-postgis.sh similarity index 100% rename from 17rc1-3.5/alpine3.19/update-postgis.sh rename to 17-recent/bookworm/update-postgis.sh diff --git a/17rc1-3.4/alpine3.20/tags b/17rc1-3.4/alpine3.20/tags deleted file mode 100644 index edbc4a9d8..000000000 --- a/17rc1-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-3.4-alpine3.20 17rc1-3.4.3-alpine3.20 17rc1-3.4-alpine diff --git a/17rc1-3.5/alpine3.19/tags b/17rc1-3.5/alpine3.19/tags deleted file mode 100644 index 8a24298ac..000000000 --- a/17rc1-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-3.5.0rc1-alpine3.19 diff --git a/17rc1-3.5/alpine3.20/initdb-postgis.sh b/17rc1-3.5/alpine3.20/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/17rc1-3.5/alpine3.20/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/17rc1-3.5/alpine3.20/tags b/17rc1-3.5/alpine3.20/tags deleted file mode 100644 index 9358e8766..000000000 --- a/17rc1-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-3.5.0rc1-alpine3.20 17rc1-3.5.0rc1-alpine diff --git a/17rc1-3.5/alpine3.20/update-postgis.sh b/17rc1-3.5/alpine3.20/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/17rc1-3.5/alpine3.20/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/17rc1-l3.5.0rc1/bookworm/Dockerfile b/17rc1-l3.5.0rc1/bookworm/Dockerfile deleted file mode 100644 index d5773b1a1..000000000 --- a/17rc1-l3.5.0rc1/bookworm/Dockerfile +++ /dev/null @@ -1,730 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -# "Experimental"; solely for testing purposes. Anticipate frequent changes! -# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. - -ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm - -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git -ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git - -# Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0rc1 -ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 - -# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' -# Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=df9317741170e86ff8346decdd555b54a0432072 -ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc -ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c - -ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS1_CMAKE_BUILD_TYPE=Release - -ARG PGIS1_GDAL_BUILD=with_extra -# Full GDAL build ; with arrow, parquet and extra dependencies - -FROM ${PGIS1_BASE_IMAGE} as builder - -WORKDIR / - -ARG PGIS1_BOOST_VERSION -ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -# apt-get install -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - # build dependency - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libpq-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - make \ - pkg-config \ - protobuf-c-compiler \ - xsltproc \ - # gdal+ - liblz4-dev \ - liblzma-dev \ - libwebp-dev \ - libzstd-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ARG PGIS1_CMAKE_BUILD_TYPE -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} - -FROM builder as cgal-sfcgal-builder - -# cgal & sfcgal -ARG PGIS1_SFCGAL_REPOSITORY -ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} -ARG PGIS1_SFCGAL_CHECKOUT -ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS1_SFCGAL_CHECKOUT_SHA1 - -ARG PGIS1_CGAL_REPOSITORY -ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} -ARG PGIS1_CGAL_CHECKOUT -ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -ARG PGIS1_CGAL_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir cgal \ - && cd cgal \ - && git init \ - && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping CGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ - echo "CGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_cgal_last_commit.txt \ - && cd /usr/src \ - && mkdir SFCGAL \ - && cd SFCGAL \ - && git init \ - && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping SFCGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ - echo "SFCGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_sfcgal_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. \ - -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DSFCGAL_BUILD_BENCH=OFF \ - -DSFCGAL_BUILD_EXAMPLES=OFF \ - -DSFCGAL_BUILD_TESTS=OFF \ - -DSFCGAL_WITH_OSG=OFF \ - && make -j$(nproc) \ - && make install \ - # clean - && rm -fr /usr/src/SFCGAL \ - && rm -fr /usr/src/cgal - - -FROM builder as proj-builder - -# proj -ARG PGIS1_PROJ_REPOSITORY -ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} -ARG PGIS1_PROJ_CHECKOUT -ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} -ARG PGIS1_PROJ_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir PROJ \ - && cd PROJ \ - && git init \ - && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 - && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping PROJ SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ - echo "PROJ SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_proj_last_commit.txt \ - # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 - && if [ -f "autogen.sh" ] ; then \ - set -eux \ - && echo "autotools version: 'autogen.sh' exists! Older version!" \ - && ./autogen.sh \ - && ./configure --disable-static \ - && make -j$(nproc) \ - && make install \ - ; \ - else \ - set -eux \ - && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - ; \ - fi \ - \ - && rm -fr /usr/src/PROJ - - -FROM builder as geos-builder - -# geos -ARG PGIS1_GEOS_REPOSITORY -ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} -ARG PGIS1_GEOS_CHECKOUT -ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} -ARG PGIS1_GEOS_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir geos \ - && cd geos \ - && git init \ - && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GEOS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ - echo "GEOS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_geos_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/geos - - -FROM builder as stage0-builder - -COPY --from=cgal-sfcgal-builder /_pgis*.* / -COPY --from=cgal-sfcgal-builder /usr/local /usr/local - -COPY --from=proj-builder /_pgis*.* / -COPY --from=proj-builder /usr/local /usr/local - -COPY --from=geos-builder /_pgis*.* / -COPY --from=geos-builder /usr/local /usr/local -# gdal -ARG PGIS1_GDAL_REPOSITORY -ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} -ARG PGIS1_GDAL_CHECKOUT -ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -ARG PGIS1_GDAL_CHECKOUT_SHA1 - - - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Automatically determine the latest PGIS1 Arrow version and SOVERSION - && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ - && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ - && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ - && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ - && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - # Backup the version variables - reusing in a later stage - && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ - && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ - # Install Arrow C++ - && apt-get install -y --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ - \ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libheif-dev \ - libkml-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libpng-dev \ - libqhull-dev \ - libspatialite-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -## GDAL_build-end - -RUN set -eux \ - && ldconfig \ - && cd /usr/src \ - && mkdir gdal \ - && cd gdal \ - && git init \ - && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GDAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ - echo "GDAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_gdal_last_commit.txt \ - \ - # gdal project directory structure - has been changed ! - && if [ -d "gdal" ] ; then \ - echo "Directory 'gdal' dir exists -> older version!" ; \ - cd gdal ; \ - else \ - echo "Directory 'gdal' does not exists! Newer version! " ; \ - fi \ - \ - && if [ -f "./autogen.sh" ]; then \ - # Building with autoconf ( old/deprecated ) - set -eux \ - && ./autogen.sh \ - && ./configure --disable-static \ - ; \ - else \ - # Building with cmake - set -eux \ - && mkdir build \ - && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DBUILD_TESTING=OFF \ - -DBUILD_DOCS=OFF \ - \ - -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ - -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ - -DGDAL_USE_GEOS=ON \ - -DGDAL_USE_JSONC=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LIBXML2=ON \ - -DGDAL_USE_LZ4=ON \ - -DGDAL_USE_POSTGRESQL=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ - \ - -DGDAL_USE_ARROW=ON \ - -DGDAL_USE_ARROWDATASET=ON \ - -DGDAL_USE_BLOSC=ON \ - -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_FREEXL=ON \ - -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_HDF5=ON \ - -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_LERC_INTERNAL=ON \ - -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_NETCDF=ON \ - -DGDAL_USE_OPENJPEG=ON \ - -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_PNG=ON \ - -DGDAL_USE_QHULL=ON \ - -DGDAL_USE_SPATIALITE=ON \ - ; \ - fi \ - \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/gdal - -# Minimal command line test. -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - && pcre-config --version - -# ------------------------------------------- -# final stage -# ------------------------------------------- -FROM ${PGIS1_BASE_IMAGE} - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17rc1-l3.5.0rc1 spatial database extension with PostgreSQL 17rc1 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ARG PGIS1_CMAKE_BUILD_TYPE -ARG PGIS1_BASE_IMAGE -ARG PGIS1_BOOST_VERSION - -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ - PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -RUN set -eux \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libpcre3 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage0-builder /_pgis*.* / -COPY --from=stage0-builder /usr/local /usr/local - -# Install Arrow + Parquet + other GDAL extra dependencies - -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Load the PGIS1_ARROW version variables - && . /_pgis1_arrow_environment.env \ - # Use the PGIS1_ARROW_SOVERSION as needed - && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libcrypto++8 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libpng16-16 \ - libqhull-r8.0 \ - librasterlite2-1 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -ARG PGIS1_GDAL_CHECKOUT -ARG PGIS1_GDAL_REPOSITORY -ARG PGIS1_GEOS_CHECKOUT -ARG PGIS1_GEOS_REPOSITORY -ARG PGIS1_PROJ_CHECKOUT -ARG PGIS1_PROJ_REPOSITORY -ARG PGIS1_SFCGAL_CHECKOUT -ARG PGIS1_SFCGAL_REPOSITORY -ARG PGIS1_CGAL_REPOSITORY -ARG PGIS1_CGAL_CHECKOUT - -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ - PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ - PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ - PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ - PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ - PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ - PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ - PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ - PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ - PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ - PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ - PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} - -# Minimal command line test ( fail fast ) -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - \ - # Testing ogr2ogr PostgreSQL driver. - && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ - || echo "ogr2ogr missing PostgreSQL driver" && exit 1 - -# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; -# The arm64 build is very senitive. -ENV GDAL_CONFIG /usr/local/bin/gdal-config -ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - -# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables -# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 -RUN set -eux \ - && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcunit1-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && cd \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping POSTGIS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ - echo "POSTGIS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_last_commit.txt \ - && ldconfig \ - && ./autogen.sh \ -# configure options taken from: -# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ -# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && if command -v projsync >/dev/null 2>&1; then \ - projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn ; \ - fi \ -# regress check - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && ldconfig \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# clean - && cd / \ - && rm -rf /usr/src/postgis \ - && apt-get purge -y --autoremove \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - -# last final test -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - # check any missing dependencies - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ - \ - # Is the "ca-certificates" package installed? (for accessing remote raster files) - # https://github.com/postgis/docker-postgis/issues/307 - && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ - \ - # list last commits. - && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ - # list postgresql, postgis version - && cat _pgis_full_version.txt diff --git a/17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh b/17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/17rc1-l3.5.0rc1/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/17rc1-l3.5.0rc1/bookworm/tags b/17rc1-l3.5.0rc1/bookworm/tags deleted file mode 100644 index fb889c36b..000000000 --- a/17rc1-l3.5.0rc1/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1 diff --git a/17rc1-l3.5.0rc1/bookworm/update-postgis.sh b/17rc1-l3.5.0rc1/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/17rc1-l3.5.0rc1/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/17rc1-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile deleted file mode 100644 index 528818137..000000000 --- a/17rc1-master/bookworm/Dockerfile +++ /dev/null @@ -1,730 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -# "Experimental"; solely for testing purposes. Anticipate frequent changes! -# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. - -ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm - -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git -ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git - -# Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=master -ARG PGIS1_GEOS_CHECKOUT=main -ARG PGIS1_GDAL_CHECKOUT=master -ARG PGIS1_PROJ_CHECKOUT=master -ARG PGIS1_SFCGAL_CHECKOUT=master -ARG PGIS1_CGAL_CHECKOUT=master - -# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' -# Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck -ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck -ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck -ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck -ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck - -ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS1_CMAKE_BUILD_TYPE=Release - -ARG PGIS1_GDAL_BUILD=with_extra -# Full GDAL build ; with arrow, parquet and extra dependencies - -FROM ${PGIS1_BASE_IMAGE} as builder - -WORKDIR / - -ARG PGIS1_BOOST_VERSION -ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -# apt-get install -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - # build dependency - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libpq-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - make \ - pkg-config \ - protobuf-c-compiler \ - xsltproc \ - # gdal+ - liblz4-dev \ - liblzma-dev \ - libwebp-dev \ - libzstd-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ARG PGIS1_CMAKE_BUILD_TYPE -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} - -FROM builder as cgal-sfcgal-builder - -# cgal & sfcgal -ARG PGIS1_SFCGAL_REPOSITORY -ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} -ARG PGIS1_SFCGAL_CHECKOUT -ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS1_SFCGAL_CHECKOUT_SHA1 - -ARG PGIS1_CGAL_REPOSITORY -ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} -ARG PGIS1_CGAL_CHECKOUT -ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -ARG PGIS1_CGAL_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir cgal \ - && cd cgal \ - && git init \ - && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping CGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ - echo "CGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_cgal_last_commit.txt \ - && cd /usr/src \ - && mkdir SFCGAL \ - && cd SFCGAL \ - && git init \ - && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping SFCGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ - echo "SFCGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_sfcgal_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. \ - -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DSFCGAL_BUILD_BENCH=OFF \ - -DSFCGAL_BUILD_EXAMPLES=OFF \ - -DSFCGAL_BUILD_TESTS=OFF \ - -DSFCGAL_WITH_OSG=OFF \ - && make -j$(nproc) \ - && make install \ - # clean - && rm -fr /usr/src/SFCGAL \ - && rm -fr /usr/src/cgal - - -FROM builder as proj-builder - -# proj -ARG PGIS1_PROJ_REPOSITORY -ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} -ARG PGIS1_PROJ_CHECKOUT -ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} -ARG PGIS1_PROJ_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir PROJ \ - && cd PROJ \ - && git init \ - && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 - && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping PROJ SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ - echo "PROJ SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_proj_last_commit.txt \ - # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 - && if [ -f "autogen.sh" ] ; then \ - set -eux \ - && echo "autotools version: 'autogen.sh' exists! Older version!" \ - && ./autogen.sh \ - && ./configure --disable-static \ - && make -j$(nproc) \ - && make install \ - ; \ - else \ - set -eux \ - && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - ; \ - fi \ - \ - && rm -fr /usr/src/PROJ - - -FROM builder as geos-builder - -# geos -ARG PGIS1_GEOS_REPOSITORY -ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} -ARG PGIS1_GEOS_CHECKOUT -ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} -ARG PGIS1_GEOS_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir geos \ - && cd geos \ - && git init \ - && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GEOS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ - echo "GEOS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_geos_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/geos - - -FROM builder as stage0-builder - -COPY --from=cgal-sfcgal-builder /_pgis*.* / -COPY --from=cgal-sfcgal-builder /usr/local /usr/local - -COPY --from=proj-builder /_pgis*.* / -COPY --from=proj-builder /usr/local /usr/local - -COPY --from=geos-builder /_pgis*.* / -COPY --from=geos-builder /usr/local /usr/local -# gdal -ARG PGIS1_GDAL_REPOSITORY -ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} -ARG PGIS1_GDAL_CHECKOUT -ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -ARG PGIS1_GDAL_CHECKOUT_SHA1 - - - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Automatically determine the latest PGIS1 Arrow version and SOVERSION - && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ - && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ - && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ - && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ - && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - # Backup the version variables - reusing in a later stage - && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ - && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ - # Install Arrow C++ - && apt-get install -y --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ - \ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libheif-dev \ - libkml-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libpng-dev \ - libqhull-dev \ - libspatialite-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -## GDAL_build-end - -RUN set -eux \ - && ldconfig \ - && cd /usr/src \ - && mkdir gdal \ - && cd gdal \ - && git init \ - && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GDAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ - echo "GDAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_gdal_last_commit.txt \ - \ - # gdal project directory structure - has been changed ! - && if [ -d "gdal" ] ; then \ - echo "Directory 'gdal' dir exists -> older version!" ; \ - cd gdal ; \ - else \ - echo "Directory 'gdal' does not exists! Newer version! " ; \ - fi \ - \ - && if [ -f "./autogen.sh" ]; then \ - # Building with autoconf ( old/deprecated ) - set -eux \ - && ./autogen.sh \ - && ./configure --disable-static \ - ; \ - else \ - # Building with cmake - set -eux \ - && mkdir build \ - && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DBUILD_TESTING=OFF \ - -DBUILD_DOCS=OFF \ - \ - -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ - -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ - -DGDAL_USE_GEOS=ON \ - -DGDAL_USE_JSONC=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LIBXML2=ON \ - -DGDAL_USE_LZ4=ON \ - -DGDAL_USE_POSTGRESQL=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ - \ - -DGDAL_USE_ARROW=ON \ - -DGDAL_USE_ARROWDATASET=ON \ - -DGDAL_USE_BLOSC=ON \ - -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_FREEXL=ON \ - -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_HDF5=ON \ - -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_LERC_INTERNAL=ON \ - -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_NETCDF=ON \ - -DGDAL_USE_OPENJPEG=ON \ - -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_PNG=ON \ - -DGDAL_USE_QHULL=ON \ - -DGDAL_USE_SPATIALITE=ON \ - ; \ - fi \ - \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/gdal - -# Minimal command line test. -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - && pcre-config --version - -# ------------------------------------------- -# final stage -# ------------------------------------------- -FROM ${PGIS1_BASE_IMAGE} - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17rc1-master spatial database extension with PostgreSQL 17rc1 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ARG PGIS1_CMAKE_BUILD_TYPE -ARG PGIS1_BASE_IMAGE -ARG PGIS1_BOOST_VERSION - -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ - PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -RUN set -eux \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libpcre3 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage0-builder /_pgis*.* / -COPY --from=stage0-builder /usr/local /usr/local - -# Install Arrow + Parquet + other GDAL extra dependencies - -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Load the PGIS1_ARROW version variables - && . /_pgis1_arrow_environment.env \ - # Use the PGIS1_ARROW_SOVERSION as needed - && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libcrypto++8 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libpng16-16 \ - libqhull-r8.0 \ - librasterlite2-1 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -ARG PGIS1_GDAL_CHECKOUT -ARG PGIS1_GDAL_REPOSITORY -ARG PGIS1_GEOS_CHECKOUT -ARG PGIS1_GEOS_REPOSITORY -ARG PGIS1_PROJ_CHECKOUT -ARG PGIS1_PROJ_REPOSITORY -ARG PGIS1_SFCGAL_CHECKOUT -ARG PGIS1_SFCGAL_REPOSITORY -ARG PGIS1_CGAL_REPOSITORY -ARG PGIS1_CGAL_CHECKOUT - -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ - PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ - PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ - PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ - PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ - PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ - PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ - PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ - PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ - PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ - PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ - PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} - -# Minimal command line test ( fail fast ) -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - \ - # Testing ogr2ogr PostgreSQL driver. - && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ - || echo "ogr2ogr missing PostgreSQL driver" && exit 1 - -# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; -# The arm64 build is very senitive. -ENV GDAL_CONFIG /usr/local/bin/gdal-config -ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - -# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables -# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 -RUN set -eux \ - && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcunit1-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && cd \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping POSTGIS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ - echo "POSTGIS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_last_commit.txt \ - && ldconfig \ - && ./autogen.sh \ -# configure options taken from: -# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ -# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && if command -v projsync >/dev/null 2>&1; then \ - projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn ; \ - fi \ -# regress check - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && ldconfig \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# clean - && cd / \ - && rm -rf /usr/src/postgis \ - && apt-get purge -y --autoremove \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - -# last final test -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - # check any missing dependencies - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ - \ - # Is the "ca-certificates" package installed? (for accessing remote raster files) - # https://github.com/postgis/docker-postgis/issues/307 - && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ - \ - # list last commits. - && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ - # list postgresql, postgis version - && cat _pgis_full_version.txt diff --git a/17rc1-master/bookworm/initdb-postgis.sh b/17rc1-master/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/17rc1-master/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/17rc1-master/bookworm/tags b/17rc1-master/bookworm/tags deleted file mode 100644 index ff1490101..000000000 --- a/17rc1-master/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-master-bookworm 17rc1-master diff --git a/17rc1-master/bookworm/update-postgis.sh b/17rc1-master/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/17rc1-master/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile deleted file mode 100644 index 060b6443b..000000000 --- a/17rc1-recent/bookworm/Dockerfile +++ /dev/null @@ -1,730 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -# "Experimental"; solely for testing purposes. Anticipate frequent changes! -# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. - -ARG PGIS1_BASE_IMAGE=postgres:17rc1-bookworm - -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git -ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git -ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git -ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git -ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git - -# Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 - -# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' -# Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf -ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc -ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c - -ARG PGIS1_BOOST_VERSION=1.74.0 -ARG PGIS1_CMAKE_BUILD_TYPE=Release - -ARG PGIS1_GDAL_BUILD=with_extra -# Full GDAL build ; with arrow, parquet and extra dependencies - -FROM ${PGIS1_BASE_IMAGE} as builder - -WORKDIR / - -ARG PGIS1_BOOST_VERSION -ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -# apt-get install -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - # build dependency - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libpq-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - make \ - pkg-config \ - protobuf-c-compiler \ - xsltproc \ - # gdal+ - liblz4-dev \ - liblzma-dev \ - libwebp-dev \ - libzstd-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ARG PGIS1_CMAKE_BUILD_TYPE -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} - -FROM builder as cgal-sfcgal-builder - -# cgal & sfcgal -ARG PGIS1_SFCGAL_REPOSITORY -ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} -ARG PGIS1_SFCGAL_CHECKOUT -ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} -ARG PGIS1_SFCGAL_CHECKOUT_SHA1 - -ARG PGIS1_CGAL_REPOSITORY -ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} -ARG PGIS1_CGAL_CHECKOUT -ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} -ARG PGIS1_CGAL_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir cgal \ - && cd cgal \ - && git init \ - && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping CGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ - echo "CGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_cgal_last_commit.txt \ - && cd /usr/src \ - && mkdir SFCGAL \ - && cd SFCGAL \ - && git init \ - && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping SFCGAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ - echo "SFCGAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_sfcgal_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. \ - -DCGAL_DIR=/usr/src/cgal \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DSFCGAL_BUILD_BENCH=OFF \ - -DSFCGAL_BUILD_EXAMPLES=OFF \ - -DSFCGAL_BUILD_TESTS=OFF \ - -DSFCGAL_WITH_OSG=OFF \ - && make -j$(nproc) \ - && make install \ - # clean - && rm -fr /usr/src/SFCGAL \ - && rm -fr /usr/src/cgal - - -FROM builder as proj-builder - -# proj -ARG PGIS1_PROJ_REPOSITORY -ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} -ARG PGIS1_PROJ_CHECKOUT -ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} -ARG PGIS1_PROJ_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir PROJ \ - && cd PROJ \ - && git init \ - && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 - && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping PROJ SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ - echo "PROJ SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_proj_last_commit.txt \ - # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 - && if [ -f "autogen.sh" ] ; then \ - set -eux \ - && echo "autotools version: 'autogen.sh' exists! Older version!" \ - && ./autogen.sh \ - && ./configure --disable-static \ - && make -j$(nproc) \ - && make install \ - ; \ - else \ - set -eux \ - && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - ; \ - fi \ - \ - && rm -fr /usr/src/PROJ - - -FROM builder as geos-builder - -# geos -ARG PGIS1_GEOS_REPOSITORY -ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} -ARG PGIS1_GEOS_CHECKOUT -ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} -ARG PGIS1_GEOS_CHECKOUT_SHA1 - -RUN set -eux \ - && cd /usr/src \ - && mkdir geos \ - && cd geos \ - && git init \ - && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GEOS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ - echo "GEOS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_geos_last_commit.txt \ - && mkdir cmake-build \ - && cd cmake-build \ - && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/geos - - -FROM builder as stage0-builder - -COPY --from=cgal-sfcgal-builder /_pgis*.* / -COPY --from=cgal-sfcgal-builder /usr/local /usr/local - -COPY --from=proj-builder /_pgis*.* / -COPY --from=proj-builder /usr/local /usr/local - -COPY --from=geos-builder /_pgis*.* / -COPY --from=geos-builder /usr/local /usr/local -# gdal -ARG PGIS1_GDAL_REPOSITORY -ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} -ARG PGIS1_GDAL_CHECKOUT -ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} -ARG PGIS1_GDAL_CHECKOUT_SHA1 - - - -# Install Arrow C++ -# also check the "Build final image" section too, for the final installation -RUN set -eux \ - # add backports \ - && apt-get update \ - && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Automatically determine the latest PGIS1 Arrow version and SOVERSION - && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ - && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ - && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ - && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ - && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - # Backup the version variables - reusing in a later stage - && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ - && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ - # Install Arrow C++ - && apt-get install -y --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - libarrow-dev=${PGIS1_ARROW_VERSION} \ - libparquet-dev=${PGIS1_ARROW_VERSION} \ - libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ - libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ - \ - libblosc-dev \ - libcfitsio-dev \ - libfreexl-dev \ - libfyba-dev \ - libhdf5-dev \ - libheif-dev \ - libkml-dev \ - libnetcdf-dev \ - libopenjp2-7-dev \ - libpng-dev \ - libqhull-dev \ - libspatialite-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -## GDAL_build-end - -RUN set -eux \ - && ldconfig \ - && cd /usr/src \ - && mkdir gdal \ - && cd gdal \ - && git init \ - && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 - && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping GDAL SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ - echo "GDAL SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_gdal_last_commit.txt \ - \ - # gdal project directory structure - has been changed ! - && if [ -d "gdal" ] ; then \ - echo "Directory 'gdal' dir exists -> older version!" ; \ - cd gdal ; \ - else \ - echo "Directory 'gdal' does not exists! Newer version! " ; \ - fi \ - \ - && if [ -f "./autogen.sh" ]; then \ - # Building with autoconf ( old/deprecated ) - set -eux \ - && ./autogen.sh \ - && ./configure --disable-static \ - ; \ - else \ - # Building with cmake - set -eux \ - && mkdir build \ - && cd build \ - # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules - && cmake .. \ - -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - -DBUILD_TESTING=OFF \ - -DBUILD_DOCS=OFF \ - \ - -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ - -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ - -DGDAL_USE_CURL=ON \ - -DGDAL_USE_DEFLATE=ON \ - -DGDAL_USE_EXPAT=ON \ - -DGDAL_USE_GEOS=ON \ - -DGDAL_USE_JSONC=ON \ - -DGDAL_USE_LIBLZMA=ON \ - -DGDAL_USE_LIBXML2=ON \ - -DGDAL_USE_LZ4=ON \ - -DGDAL_USE_POSTGRESQL=ON \ - -DGDAL_USE_SQLITE3=ON \ - -DGDAL_USE_TIFF=ON \ - -DGDAL_USE_WEBP=ON \ - -DGDAL_USE_ZLIB=ON \ - -DGDAL_USE_ZSTD=ON \ - \ - -DGDAL_USE_ARROW=ON \ - -DGDAL_USE_ARROWDATASET=ON \ - -DGDAL_USE_BLOSC=ON \ - -DGDAL_USE_CFITSIO=ON \ - -DGDAL_USE_FREEXL=ON \ - -DGDAL_USE_FYBA=ON \ - -DGDAL_USE_HDF5=ON \ - -DGDAL_USE_HEIF=ON \ - -DGDAL_USE_LERC_INTERNAL=ON \ - -DGDAL_USE_LIBKML=ON \ - -DGDAL_USE_NETCDF=ON \ - -DGDAL_USE_OPENJPEG=ON \ - -DGDAL_USE_PARQUET=ON \ - -DGDAL_USE_PNG=ON \ - -DGDAL_USE_QHULL=ON \ - -DGDAL_USE_SPATIALITE=ON \ - ; \ - fi \ - \ - && make -j$(nproc) \ - && make install \ - && cd / \ - && rm -fr /usr/src/gdal - -# Minimal command line test. -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - && pcre-config --version - -# ------------------------------------------- -# final stage -# ------------------------------------------- -FROM ${PGIS1_BASE_IMAGE} - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - 17rc1-recent spatial database extension with PostgreSQL 17rc1 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ARG PGIS1_CMAKE_BUILD_TYPE -ARG PGIS1_BASE_IMAGE -ARG PGIS1_BOOST_VERSION - -ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ - PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ - PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} - -RUN set -eux \ - && apt-get update \ - && apt-get install -y -V --no-install-recommends \ - \ - curl \ - libboost-atomic${PGIS1_BOOST_VERSION} \ - libboost-chrono${PGIS1_BOOST_VERSION} \ - libboost-date-time${PGIS1_BOOST_VERSION} \ - libboost-filesystem${PGIS1_BOOST_VERSION} \ - libboost-program-options${PGIS1_BOOST_VERSION} \ - libboost-serialization${PGIS1_BOOST_VERSION} \ - libboost-system${PGIS1_BOOST_VERSION} \ - libboost-test${PGIS1_BOOST_VERSION} \ - libboost-thread${PGIS1_BOOST_VERSION} \ - libboost-timer${PGIS1_BOOST_VERSION} \ - libcurl3-gnutls \ - libexpat1 \ - libgmp10 \ - libgmpxx4ldbl \ - libjson-c5 \ - libmpfr6 \ - libpcre3 \ - libprotobuf-c1 \ - libtiff6 \ - libxml2 \ - sqlite3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage0-builder /_pgis*.* / -COPY --from=stage0-builder /usr/local /usr/local - -# Install Arrow + Parquet + other GDAL extra dependencies - -RUN set -eux \ - # Install Arrow + Parquet - && apt-get update \ - && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ - && apt-get update \ - # Load the PGIS1_ARROW version variables - && . /_pgis1_arrow_environment.env \ - # Use the PGIS1_ARROW_SOVERSION as needed - && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ - && apt-get install -y -V --no-install-recommends \ - libarrow${PGIS1_ARROW_SOVERSION} \ - libparquet${PGIS1_ARROW_SOVERSION} \ - libarrow-dataset${PGIS1_ARROW_SOVERSION} \ - \ - # Install GDAL extra dependencies - libblosc1 \ - libcrypto++8 \ - libfreexl1 \ - libfyba0 \ - libhdf5-103-1 \ - libheif1 \ - libkmlbase1 \ - libkmldom1 \ - libkmlengine1 \ - libnetcdf19 \ - libopenjp2-7 \ - libpng16-16 \ - libqhull-r8.0 \ - librasterlite2-1 \ - libspatialite7 \ - netcdf-bin \ - libcfitsio10 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - -ARG PGIS1_GDAL_CHECKOUT -ARG PGIS1_GDAL_REPOSITORY -ARG PGIS1_GEOS_CHECKOUT -ARG PGIS1_GEOS_REPOSITORY -ARG PGIS1_PROJ_CHECKOUT -ARG PGIS1_PROJ_REPOSITORY -ARG PGIS1_SFCGAL_CHECKOUT -ARG PGIS1_SFCGAL_REPOSITORY -ARG PGIS1_CGAL_REPOSITORY -ARG PGIS1_CGAL_CHECKOUT - -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ - PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ - PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ - PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ - PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ - PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ - PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ - PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ - PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ - PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ - PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ - PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} - -# Minimal command line test ( fail fast ) -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - \ - # Testing ogr2ogr PostgreSQL driver. - && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ - || echo "ogr2ogr missing PostgreSQL driver" && exit 1 - -# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; -# The arm64 build is very senitive. -ENV GDAL_CONFIG /usr/local/bin/gdal-config -ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH - -# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables -# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 -RUN set -eux \ - && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - ca-certificates \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcunit1-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && cd \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' - # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 - && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ - || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ - echo "Skipping POSTGIS SHA1 check"; \ - else \ - if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ - echo "POSTGIS SHA1 problem! Stop!"; \ - exit 1; \ - fi; \ - fi \ - && git log -1 > /_pgis_last_commit.txt \ - && ldconfig \ - && ./autogen.sh \ -# configure options taken from: -# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ -# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 - && if command -v projsync >/dev/null 2>&1; then \ - projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn ; \ - fi \ -# regress check - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && ldconfig \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# clean - && cd / \ - && rm -rf /usr/src/postgis \ - && apt-get purge -y --autoremove \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - docbook-xml \ - docbook5-xml \ - g++ \ - git \ - libboost-all-dev \ - libcurl4-gnutls-dev \ - libgmp-dev \ - libjson-c-dev \ - libmpfr-dev \ - libpcre3-dev \ - libprotobuf-c-dev \ - libsqlite3-dev \ - libtiff-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - pkg-config \ - postgresql-server-dev-$PG_MAJOR \ - protobuf-c-compiler \ - xsltproc \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin - -# last final test -RUN set -eux \ - && ldconfig \ - && cs2cs \ - && ldd $(which gdalinfo) \ - && gdalinfo --version \ - && gdal-config --formats \ - && geos-config --version \ - && ogr2ogr --version \ - && proj \ - && sfcgal-config --version \ - # check any missing dependencies - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ - \ - # Is the "ca-certificates" package installed? (for accessing remote raster files) - # https://github.com/postgis/docker-postgis/issues/307 - && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ - \ - # list last commits. - && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ - # list postgresql, postgis version - && cat _pgis_full_version.txt diff --git a/17rc1-recent/bookworm/initdb-postgis.sh b/17rc1-recent/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/17rc1-recent/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/17rc1-recent/bookworm/tags b/17rc1-recent/bookworm/tags deleted file mode 100644 index 9ec93eee0..000000000 --- a/17rc1-recent/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent diff --git a/17rc1-recent/bookworm/update-postgis.sh b/17rc1-recent/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/17rc1-recent/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/README.md b/README.md index b3e7d8ccb..8439ee6c2 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-24) +## Versions (2024-09-28) We provide multi-platform image support for the following architectures: @@ -71,11 +71,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.2 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.2 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.2 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | +| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.3 | +| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.3 | +| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.3 | +| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.3 | +| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.3 | ### 📘Debian - bullseye @@ -87,11 +87,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.2 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.2 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.2 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.2 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.2 | +| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.3 | +| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.3 | +| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.3 | +| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.3 | +| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.3 | @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-bookworm), [`15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`15-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | ### 🧪Debian Geo Bundle ( experimental ) @@ -118,8 +118,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.2-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.2 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.2-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.2 | +| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.3 | +| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.3 | @@ -133,10 +133,16 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.3 | +| [`12-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.19), [`12-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0 | | [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.3 | +| [`13-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.19), [`13-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0 | | [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.3 | +| [`14-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.19), [`14-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0 | | [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.3 | +| [`15-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.19), [`15-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0 | | [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.3 | +| [`16-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.19), [`16-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0 | +| [`17-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.19), [`17-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17 | 3.5.0 | ### ⛰️Alpine 3.20 based @@ -150,14 +156,21 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.7-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.7 | | [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3 | +| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-alpine3.20), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0 | | [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.7-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.7 | | [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3 | +| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-alpine3.20), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0 | | [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.7-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.7 | | [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3 | +| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-alpine3.20), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0 | | [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.7-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.7 | | [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3 | +| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-alpine3.20), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0 | | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.7-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.7 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | +| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-alpine3.20), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0 | +| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.3-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.3 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.0 | @@ -181,25 +194,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0rc1 | -| [`12-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine3.20), [`12-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0rc1 | -| [`13-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0rc1 | -| [`13-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine3.20), [`13-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0rc1 | -| [`14-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0rc1 | -| [`14-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine3.20), [`14-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0rc1 | -| [`15-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0rc1 | -| [`15-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine3.20), [`15-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0rc1 | -| [`15-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master-bookworm), [`15-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`16-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0rc1 | -| [`16-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine3.20), [`16-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0rc1 | -| [`16-l3.5.0rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0rc1-bookworm), [`16-l3.5.0rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-l3.5.0rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-l3.5.0rc1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | null | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17rc1-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine3.20), [`17rc1-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4.3-alpine3.20), [`17rc1-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.4.3 | -| [`17rc1-3.5.0rc1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17rc1 | 3.5.0rc1 | -| [`17rc1-3.5.0rc1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine3.20), [`17rc1-3.5.0rc1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-3.5.0rc1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17rc1 | 3.5.0rc1 | -| [`17rc1-l3.5.0rc1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0rc1-bookworm), [`17rc1-l3.5.0rc1`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-l3.5.0rc1) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-l3.5.0rc1/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | null | -| [`17rc1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master-bookworm), [`17rc1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | development: postgis, geos, proj, gdal, cgal, sfcgal | -| [`17rc1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-bookworm), [`17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17rc1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17rc1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17rc1-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17rc1 | postgis=tags/3.4.3, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`17-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master-bookworm), [`17-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | development: postgis, geos, proj, gdal, cgal, sfcgal | ## 🚀Usage diff --git a/locked.yml b/locked.yml index b2ca79f9c..f87be0b85 100644 --- a/locked.yml +++ b/locked.yml @@ -32,55 +32,3 @@ CGAL_CHECKOUT: 'tags/v5.6' CGAL_CHECKOUT_SHA1: 'de4fa0d7d57b5a997012f2804161386ff4bc0d0f' BOOST_VERSION: '1.74.0' - -'16-l3.5.0rc1': - 'bookworm': - _comment: "source: ./locked.yml" - arch: 'amd64 arm64' - BOOST_VERSION: '1.74.0' - CGAL_CHECKOUT_SHA1: '188e51bad36ffc30e49dbabda29620b71a84664c' - CGAL_CHECKOUT: 'tags/v5.6.1' - GDAL_BUILD: 'with_extra' - GDAL_CHECKOUT_SHA1: '3aae5b4cf30c958ab339157b4f8115922e2f2562' - GDAL_CHECKOUT: 'tags/v3.9.2' - GEOS_CHECKOUT_SHA1: 'd7957246c588aa9c690efe67924fd70e741a06ab' - GEOS_CHECKOUT: 'tags/3.13.0' - initfile: 'initdb-postgis.sh' - PG_DOCKER: '16' - PG_MAJOR: '16' - POSTGIS_CHECKOUT_SHA1: 'df9317741170e86ff8346decdd555b54a0432072' - POSTGIS_CHECKOUT: 'tags/3.5.0rc1' - postgis: 'l3.5.0rc1' - PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' - PROJ_CHECKOUT: 'tags/9.5.0' - readme_group: 'test' - SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' - SFCGAL_CHECKOUT: 'tags/v1.5.2' - tags: '16-l3.5.0rc1-bookworm 16-l3.5.0rc1' - template: 'Dockerfile.master.template' - -'17rc1-l3.5.0rc1': - 'bookworm': - _comment: "source: ./locked.yml" - arch: 'amd64 arm64' - BOOST_VERSION: '1.74.0' - CGAL_CHECKOUT_SHA1: '188e51bad36ffc30e49dbabda29620b71a84664c' - CGAL_CHECKOUT: 'tags/v5.6.1' - GDAL_BUILD: 'with_extra' - GDAL_CHECKOUT_SHA1: '3aae5b4cf30c958ab339157b4f8115922e2f2562' - GDAL_CHECKOUT: 'tags/v3.9.2' - GEOS_CHECKOUT_SHA1: 'd7957246c588aa9c690efe67924fd70e741a06ab' - GEOS_CHECKOUT: 'tags/3.13.0' - initfile: 'initdb-postgis.sh' - PG_DOCKER: '17rc1' - PG_MAJOR: '17rc1' - POSTGIS_CHECKOUT_SHA1: 'df9317741170e86ff8346decdd555b54a0432072' - POSTGIS_CHECKOUT: 'tags/3.5.0rc1' - postgis: 'l3.5.0rc1' - PROJ_CHECKOUT_SHA1: '0a407325fbb5bf42407a7dc5d4f948be9707e302' - PROJ_CHECKOUT: 'tags/9.5.0' - readme_group: 'test' - SFCGAL_CHECKOUT_SHA1: '5584600ad7ed512f158b297476f57ed5fcf9c8dc' - SFCGAL_CHECKOUT: 'tags/v1.5.2' - tags: '17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1' - template: 'Dockerfile.master.template' diff --git a/manifest.sh b/manifest.sh index c2e7b0dc2..b1d680c0e 100755 --- a/manifest.sh +++ b/manifest.sh @@ -74,11 +74,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ --target ${dockername}:12-3.4-bookworm || true -echo "manifest: ${dockername}:12-3.4.2-bookworm" +echo "manifest: ${dockername}:12-3.4.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-bookworm \ - --target ${dockername}:12-3.4.2-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.4.3-bookworm \ + --target ${dockername}:12-3.4.3-bookworm || true echo "manifest: ${dockername}:12-3.4" manifest-tool push from-args \ @@ -94,33 +94,45 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ --target ${dockername}:12-3.4-bullseye || true -echo "manifest: ${dockername}:12-3.4.2-bullseye" +echo "manifest: ${dockername}:12-3.4.3-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.2-bullseye \ - --target ${dockername}:12-3.4.2-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.4.3-bullseye \ + --target ${dockername}:12-3.4.3-bullseye || true # ----- 12-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:12-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:12-3.5-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine3.19 \ - --target ${dockername}:12-3.5.0rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.19 \ + --target ${dockername}:12-3.5-alpine3.19 || true + +echo "manifest: ${dockername}:12-3.5.0-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0-alpine3.19 \ + --target ${dockername}:12-3.5.0-alpine3.19 || true # ----- 12-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:12-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:12-3.5-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine3.20 \ - --target ${dockername}:12-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.20 \ + --target ${dockername}:12-3.5-alpine3.20 || true -echo "manifest: ${dockername}:12-3.5.0rc1-alpine" +echo "manifest: ${dockername}:12-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0rc1-alpine \ - --target ${dockername}:12-3.5.0rc1-alpine || true + --template ${dockername}-ARCHVARIANT:12-3.5.0-alpine3.20 \ + --target ${dockername}:12-3.5.0-alpine3.20 || true + +echo "manifest: ${dockername}:12-3.5-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5-alpine \ + --target ${dockername}:12-3.5-alpine || true # ----- 13-3.3-alpine3.20 ----- @@ -184,11 +196,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ --target ${dockername}:13-3.4-bookworm || true -echo "manifest: ${dockername}:13-3.4.2-bookworm" +echo "manifest: ${dockername}:13-3.4.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-bookworm \ - --target ${dockername}:13-3.4.2-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.4.3-bookworm \ + --target ${dockername}:13-3.4.3-bookworm || true echo "manifest: ${dockername}:13-3.4" manifest-tool push from-args \ @@ -204,33 +216,45 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ --target ${dockername}:13-3.4-bullseye || true -echo "manifest: ${dockername}:13-3.4.2-bullseye" +echo "manifest: ${dockername}:13-3.4.3-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.2-bullseye \ - --target ${dockername}:13-3.4.2-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.4.3-bullseye \ + --target ${dockername}:13-3.4.3-bullseye || true # ----- 13-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:13-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:13-3.5-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.19 \ + --target ${dockername}:13-3.5-alpine3.19 || true + +echo "manifest: ${dockername}:13-3.5.0-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine3.19 \ - --target ${dockername}:13-3.5.0rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.5.0-alpine3.19 \ + --target ${dockername}:13-3.5.0-alpine3.19 || true # ----- 13-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:13-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:13-3.5-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine3.20 \ - --target ${dockername}:13-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.20 \ + --target ${dockername}:13-3.5-alpine3.20 || true -echo "manifest: ${dockername}:13-3.5.0rc1-alpine" +echo "manifest: ${dockername}:13-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0rc1-alpine \ - --target ${dockername}:13-3.5.0rc1-alpine || true + --template ${dockername}-ARCHVARIANT:13-3.5.0-alpine3.20 \ + --target ${dockername}:13-3.5.0-alpine3.20 || true + +echo "manifest: ${dockername}:13-3.5-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-alpine \ + --target ${dockername}:13-3.5-alpine || true # ----- 14-3.3-alpine3.20 ----- @@ -294,11 +318,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ --target ${dockername}:14-3.4-bookworm || true -echo "manifest: ${dockername}:14-3.4.2-bookworm" +echo "manifest: ${dockername}:14-3.4.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-bookworm \ - --target ${dockername}:14-3.4.2-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.4.3-bookworm \ + --target ${dockername}:14-3.4.3-bookworm || true echo "manifest: ${dockername}:14-3.4" manifest-tool push from-args \ @@ -314,33 +338,45 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ --target ${dockername}:14-3.4-bullseye || true -echo "manifest: ${dockername}:14-3.4.2-bullseye" +echo "manifest: ${dockername}:14-3.4.3-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.2-bullseye \ - --target ${dockername}:14-3.4.2-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.4.3-bullseye \ + --target ${dockername}:14-3.4.3-bullseye || true # ----- 14-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:14-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:14-3.5-alpine3.19" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.19 \ + --target ${dockername}:14-3.5-alpine3.19 || true + +echo "manifest: ${dockername}:14-3.5.0-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine3.19 \ - --target ${dockername}:14-3.5.0rc1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.5.0-alpine3.19 \ + --target ${dockername}:14-3.5.0-alpine3.19 || true # ----- 14-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:14-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:14-3.5-alpine3.20" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.20 \ + --target ${dockername}:14-3.5-alpine3.20 || true + +echo "manifest: ${dockername}:14-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine3.20 \ - --target ${dockername}:14-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.5.0-alpine3.20 \ + --target ${dockername}:14-3.5.0-alpine3.20 || true -echo "manifest: ${dockername}:14-3.5.0rc1-alpine" +echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0rc1-alpine \ - --target ${dockername}:14-3.5.0rc1-alpine || true + --template ${dockername}-ARCHVARIANT:14-3.5-alpine \ + --target ${dockername}:14-3.5-alpine || true # ----- 14-l3.1.9gcp-bookworm ----- @@ -418,11 +454,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ --target ${dockername}:15-3.4-bookworm || true -echo "manifest: ${dockername}:15-3.4.2-bookworm" +echo "manifest: ${dockername}:15-3.4.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-bookworm \ - --target ${dockername}:15-3.4.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.3-bookworm \ + --target ${dockername}:15-3.4.3-bookworm || true echo "manifest: ${dockername}:15-3.4" manifest-tool push from-args \ @@ -438,11 +474,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ --target ${dockername}:15-3.4-bullseye || true -echo "manifest: ${dockername}:15-3.4.2-bullseye" +echo "manifest: ${dockername}:15-3.4.3-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-bullseye \ - --target ${dockername}:15-3.4.2-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.4.3-bullseye \ + --target ${dockername}:15-3.4.3-bullseye || true # ----- 15-3.4-bundle0-bookworm ----- @@ -452,11 +488,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ --target ${dockername}:15-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:15-3.4.2-bundle0-bookworm" +echo "manifest: ${dockername}:15-3.4.3-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.2-bundle0-bookworm \ - --target ${dockername}:15-3.4.2-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.4.3-bundle0-bookworm \ + --target ${dockername}:15-3.4.3-bundle0-bookworm || true echo "manifest: ${dockername}:15-3.4-bundle0" manifest-tool push from-args \ @@ -466,65 +502,37 @@ manifest-tool push from-args \ # ----- 15-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:15-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:15-3.5-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine3.19 \ - --target ${dockername}:15-3.5.0rc1-alpine3.19 || true - -# ----- 15-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.19 \ + --target ${dockername}:15-3.5-alpine3.19 || true -echo "manifest: ${dockername}:15-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:15-3.5.0-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine3.20 \ - --target ${dockername}:15-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.5.0-alpine3.19 \ + --target ${dockername}:15-3.5.0-alpine3.19 || true -echo "manifest: ${dockername}:15-3.5.0rc1-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0rc1-alpine \ - --target ${dockername}:15-3.5.0rc1-alpine || true - -# ----- 15-master-bookworm ----- - -echo "manifest: ${dockername}:15-master-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-master-bookworm \ - --target ${dockername}:15-master-bookworm || true - -echo "manifest: ${dockername}:15-master" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-master \ - --target ${dockername}:15-master || true - -# ----- 15-recent-bookworm ----- - -echo "manifest: ${dockername}:15-recent-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-bookworm \ - --target ${dockername}:15-recent-bookworm || true +# ----- 15-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:15-3.5-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.20 \ + --target ${dockername}:15-3.5-alpine3.20 || true -echo "manifest: ${dockername}:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:15-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.5.0-alpine3.20 \ + --target ${dockername}:15-3.5.0-alpine3.20 || true -echo "manifest: ${dockername}:15-recent" +echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-recent \ - --target ${dockername}:15-recent || true + --template ${dockername}-ARCHVARIANT:15-3.5-alpine \ + --target ${dockername}:15-3.5-alpine || true # ----- 16-3.3-alpine3.20 ----- @@ -580,12 +588,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ --target ${dockername}:16-3.4-alpine || true -echo "manifest: ${dockername}:alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:alpine \ - --target ${dockername}:alpine || true - # ----- 16-3.4-bookworm ----- echo "manifest: ${dockername}:16-3.4-bookworm" @@ -594,11 +596,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ --target ${dockername}:16-3.4-bookworm || true -echo "manifest: ${dockername}:16-3.4.2-bookworm" +echo "manifest: ${dockername}:16-3.4.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-bookworm \ - --target ${dockername}:16-3.4.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.3-bookworm \ + --target ${dockername}:16-3.4.3-bookworm || true echo "manifest: ${dockername}:16-3.4" manifest-tool push from-args \ @@ -606,12 +608,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4 \ --target ${dockername}:16-3.4 || true -echo "manifest: ${dockername}:latest" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:latest \ - --target ${dockername}:latest || true - # ----- 16-3.4-bullseye ----- echo "manifest: ${dockername}:16-3.4-bullseye" @@ -620,11 +616,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ --target ${dockername}:16-3.4-bullseye || true -echo "manifest: ${dockername}:16-3.4.2-bullseye" +echo "manifest: ${dockername}:16-3.4.3-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-bullseye \ - --target ${dockername}:16-3.4.2-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.4.3-bullseye \ + --target ${dockername}:16-3.4.3-bullseye || true # ----- 16-3.4-bundle0-bookworm ----- @@ -634,11 +630,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ --target ${dockername}:16-3.4-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.4.2-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.4.3-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.2-bundle0-bookworm \ - --target ${dockername}:16-3.4.2-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.4.3-bundle0-bookworm \ + --target ${dockername}:16-3.4.3-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.4-bundle0" manifest-tool push from-args \ @@ -646,47 +642,39 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ --target ${dockername}:16-3.4-bundle0 || true -echo "manifest: ${dockername}:bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:bundle0 \ - --target ${dockername}:bundle0 || true - # ----- 16-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:16-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:16-3.5-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine3.19 \ - --target ${dockername}:16-3.5.0rc1-alpine3.19 || true - -# ----- 16-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.19 \ + --target ${dockername}:16-3.5-alpine3.19 || true -echo "manifest: ${dockername}:16-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:16-3.5.0-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine3.20 \ - --target ${dockername}:16-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.5.0-alpine3.19 \ + --target ${dockername}:16-3.5.0-alpine3.19 || true + +# ----- 16-3.5-alpine3.20 ----- -echo "manifest: ${dockername}:16-3.5.0rc1-alpine" +echo "manifest: ${dockername}:16-3.5-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0rc1-alpine \ - --target ${dockername}:16-3.5.0rc1-alpine || true - -# ----- 16-l3.5.0rc1-bookworm ----- + --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.20 \ + --target ${dockername}:16-3.5-alpine3.20 || true -echo "manifest: ${dockername}:16-l3.5.0rc1-bookworm" +echo "manifest: ${dockername}:16-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-l3.5.0rc1-bookworm \ - --target ${dockername}:16-l3.5.0rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.0-alpine3.20 \ + --target ${dockername}:16-3.5.0-alpine3.20 || true -echo "manifest: ${dockername}:16-l3.5.0rc1" +echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-l3.5.0rc1 \ - --target ${dockername}:16-l3.5.0rc1 || true + --template ${dockername}-ARCHVARIANT:16-3.5-alpine \ + --target ${dockername}:16-3.5-alpine || true # ----- 16-master-bookworm ----- @@ -710,17 +698,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -728,104 +716,108 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent \ --target ${dockername}:16-recent || true -echo "manifest: ${dockername}:recent" +# ----- 17-3.4-alpine3.20 ----- + +echo "manifest: ${dockername}:17-3.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:recent \ - --target ${dockername}:recent || true - -# ----- 17rc1-3.4-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:17-3.4-alpine3.20 \ + --target ${dockername}:17-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17rc1-3.4-alpine3.20" +echo "manifest: ${dockername}:17-3.4.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine3.20 \ - --target ${dockername}:17rc1-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.4.3-alpine3.20 \ + --target ${dockername}:17-3.4.3-alpine3.20 || true -echo "manifest: ${dockername}:17rc1-3.4.3-alpine3.20" +echo "manifest: ${dockername}:17-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.4.3-alpine3.20 \ - --target ${dockername}:17rc1-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.4-alpine \ + --target ${dockername}:17-3.4-alpine || true -echo "manifest: ${dockername}:17rc1-3.4-alpine" +echo "manifest: ${dockername}:alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.4-alpine \ - --target ${dockername}:17rc1-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:alpine \ + --target ${dockername}:alpine || true -# ----- 17rc1-3.5-alpine3.19 ----- +# ----- 17-3.5-alpine3.19 ----- -echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine3.19" +echo "manifest: ${dockername}:17-3.5-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine3.19 \ - --target ${dockername}:17rc1-3.5.0rc1-alpine3.19 || true - -# ----- 17rc1-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.19 \ + --target ${dockername}:17-3.5-alpine3.19 || true -echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine3.20" +echo "manifest: ${dockername}:17-3.5.0-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine3.20 \ - --target ${dockername}:17rc1-3.5.0rc1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.5.0-alpine3.19 \ + --target ${dockername}:17-3.5.0-alpine3.19 || true -echo "manifest: ${dockername}:17rc1-3.5.0rc1-alpine" +# ----- 17-3.5-alpine3.20 ----- + +echo "manifest: ${dockername}:17-3.5-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-3.5.0rc1-alpine \ - --target ${dockername}:17rc1-3.5.0rc1-alpine || true - -# ----- 17rc1-l3.5.0rc1-bookworm ----- + --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.20 \ + --target ${dockername}:17-3.5-alpine3.20 || true -echo "manifest: ${dockername}:17rc1-l3.5.0rc1-bookworm" +echo "manifest: ${dockername}:17-3.5.0-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0rc1-bookworm \ - --target ${dockername}:17rc1-l3.5.0rc1-bookworm || true + --template ${dockername}-ARCHVARIANT:17-3.5.0-alpine3.20 \ + --target ${dockername}:17-3.5.0-alpine3.20 || true -echo "manifest: ${dockername}:17rc1-l3.5.0rc1" +echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-l3.5.0rc1 \ - --target ${dockername}:17rc1-l3.5.0rc1 || true + --template ${dockername}-ARCHVARIANT:17-3.5-alpine \ + --target ${dockername}:17-3.5-alpine || true -# ----- 17rc1-master-bookworm ----- +# ----- 17-master-bookworm ----- -echo "manifest: ${dockername}:17rc1-master-bookworm" +echo "manifest: ${dockername}:17-master-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-master-bookworm \ - --target ${dockername}:17rc1-master-bookworm || true + --template ${dockername}-ARCHVARIANT:17-master-bookworm \ + --target ${dockername}:17-master-bookworm || true -echo "manifest: ${dockername}:17rc1-master" +echo "manifest: ${dockername}:17-master" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-master \ - --target ${dockername}:17rc1-master || true + --template ${dockername}-ARCHVARIANT:17-master \ + --target ${dockername}:17-master || true -# ----- 17rc1-recent-bookworm ----- +# ----- 17-recent-bookworm ----- + +echo "manifest: ${dockername}:17-recent-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ + --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17rc1-recent-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent-bookworm \ - --target ${dockername}:17rc1-recent-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm || true -echo "manifest: ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm \ - --target ${dockername}:17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm || true -echo "manifest: ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm \ - --target ${dockername}:17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent \ + --target ${dockername}:17-recent || true -echo "manifest: ${dockername}:17rc1-recent" +echo "manifest: ${dockername}:recent" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17rc1-recent \ - --target ${dockername}:17rc1-recent || true + --template ${dockername}-ARCHVARIANT:recent \ + --target ${dockername}:recent || true diff --git a/versions.json b/versions.json index 42f9d35d2..881a436ec 100644 --- a/versions.json +++ b/versions.json @@ -17,7 +17,7 @@ }, "12-3.4": { "bullseye": { - "tags": "12-3.4-bullseye 12-3.4.2-bullseye", + "tags": "12-3.4-bullseye 12-3.4.3-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "12", @@ -26,10 +26,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" }, "bookworm": { - "tags": "12-3.4-bookworm 12-3.4.2-bookworm 12-3.4", + "tags": "12-3.4-bookworm 12-3.4.3-bookworm 12-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "12", @@ -38,7 +38,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" }, "alpine3.19": { "tags": "12-3.4-alpine3.19 12-3.4.3-alpine3.19", @@ -71,32 +71,32 @@ }, "12-3.5": { "alpine3.19": { - "tags": "12-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "12-3.5-alpine3.19 12-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "12-3.5.0rc1-alpine3.20 12-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "12-3.5-alpine3.20 12-3.5.0-alpine3.20 12-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, "13-3.3": { @@ -117,7 +117,7 @@ }, "13-3.4": { "bullseye": { - "tags": "13-3.4-bullseye 13-3.4.2-bullseye", + "tags": "13-3.4-bullseye 13-3.4.3-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "13", @@ -126,10 +126,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" }, "bookworm": { - "tags": "13-3.4-bookworm 13-3.4.2-bookworm 13-3.4", + "tags": "13-3.4-bookworm 13-3.4.3-bookworm 13-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -138,7 +138,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" }, "alpine3.19": { "tags": "13-3.4-alpine3.19 13-3.4.3-alpine3.19", @@ -171,32 +171,32 @@ }, "13-3.5": { "alpine3.19": { - "tags": "13-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "13-3.5-alpine3.19 13-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "13-3.5.0rc1-alpine3.20 13-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "13-3.5-alpine3.20 13-3.5.0-alpine3.20 13-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, "14-3.3": { @@ -217,7 +217,7 @@ }, "14-3.4": { "bullseye": { - "tags": "14-3.4-bullseye 14-3.4.2-bullseye", + "tags": "14-3.4-bullseye 14-3.4.3-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "14", @@ -226,10 +226,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" }, "bookworm": { - "tags": "14-3.4-bookworm 14-3.4.2-bookworm 14-3.4", + "tags": "14-3.4-bookworm 14-3.4.3-bookworm 14-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -238,7 +238,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" }, "alpine3.19": { "tags": "14-3.4-alpine3.19 14-3.4.3-alpine3.19", @@ -271,32 +271,32 @@ }, "14-3.5": { "alpine3.19": { - "tags": "14-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "14-3.5-alpine3.19 14-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "14-3.5.0rc1-alpine3.20 14-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "14-3.5-alpine3.20 14-3.5.0-alpine3.20 14-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, "15-3.3": { @@ -317,7 +317,7 @@ }, "15-3.4": { "bullseye": { - "tags": "15-3.4-bullseye 15-3.4.2-bullseye", + "tags": "15-3.4-bullseye 15-3.4.3-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "15", @@ -326,10 +326,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" }, "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.2-bookworm 15-3.4", + "tags": "15-3.4-bookworm 15-3.4.3-bookworm 15-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -338,7 +338,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" }, "alpine3.19": { "tags": "15-3.4-alpine3.19 15-3.4.3-alpine3.19", @@ -371,7 +371,7 @@ }, "15-3.4-bundle0": { "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.2-bundle0-bookworm 15-3.4-bundle0", + "tags": "15-3.4-bundle0-bookworm 15-3.4.3-bundle0-bookworm 15-3.4-bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "15", @@ -392,89 +392,37 @@ "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" } }, "15-3.5": { "alpine3.19": { - "tags": "15-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "15-3.5-alpine3.19 15-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "15-3.5.0rc1-alpine3.20 15-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "15-3.5-alpine3.20 15-3.5.0-alpine3.20 15-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" - } - }, - "15-master": { - "bookworm": { - "tags": "15-master-bookworm 15-master", - "postgis": "master", - "readme_group": "test", - "PG_MAJOR": "15", - "PG_DOCKER": "15", - "arch": "amd64 arm64", - "template": "Dockerfile.master.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "master", - "POSTGIS_CHECKOUT_SHA1": "nocheck", - "CGAL_CHECKOUT": "master", - "CGAL_CHECKOUT_SHA1": "nocheck", - "SFCGAL_CHECKOUT": "master", - "SFCGAL_CHECKOUT_SHA1": "nocheck", - "PROJ_CHECKOUT": "master", - "PROJ_CHECKOUT_SHA1": "nocheck", - "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "master", - "GDAL_CHECKOUT_SHA1": "nocheck", - "GEOS_CHECKOUT": "main", - "GEOS_CHECKOUT_SHA1": "nocheck", - "BOOST_VERSION": "1.74.0" - } - }, - "15-recent": { - "bookworm": { - "tags": "15-recent-bookworm 15-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 15-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 15-recent", - "postgis": "recent", - "readme_group": "recent", - "PG_MAJOR": "15", - "PG_DOCKER": "15", - "arch": "amd64 arm64", - "template": "Dockerfile.master.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", - "PROJ_CHECKOUT": "tags/9.5.0", - "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", - "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.2", - "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GEOS_CHECKOUT": "tags/3.13.0", - "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", - "SFCGAL_CHECKOUT": "tags/v1.5.2", - "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", - "CGAL_CHECKOUT": "tags/v5.6.1", - "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", - "BOOST_VERSION": "1.74.0" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, "16-3.3": { @@ -495,7 +443,7 @@ }, "16-3.4": { "bullseye": { - "tags": "16-3.4-bullseye 16-3.4.2-bullseye", + "tags": "16-3.4-bullseye 16-3.4.3-bullseye", "postgis": "3.4", "readme_group": "bullseye", "PG_MAJOR": "16", @@ -504,10 +452,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" }, "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.2-bookworm 16-3.4 latest", + "tags": "16-3.4-bookworm 16-3.4.3-bookworm 16-3.4", "postgis": "3.4", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -516,7 +464,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" }, "alpine3.19": { "tags": "16-3.4-alpine3.19 16-3.4.3-alpine3.19", @@ -533,7 +481,7 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" }, "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine alpine", + "tags": "16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -549,7 +497,7 @@ }, "16-3.4-bundle0": { "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.2-bundle0-bookworm 16-3.4-bundle0 bundle0", + "tags": "16-3.4-bundle0-bookworm 16-3.4.3-bundle0-bookworm 16-3.4-bundle0", "postgis": "3.4", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -570,37 +518,37 @@ "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" } }, "16-3.5": { "alpine3.19": { - "tags": "16-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "16-3.5-alpine3.19 16-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "16-3.5.0rc1-alpine3.20 16-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "16-3.5-alpine3.20 16-3.5.0-alpine3.20 16-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, "16-master": { @@ -631,7 +579,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -639,8 +587,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", @@ -655,59 +603,59 @@ "BOOST_VERSION": "1.74.0" } }, - "17rc1-3.4": { + "17-3.4": { "alpine3.20": { - "tags": "17rc1-3.4-alpine3.20 17rc1-3.4.3-alpine3.20 17rc1-3.4-alpine", - "readme_group": "test", + "tags": "17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine alpine", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17rc1", - "PG_DOCKER": "17rc1", + "PG_MAJOR": "17", + "PG_DOCKER": "17", "POSTGIS_VERSION": "3.4.3", "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", "POSTGIS_CHECKOUT": "tags/3.4.3", "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, - "17rc1-3.5": { + "17-3.5": { "alpine3.19": { - "tags": "17rc1-3.5.0rc1-alpine3.19", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "17-3.5-alpine3.19 17-3.5.0-alpine3.19", + "readme_group": "alpine3.19", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17rc1", - "PG_DOCKER": "17rc1", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "17rc1-3.5.0rc1-alpine3.20 17rc1-3.5.0rc1-alpine", - "readme_group": "test", - "postgis": "3.5.0rc1", + "tags": "17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine", + "readme_group": "alpine3.20", + "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", "initfile": "initdb-postgis.sh", - "PG_MAJOR": "17rc1", - "PG_DOCKER": "17rc1", - "POSTGIS_VERSION": "3.5.0rc1", - "POSTGIS_SHA256": "2b9d9dfaa676dfd21b0482be3127d8c573b2b8591c9e1bfffc39a2eea793b806", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072" + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "POSTGIS_VERSION": "3.5.0", + "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, - "17rc1-master": { + "17-master": { "bookworm": { - "tags": "17rc1-master-bookworm 17rc1-master", + "tags": "17-master-bookworm 17-master", "postgis": "master", "readme_group": "test", - "PG_MAJOR": "17rc1", - "PG_DOCKER": "17rc1", + "PG_MAJOR": "17", + "PG_DOCKER": "17", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", @@ -727,18 +675,18 @@ "BOOST_VERSION": "1.74.0" } }, - "17rc1-recent": { + "17-recent": { "bookworm": { - "tags": "17rc1-recent-bookworm 17rc1-recent-postgis3.4.3-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17rc1-recent-postgis3.4-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17rc1-recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17-recent recent", "postgis": "recent", - "readme_group": "test", - "PG_MAJOR": "17rc1", - "PG_DOCKER": "17rc1", + "readme_group": "recent", + "PG_MAJOR": "17", + "PG_DOCKER": "17", "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf", + "POSTGIS_CHECKOUT": "tags/3.5.0", + "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", @@ -779,59 +727,5 @@ "CGAL_CHECKOUT_SHA1": "de4fa0d7d57b5a997012f2804161386ff4bc0d0f", "BOOST_VERSION": "1.74.0" } - }, - "16-l3.5.0rc1": { - "bookworm": { - "_comment": "source: ./locked.yml", - "arch": "amd64 arm64", - "BOOST_VERSION": "1.74.0", - "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", - "CGAL_CHECKOUT": "tags/v5.6.1", - "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GDAL_CHECKOUT": "tags/v3.9.2", - "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", - "GEOS_CHECKOUT": "tags/3.13.0", - "initfile": "initdb-postgis.sh", - "PG_DOCKER": "16", - "PG_MAJOR": "16", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "postgis": "l3.5.0rc1", - "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", - "PROJ_CHECKOUT": "tags/9.5.0", - "readme_group": "test", - "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", - "SFCGAL_CHECKOUT": "tags/v1.5.2", - "tags": "16-l3.5.0rc1-bookworm 16-l3.5.0rc1", - "template": "Dockerfile.master.template" - } - }, - "17rc1-l3.5.0rc1": { - "bookworm": { - "_comment": "source: ./locked.yml", - "arch": "amd64 arm64", - "BOOST_VERSION": "1.74.0", - "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", - "CGAL_CHECKOUT": "tags/v5.6.1", - "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", - "GDAL_CHECKOUT": "tags/v3.9.2", - "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", - "GEOS_CHECKOUT": "tags/3.13.0", - "initfile": "initdb-postgis.sh", - "PG_DOCKER": "17rc1", - "PG_MAJOR": "17rc1", - "POSTGIS_CHECKOUT_SHA1": "df9317741170e86ff8346decdd555b54a0432072", - "POSTGIS_CHECKOUT": "tags/3.5.0rc1", - "postgis": "l3.5.0rc1", - "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", - "PROJ_CHECKOUT": "tags/9.5.0", - "readme_group": "test", - "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", - "SFCGAL_CHECKOUT": "tags/v1.5.2", - "tags": "17rc1-l3.5.0rc1-bookworm 17rc1-l3.5.0rc1", - "template": "Dockerfile.master.template" - } } } diff --git a/versions.sh b/versions.sh index 1c5b332d9..7a42f693b 100755 --- a/versions.sh +++ b/versions.sh @@ -23,9 +23,9 @@ debian_variants=" bullseye bookworm " debian_latest="bookworm" alpine_latest="alpine3.20" postgis_latest="3.4" -postgres_latest="16" +postgres_latest="17" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="11 12 13 14 15 16 17rc1" +postgres_versions="11 12 13 14 15 16 17" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used From 707c43e8e3510b55d9f9d22ef2ed81abc084e873 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 11 Oct 2024 09:49:02 +0000 Subject: [PATCH 124/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20CGAL:?= =?UTF-8?q?v6.0,PGSQL=5FHTTP:v1.6.1,SFCGAL:v2.0.0,TIMESCALEDB:2.17.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 8 +++---- 16-3.4-bundle0/bookworm/Dockerfile | 8 +++---- 16-recent/bookworm/Dockerfile | 8 +++---- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 8 +++---- 17-recent/bookworm/tags | 2 +- README.md | 6 ++--- manifest.sh | 24 ++++++++++---------- versions.json | 36 +++++++++++++++--------------- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index adcdfa119..03e085307 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -23,8 +23,8 @@ ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 2589ffabd..4e584a57a 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -23,8 +23,8 @@ ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.0 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=d0ca28df6121f10cd3868744d219904c7923c5be +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.16.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7c78574c4d42ec7ceb840bd9d55652182221f251 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e9ee47ff8..e06b9702f 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -20,8 +20,8 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -29,8 +29,8 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc -ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 +ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index f468409d1..61eddbb3e 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 441f37395..40af87dad 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -20,8 +20,8 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.2 -ARG PGIS1_CGAL_CHECKOUT=tags/v5.6.1 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -29,8 +29,8 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5584600ad7ed512f158b297476f57ed5fcf9c8dc -ARG PGIS1_CGAL_CHECKOUT_SHA1=188e51bad36ffc30e49dbabda29620b71a84664c +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 +ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index f303294d8..c3551fed6 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 8439ee6c2..054021dd0 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-09-28) +## Versions (2024-10-11) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v5.6.1, sfcgal=tags/v1.5.2 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index b1d680c0e..4f82f918f 100755 --- a/manifest.sh +++ b/manifest.sh @@ -698,17 +698,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm \ - --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -798,17 +798,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal1.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm \ - --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal1.5-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 881a436ec..a3e5cb671 100644 --- a/versions.json +++ b/versions.json @@ -381,12 +381,12 @@ "initfile": "initdb-bundle0.sh", "MOBILITYDB_CHECKOUT": "tags/v1.1.2", "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", - "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", + "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.16.1", - "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", + "TIMESCALEDB_CHECKOUT": "tags/2.17.0", + "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", "DUCKDB_CHECKOUT": "tags/v1.1.1", "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", @@ -507,12 +507,12 @@ "initfile": "initdb-bundle0.sh", "MOBILITYDB_CHECKOUT": "tags/v1.1.2", "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.0", - "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", + "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.16.1", - "TIMESCALEDB_CHECKOUT_SHA1": "7c78574c4d42ec7ceb840bd9d55652182221f251", + "TIMESCALEDB_CHECKOUT": "tags/2.17.0", + "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", "DUCKDB_CHECKOUT": "tags/v1.1.1", "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -579,7 +579,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -596,10 +596,10 @@ "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", - "SFCGAL_CHECKOUT": "tags/v1.5.2", - "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", - "CGAL_CHECKOUT": "tags/v5.6.1", - "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", + "SFCGAL_CHECKOUT": "tags/v2.0.0", + "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", + "CGAL_CHECKOUT": "tags/v6.0", + "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", "BOOST_VERSION": "1.74.0" } }, @@ -677,7 +677,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal5.6.1-sfcgal1.5.2-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal5.6-sfcgal1.5-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -694,10 +694,10 @@ "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", - "SFCGAL_CHECKOUT": "tags/v1.5.2", - "SFCGAL_CHECKOUT_SHA1": "5584600ad7ed512f158b297476f57ed5fcf9c8dc", - "CGAL_CHECKOUT": "tags/v5.6.1", - "CGAL_CHECKOUT_SHA1": "188e51bad36ffc30e49dbabda29620b71a84664c", + "SFCGAL_CHECKOUT": "tags/v2.0.0", + "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", + "CGAL_CHECKOUT": "tags/v6.0", + "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", "BOOST_VERSION": "1.74.0" } }, From 782c3487072b344a8ff468cfa2bed6dc7e750bf0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 14 Oct 2024 15:27:07 +0000 Subject: [PATCH 125/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.1.2,GDAL:v3.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 15-3.4-bundle0/bookworm/Dockerfile | 2 +- 16-3.4-bundle0/bookworm/Dockerfile | 2 +- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 20 ++++++++++---------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index 03e085307..1c03609c3 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fabd97bd76361051b91c0e772eb819a45f3fd095 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.1 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.2 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index 4e584a57a..c4cbfec74 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.1 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.2 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e06b9702f..d8cb43d83 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 +ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 61eddbb3e..95b759de2 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 40af87dad..804146401 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=3aae5b4cf30c958ab339157b4f8115922e2f2562 +ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index c3551fed6..645dd9a4d 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 054021dd0..2a6296b46 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-10-11) +## Versions (2024-10-14) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.2, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 4f82f918f..385f0746a 100755 --- a/manifest.sh +++ b/manifest.sh @@ -698,11 +698,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -798,11 +798,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index a3e5cb671..f043d6831 100644 --- a/versions.json +++ b/versions.json @@ -387,8 +387,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.17.0", "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", - "DUCKDB_CHECKOUT": "tags/v1.1.1", - "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", + "DUCKDB_CHECKOUT": "tags/v1.1.2", + "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", "POSTGIS_MAJOR": "3", @@ -513,8 +513,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.17.0", "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", - "DUCKDB_CHECKOUT": "tags/v1.1.1", - "DUCKDB_CHECKOUT_SHA1": "af39bd0dcf66876e09ac2a7c3baa28fe1b301151", + "DUCKDB_CHECKOUT": "tags/v1.1.2", + "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", @@ -579,7 +579,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -592,8 +592,8 @@ "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.2", - "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", + "GDAL_CHECKOUT": "tags/v3.9.3", + "GDAL_CHECKOUT_SHA1": "501754d048e07b07932ec268b6ed3c43ea0819e3", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -677,7 +677,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.2-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -690,8 +690,8 @@ "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.2", - "GDAL_CHECKOUT_SHA1": "3aae5b4cf30c958ab339157b4f8115922e2f2562", + "GDAL_CHECKOUT": "tags/v3.9.3", + "GDAL_CHECKOUT_SHA1": "501754d048e07b07932ec268b6ed3c43ea0819e3", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", From bbd17c63c20ac50a4d1f3b83aa4abb9caa529851 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 14 Oct 2024 23:10:48 +0200 Subject: [PATCH 126/167] update debian postgis 3.5 --- .circleci/config.yml | 24 +- .github/workflows/main.yml | 24 +- 12-3.5/bookworm/Dockerfile | 39 +++ 12-3.5/bookworm/initdb-postgis.sh | 25 ++ 12-3.5/bookworm/tags | 1 + 12-3.5/bookworm/update-postgis.sh | 28 ++ 12-3.5/bullseye/Dockerfile | 39 +++ 12-3.5/bullseye/initdb-postgis.sh | 25 ++ 12-3.5/bullseye/tags | 1 + 12-3.5/bullseye/update-postgis.sh | 28 ++ 13-3.5/bookworm/Dockerfile | 39 +++ 13-3.5/bookworm/initdb-postgis.sh | 25 ++ 13-3.5/bookworm/tags | 1 + 13-3.5/bookworm/update-postgis.sh | 28 ++ 13-3.5/bullseye/Dockerfile | 39 +++ 13-3.5/bullseye/initdb-postgis.sh | 25 ++ 13-3.5/bullseye/tags | 1 + 13-3.5/bullseye/update-postgis.sh | 28 ++ 14-3.5/bookworm/Dockerfile | 39 +++ 14-3.5/bookworm/initdb-postgis.sh | 25 ++ 14-3.5/bookworm/tags | 1 + 14-3.5/bookworm/update-postgis.sh | 28 ++ 14-3.5/bullseye/Dockerfile | 39 +++ 14-3.5/bullseye/initdb-postgis.sh | 25 ++ 14-3.5/bullseye/tags | 1 + 14-3.5/bullseye/update-postgis.sh | 28 ++ 15-3.5/bookworm/Dockerfile | 39 +++ 15-3.5/bookworm/initdb-postgis.sh | 25 ++ 15-3.5/bookworm/tags | 1 + 15-3.5/bookworm/update-postgis.sh | 28 ++ 15-3.5/bullseye/Dockerfile | 39 +++ 15-3.5/bullseye/initdb-postgis.sh | 25 ++ 15-3.5/bullseye/tags | 1 + 15-3.5/bullseye/update-postgis.sh | 28 ++ 16-3.5/bookworm/Dockerfile | 39 +++ 16-3.5/bookworm/initdb-postgis.sh | 25 ++ 16-3.5/bookworm/tags | 1 + 16-3.5/bookworm/update-postgis.sh | 28 ++ 16-3.5/bullseye/Dockerfile | 39 +++ 16-3.5/bullseye/initdb-postgis.sh | 25 ++ 16-3.5/bullseye/tags | 1 + 16-3.5/bullseye/update-postgis.sh | 28 ++ 17-3.4/alpine3.20/tags | 2 +- 17-3.5/alpine3.20/tags | 2 +- 17-3.5/bookworm/Dockerfile | 39 +++ 17-3.5/bookworm/initdb-postgis.sh | 25 ++ 17-3.5/bookworm/tags | 1 + 17-3.5/bookworm/update-postgis.sh | 28 ++ 17-3.5/bullseye/Dockerfile | 39 +++ 17-3.5/bullseye/initdb-postgis.sh | 25 ++ 17-3.5/bullseye/tags | 1 + 17-3.5/bullseye/update-postgis.sh | 28 ++ README.md | 34 +-- localtest.sh | 9 +- manifest.sh | 432 +++++++++++++++--------------- versions.json | 304 ++++++++++----------- versions.sh | 2 +- 57 files changed, 1515 insertions(+), 434 deletions(-) create mode 100644 12-3.5/bookworm/Dockerfile create mode 100644 12-3.5/bookworm/initdb-postgis.sh create mode 100644 12-3.5/bookworm/tags create mode 100755 12-3.5/bookworm/update-postgis.sh create mode 100644 12-3.5/bullseye/Dockerfile create mode 100644 12-3.5/bullseye/initdb-postgis.sh create mode 100644 12-3.5/bullseye/tags create mode 100755 12-3.5/bullseye/update-postgis.sh create mode 100644 13-3.5/bookworm/Dockerfile create mode 100644 13-3.5/bookworm/initdb-postgis.sh create mode 100644 13-3.5/bookworm/tags create mode 100755 13-3.5/bookworm/update-postgis.sh create mode 100644 13-3.5/bullseye/Dockerfile create mode 100644 13-3.5/bullseye/initdb-postgis.sh create mode 100644 13-3.5/bullseye/tags create mode 100755 13-3.5/bullseye/update-postgis.sh create mode 100644 14-3.5/bookworm/Dockerfile create mode 100644 14-3.5/bookworm/initdb-postgis.sh create mode 100644 14-3.5/bookworm/tags create mode 100755 14-3.5/bookworm/update-postgis.sh create mode 100644 14-3.5/bullseye/Dockerfile create mode 100644 14-3.5/bullseye/initdb-postgis.sh create mode 100644 14-3.5/bullseye/tags create mode 100755 14-3.5/bullseye/update-postgis.sh create mode 100644 15-3.5/bookworm/Dockerfile create mode 100644 15-3.5/bookworm/initdb-postgis.sh create mode 100644 15-3.5/bookworm/tags create mode 100755 15-3.5/bookworm/update-postgis.sh create mode 100644 15-3.5/bullseye/Dockerfile create mode 100644 15-3.5/bullseye/initdb-postgis.sh create mode 100644 15-3.5/bullseye/tags create mode 100755 15-3.5/bullseye/update-postgis.sh create mode 100644 16-3.5/bookworm/Dockerfile create mode 100644 16-3.5/bookworm/initdb-postgis.sh create mode 100644 16-3.5/bookworm/tags create mode 100755 16-3.5/bookworm/update-postgis.sh create mode 100644 16-3.5/bullseye/Dockerfile create mode 100644 16-3.5/bullseye/initdb-postgis.sh create mode 100644 16-3.5/bullseye/tags create mode 100755 16-3.5/bullseye/update-postgis.sh create mode 100644 17-3.5/bookworm/Dockerfile create mode 100644 17-3.5/bookworm/initdb-postgis.sh create mode 100644 17-3.5/bookworm/tags create mode 100755 17-3.5/bookworm/update-postgis.sh create mode 100644 17-3.5/bullseye/Dockerfile create mode 100644 17-3.5/bullseye/initdb-postgis.sh create mode 100644 17-3.5/bullseye/tags create mode 100755 17-3.5/bullseye/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index dc88a7040..f8afccf92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,46 +129,46 @@ workflows: "12-3.3-alpine3.20", "12-3.4-alpine3.19", "12-3.4-alpine3.20", - "12-3.4-bookworm", - "12-3.4-bullseye", "12-3.5-alpine3.19", "12-3.5-alpine3.20", + "12-3.5-bookworm", + "12-3.5-bullseye", "13-3.3-alpine3.20", "13-3.4-alpine3.19", "13-3.4-alpine3.20", - "13-3.4-bookworm", - "13-3.4-bullseye", "13-3.5-alpine3.19", "13-3.5-alpine3.20", + "13-3.5-bookworm", + "13-3.5-bullseye", "14-3.3-alpine3.20", "14-3.4-alpine3.19", "14-3.4-alpine3.20", - "14-3.4-bookworm", - "14-3.4-bullseye", "14-3.5-alpine3.19", "14-3.5-alpine3.20", + "14-3.5-bookworm", + "14-3.5-bullseye", "14-l3.1.9gcp-bookworm", "15-3.3-alpine3.20", "15-3.4-alpine3.19", "15-3.4-alpine3.20", -# --skip-- "15-3.4-bookworm", --> generated with the related bundle job! - "15-3.4-bullseye", - "15-3.4-bundle0-bookworm", "15-3.5-alpine3.19", "15-3.5-alpine3.20", + "15-3.5-bookworm", + "15-3.5-bullseye", "16-3.3-alpine3.20", "16-3.4-alpine3.19", "16-3.4-alpine3.20", -# --skip-- "16-3.4-bookworm", --> generated with the related bundle job! - "16-3.4-bullseye", - "16-3.4-bundle0-bookworm", "16-3.5-alpine3.19", "16-3.5-alpine3.20", + "16-3.5-bookworm", + "16-3.5-bullseye", "16-master-bookworm", "16-recent-bookworm", "17-3.4-alpine3.20", "17-3.5-alpine3.19", "17-3.5-alpine3.20", + "17-3.5-bookworm", + "17-3.5-bullseye", "17-master-bookworm", "17-recent-bookworm", #circleci-targets-end diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 628475f32..4bdcc1180 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,46 +30,46 @@ jobs: - { version: "12-3.3", variant: "alpine3.20" } - { version: "12-3.4", variant: "alpine3.19" } - { version: "12-3.4", variant: "alpine3.20" } - - { version: "12-3.4", variant: "bookworm" } - - { version: "12-3.4", variant: "bullseye" } - { version: "12-3.5", variant: "alpine3.19" } - { version: "12-3.5", variant: "alpine3.20" } + - { version: "12-3.5", variant: "bookworm" } + - { version: "12-3.5", variant: "bullseye" } - { version: "13-3.3", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.19" } - { version: "13-3.4", variant: "alpine3.20" } - - { version: "13-3.4", variant: "bookworm" } - - { version: "13-3.4", variant: "bullseye" } - { version: "13-3.5", variant: "alpine3.19" } - { version: "13-3.5", variant: "alpine3.20" } + - { version: "13-3.5", variant: "bookworm" } + - { version: "13-3.5", variant: "bullseye" } - { version: "14-3.3", variant: "alpine3.20" } - { version: "14-3.4", variant: "alpine3.19" } - { version: "14-3.4", variant: "alpine3.20" } - - { version: "14-3.4", variant: "bookworm" } - - { version: "14-3.4", variant: "bullseye" } - { version: "14-3.5", variant: "alpine3.19" } - { version: "14-3.5", variant: "alpine3.20" } + - { version: "14-3.5", variant: "bookworm" } + - { version: "14-3.5", variant: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - { version: "15-3.3", variant: "alpine3.20" } - { version: "15-3.4", variant: "alpine3.19" } - { version: "15-3.4", variant: "alpine3.20" } -# --skip-- - { version: "15-3.4", variant: "bookworm" } --> generated with the related bundle job! - - { version: "15-3.4", variant: "bullseye" } - - { version: "15-3.4-bundle0", variant: "bookworm" } - { version: "15-3.5", variant: "alpine3.19" } - { version: "15-3.5", variant: "alpine3.20" } + - { version: "15-3.5", variant: "bookworm" } + - { version: "15-3.5", variant: "bullseye" } - { version: "16-3.3", variant: "alpine3.20" } - { version: "16-3.4", variant: "alpine3.19" } - { version: "16-3.4", variant: "alpine3.20" } -# --skip-- - { version: "16-3.4", variant: "bookworm" } --> generated with the related bundle job! - - { version: "16-3.4", variant: "bullseye" } - - { version: "16-3.4-bundle0", variant: "bookworm" } - { version: "16-3.5", variant: "alpine3.19" } - { version: "16-3.5", variant: "alpine3.20" } + - { version: "16-3.5", variant: "bookworm" } + - { version: "16-3.5", variant: "bullseye" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17-3.4", variant: "alpine3.20" } - { version: "17-3.5", variant: "alpine3.19" } - { version: "17-3.5", variant: "alpine3.20" } + - { version: "17-3.5", variant: "bookworm" } + - { version: "17-3.5", variant: "bullseye" } - { version: "17-master", variant: "bookworm" } - { version: "17-recent", variant: "bookworm" } #matrix-include-end diff --git a/12-3.5/bookworm/Dockerfile b/12-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..83c6b6dda --- /dev/null +++ b/12-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:12-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/bookworm/initdb-postgis.sh b/12-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.5/bookworm/tags b/12-3.5/bookworm/tags new file mode 100644 index 000000000..7fc29cf79 --- /dev/null +++ b/12-3.5/bookworm/tags @@ -0,0 +1 @@ +12-3.5-bookworm 12-3.5.0-bookworm 12-3.5 diff --git a/12-3.5/bookworm/update-postgis.sh b/12-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/12-3.5/bullseye/Dockerfile b/12-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..c652c85f1 --- /dev/null +++ b/12-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:12-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/bullseye/initdb-postgis.sh b/12-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/12-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/12-3.5/bullseye/tags b/12-3.5/bullseye/tags new file mode 100644 index 000000000..9edbdd7de --- /dev/null +++ b/12-3.5/bullseye/tags @@ -0,0 +1 @@ +12-3.5-bullseye 12-3.5.0-bullseye diff --git a/12-3.5/bullseye/update-postgis.sh b/12-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/12-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..e6335a018 --- /dev/null +++ b/13-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:13-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.5/bookworm/initdb-postgis.sh b/13-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.5/bookworm/tags b/13-3.5/bookworm/tags new file mode 100644 index 000000000..1b2c9eb45 --- /dev/null +++ b/13-3.5/bookworm/tags @@ -0,0 +1 @@ +13-3.5-bookworm 13-3.5.0-bookworm 13-3.5 diff --git a/13-3.5/bookworm/update-postgis.sh b/13-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/13-3.5/bullseye/Dockerfile b/13-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..efe79d47f --- /dev/null +++ b/13-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:13-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.5/bullseye/initdb-postgis.sh b/13-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/13-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/13-3.5/bullseye/tags b/13-3.5/bullseye/tags new file mode 100644 index 000000000..f59017c17 --- /dev/null +++ b/13-3.5/bullseye/tags @@ -0,0 +1 @@ +13-3.5-bullseye 13-3.5.0-bullseye diff --git a/13-3.5/bullseye/update-postgis.sh b/13-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/13-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..c0d806ac8 --- /dev/null +++ b/14-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:14-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.5/bookworm/initdb-postgis.sh b/14-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.5/bookworm/tags b/14-3.5/bookworm/tags new file mode 100644 index 000000000..f4a5e22f4 --- /dev/null +++ b/14-3.5/bookworm/tags @@ -0,0 +1 @@ +14-3.5-bookworm 14-3.5.0-bookworm 14-3.5 diff --git a/14-3.5/bookworm/update-postgis.sh b/14-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/14-3.5/bullseye/Dockerfile b/14-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..4a4e82d7c --- /dev/null +++ b/14-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:14-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.5/bullseye/initdb-postgis.sh b/14-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/14-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/14-3.5/bullseye/tags b/14-3.5/bullseye/tags new file mode 100644 index 000000000..9011cd437 --- /dev/null +++ b/14-3.5/bullseye/tags @@ -0,0 +1 @@ +14-3.5-bullseye 14-3.5.0-bullseye diff --git a/14-3.5/bullseye/update-postgis.sh b/14-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/14-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..153e0b49d --- /dev/null +++ b/15-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:15-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.5/bookworm/initdb-postgis.sh b/15-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.5/bookworm/tags b/15-3.5/bookworm/tags new file mode 100644 index 000000000..4c34c05d5 --- /dev/null +++ b/15-3.5/bookworm/tags @@ -0,0 +1 @@ +15-3.5-bookworm 15-3.5.0-bookworm 15-3.5 diff --git a/15-3.5/bookworm/update-postgis.sh b/15-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/15-3.5/bullseye/Dockerfile b/15-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..25f1f5408 --- /dev/null +++ b/15-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:15-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.5/bullseye/initdb-postgis.sh b/15-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/15-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/15-3.5/bullseye/tags b/15-3.5/bullseye/tags new file mode 100644 index 000000000..6402453ed --- /dev/null +++ b/15-3.5/bullseye/tags @@ -0,0 +1 @@ +15-3.5-bullseye 15-3.5.0-bullseye diff --git a/15-3.5/bullseye/update-postgis.sh b/15-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/15-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..a42a2f5ea --- /dev/null +++ b/16-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:16-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.5/bookworm/initdb-postgis.sh b/16-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.5/bookworm/tags b/16-3.5/bookworm/tags new file mode 100644 index 000000000..71ac787a2 --- /dev/null +++ b/16-3.5/bookworm/tags @@ -0,0 +1 @@ +16-3.5-bookworm 16-3.5.0-bookworm 16-3.5 diff --git a/16-3.5/bookworm/update-postgis.sh b/16-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/16-3.5/bullseye/Dockerfile b/16-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..2a4043561 --- /dev/null +++ b/16-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:16-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.5/bullseye/initdb-postgis.sh b/16-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/16-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/16-3.5/bullseye/tags b/16-3.5/bullseye/tags new file mode 100644 index 000000000..547297fe1 --- /dev/null +++ b/16-3.5/bullseye/tags @@ -0,0 +1 @@ +16-3.5-bullseye 16-3.5.0-bullseye diff --git a/16-3.5/bullseye/update-postgis.sh b/16-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/16-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17-3.4/alpine3.20/tags b/17-3.4/alpine3.20/tags index 4124951f1..a5e397b99 100644 --- a/17-3.4/alpine3.20/tags +++ b/17-3.4/alpine3.20/tags @@ -1 +1 @@ -17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine alpine +17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags index 6119f9380..407558ff9 100644 --- a/17-3.5/alpine3.20/tags +++ b/17-3.5/alpine3.20/tags @@ -1 +1 @@ -17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine +17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine alpine diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..6617b1b19 --- /dev/null +++ b/17-3.5/bookworm/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:17-bookworm + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/17-3.5/bookworm/initdb-postgis.sh b/17-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17-3.5/bookworm/tags b/17-3.5/bookworm/tags new file mode 100644 index 000000000..6df75ab5d --- /dev/null +++ b/17-3.5/bookworm/tags @@ -0,0 +1 @@ +17-3.5-bookworm 17-3.5.0-bookworm 17-3.5 latest diff --git a/17-3.5/bookworm/update-postgis.sh b/17-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17-3.5/bullseye/Dockerfile b/17-3.5/bullseye/Dockerfile new file mode 100644 index 000000000..fd4813a10 --- /dev/null +++ b/17-3.5/bullseye/Dockerfile @@ -0,0 +1,39 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# source: "Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +FROM postgres:17-bullseye + +LABEL maintainer="PostGIS Project - https://postgis.net" \ + org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ + org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + +ENV POSTGIS_MAJOR 3 +ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 + +RUN set -eux \ + && apt-get update \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "More than one llvm package or none at all found. Stopping."; \ + exit 1; \ + fi + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/17-3.5/bullseye/initdb-postgis.sh b/17-3.5/bullseye/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17-3.5/bullseye/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17-3.5/bullseye/tags b/17-3.5/bullseye/tags new file mode 100644 index 000000000..776d51be4 --- /dev/null +++ b/17-3.5/bullseye/tags @@ -0,0 +1 @@ +17-3.5-bullseye 17-3.5.0-bullseye diff --git a/17-3.5/bullseye/update-postgis.sh b/17-3.5/bullseye/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17-3.5/bullseye/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/README.md b/README.md index 2a6296b46..6238aea46 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ **Important:** _Please note that this README document is larger than the 25,000 character limit set by Docker Hub. As a result, the version available on Docker Hub will be trimmed and not complete._ _For the complete and untrimmed version of the README, it is recommended to visit the project GitHub page:_ https://github.com/ImreSamu/docker-postgis/blob/master/README.md -The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, 16 and 17beta. Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches. +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS which is compatible with PostgreSQL versions 12, 13, 14, 15, 16 and 17. Additionally, an image version is provided which is built from the latest two versions of Postgres (16,17) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -56,8 +56,8 @@ Notes: For those new to PostGIS, we recommend the following image versions: -- `imresamu/postgis:16-3.4-bookworm`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. ( debian bookworm based, easy to extend with debian packages ) -- `imresamu/postgis:16-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal. ( debian based, extending is complex ! ) +- `imresamu/postgis:17-3.5-bookworm`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. ( debian bookworm based, easy to extend with debian packages ) +- `imresamu/postgis:17-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal. ( debian based, extending is complex ! ) - `imresamu/postgis:16-3.4-bundle0-bookworm`: (experimental) This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. ### 🥇Debian - bookworm (recommended) @@ -71,11 +71,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.3 | -| [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.3 | -| [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.3 | -| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.3 | -| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.3 | +| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.0 | +| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.0 | +| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.0 | +| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.0 | +| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.0 | +| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.0 | ### 📘Debian - bullseye @@ -87,11 +88,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bullseye), [`12-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.4.3 | -| [`13-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bullseye), [`13-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.4.3 | -| [`14-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bullseye), [`14-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.4.3 | -| [`15-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bullseye), [`15-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.4.3 | -| [`16-3.4-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bullseye), [`16-3.4.3-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.4.3 | +| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.0 | +| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.0 | +| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.0 | +| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.0 | +| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.0 | +| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.0 | @@ -118,8 +120,6 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.3 | -| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.3 | @@ -169,8 +169,8 @@ Please note that the included package list is subject to change as we continue t | [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.7-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.7 | | [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | | [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-alpine3.20), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0 | -| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.3-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.3 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.0 | +| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.3-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.3 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.0 | diff --git a/localtest.sh b/localtest.sh index c3427882a..5f4491258 100755 --- a/localtest.sh +++ b/localtest.sh @@ -28,7 +28,7 @@ fi # check update code ./update.sh -test_tag=16-3.4-bookworm +test_tag=17-3.5-bookworm # check commands make -n test-${test_tag} @@ -74,10 +74,3 @@ echo "WARNING: Be carefull and not push the .localtest.sh script generated Dock echo " because contains reference to the test REGISTRY, REPO_NAME and IMAGE_NAME!" echo " " echo "done." - -# manual tests cheetsheets: -# ---------------------------- -# REGISTRY=localhost:5000 make push-15-3.4-bundle0 -# REGISTRY=localhost:5000 make push-15-3.4-bundle0-bookworm -# TEST=true make push-15-3.4-bundle0-bookworm -# diff --git a/manifest.sh b/manifest.sh index 385f0746a..69d2a68e1 100755 --- a/manifest.sh +++ b/manifest.sh @@ -66,40 +66,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ --target ${dockername}:12-3.4-alpine || true -# ----- 12-3.4-bookworm ----- - -echo "manifest: ${dockername}:12-3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-bookworm \ - --target ${dockername}:12-3.4-bookworm || true - -echo "manifest: ${dockername}:12-3.4.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3-bookworm \ - --target ${dockername}:12-3.4.3-bookworm || true - -echo "manifest: ${dockername}:12-3.4" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4 \ - --target ${dockername}:12-3.4 || true - -# ----- 12-3.4-bullseye ----- - -echo "manifest: ${dockername}:12-3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-bullseye \ - --target ${dockername}:12-3.4-bullseye || true - -echo "manifest: ${dockername}:12-3.4.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3-bullseye \ - --target ${dockername}:12-3.4.3-bullseye || true - # ----- 12-3.5-alpine3.19 ----- echo "manifest: ${dockername}:12-3.5-alpine3.19" @@ -134,6 +100,40 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-alpine \ --target ${dockername}:12-3.5-alpine || true +# ----- 12-3.5-bookworm ----- + +echo "manifest: ${dockername}:12-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5-bookworm \ + --target ${dockername}:12-3.5-bookworm || true + +echo "manifest: ${dockername}:12-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0-bookworm \ + --target ${dockername}:12-3.5.0-bookworm || true + +echo "manifest: ${dockername}:12-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5 \ + --target ${dockername}:12-3.5 || true + +# ----- 12-3.5-bullseye ----- + +echo "manifest: ${dockername}:12-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5-bullseye \ + --target ${dockername}:12-3.5-bullseye || true + +echo "manifest: ${dockername}:12-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.0-bullseye \ + --target ${dockername}:12-3.5.0-bullseye || true + # ----- 13-3.3-alpine3.20 ----- echo "manifest: ${dockername}:13-3.3-alpine3.20" @@ -188,40 +188,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ --target ${dockername}:13-3.4-alpine || true -# ----- 13-3.4-bookworm ----- - -echo "manifest: ${dockername}:13-3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bookworm \ - --target ${dockername}:13-3.4-bookworm || true - -echo "manifest: ${dockername}:13-3.4.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3-bookworm \ - --target ${dockername}:13-3.4.3-bookworm || true - -echo "manifest: ${dockername}:13-3.4" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4 \ - --target ${dockername}:13-3.4 || true - -# ----- 13-3.4-bullseye ----- - -echo "manifest: ${dockername}:13-3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-bullseye \ - --target ${dockername}:13-3.4-bullseye || true - -echo "manifest: ${dockername}:13-3.4.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3-bullseye \ - --target ${dockername}:13-3.4.3-bullseye || true - # ----- 13-3.5-alpine3.19 ----- echo "manifest: ${dockername}:13-3.5-alpine3.19" @@ -256,6 +222,40 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine \ --target ${dockername}:13-3.5-alpine || true +# ----- 13-3.5-bookworm ----- + +echo "manifest: ${dockername}:13-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-bookworm \ + --target ${dockername}:13-3.5-bookworm || true + +echo "manifest: ${dockername}:13-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.0-bookworm \ + --target ${dockername}:13-3.5.0-bookworm || true + +echo "manifest: ${dockername}:13-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5 \ + --target ${dockername}:13-3.5 || true + +# ----- 13-3.5-bullseye ----- + +echo "manifest: ${dockername}:13-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-bullseye \ + --target ${dockername}:13-3.5-bullseye || true + +echo "manifest: ${dockername}:13-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.0-bullseye \ + --target ${dockername}:13-3.5.0-bullseye || true + # ----- 14-3.3-alpine3.20 ----- echo "manifest: ${dockername}:14-3.3-alpine3.20" @@ -310,40 +310,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ --target ${dockername}:14-3.4-alpine || true -# ----- 14-3.4-bookworm ----- - -echo "manifest: ${dockername}:14-3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bookworm \ - --target ${dockername}:14-3.4-bookworm || true - -echo "manifest: ${dockername}:14-3.4.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3-bookworm \ - --target ${dockername}:14-3.4.3-bookworm || true - -echo "manifest: ${dockername}:14-3.4" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4 \ - --target ${dockername}:14-3.4 || true - -# ----- 14-3.4-bullseye ----- - -echo "manifest: ${dockername}:14-3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-bullseye \ - --target ${dockername}:14-3.4-bullseye || true - -echo "manifest: ${dockername}:14-3.4.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3-bullseye \ - --target ${dockername}:14-3.4.3-bullseye || true - # ----- 14-3.5-alpine3.19 ----- echo "manifest: ${dockername}:14-3.5-alpine3.19" @@ -378,6 +344,40 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine \ --target ${dockername}:14-3.5-alpine || true +# ----- 14-3.5-bookworm ----- + +echo "manifest: ${dockername}:14-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-bookworm \ + --target ${dockername}:14-3.5-bookworm || true + +echo "manifest: ${dockername}:14-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.0-bookworm \ + --target ${dockername}:14-3.5.0-bookworm || true + +echo "manifest: ${dockername}:14-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5 \ + --target ${dockername}:14-3.5 || true + +# ----- 14-3.5-bullseye ----- + +echo "manifest: ${dockername}:14-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-bullseye \ + --target ${dockername}:14-3.5-bullseye || true + +echo "manifest: ${dockername}:14-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.0-bullseye \ + --target ${dockername}:14-3.5.0-bullseye || true + # ----- 14-l3.1.9gcp-bookworm ----- echo "manifest: ${dockername}:14-l3.1.9gcp-bookworm" @@ -446,60 +446,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ --target ${dockername}:15-3.4-alpine || true -# ----- 15-3.4-bookworm ----- - -echo "manifest: ${dockername}:15-3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bookworm \ - --target ${dockername}:15-3.4-bookworm || true - -echo "manifest: ${dockername}:15-3.4.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3-bookworm \ - --target ${dockername}:15-3.4.3-bookworm || true - -echo "manifest: ${dockername}:15-3.4" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4 \ - --target ${dockername}:15-3.4 || true - -# ----- 15-3.4-bullseye ----- - -echo "manifest: ${dockername}:15-3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bullseye \ - --target ${dockername}:15-3.4-bullseye || true - -echo "manifest: ${dockername}:15-3.4.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3-bullseye \ - --target ${dockername}:15-3.4.3-bullseye || true - -# ----- 15-3.4-bundle0-bookworm ----- - -echo "manifest: ${dockername}:15-3.4-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle0-bookworm \ - --target ${dockername}:15-3.4-bundle0-bookworm || true - -echo "manifest: ${dockername}:15-3.4.3-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3-bundle0-bookworm \ - --target ${dockername}:15-3.4.3-bundle0-bookworm || true - -echo "manifest: ${dockername}:15-3.4-bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \ - --target ${dockername}:15-3.4-bundle0 || true - # ----- 15-3.5-alpine3.19 ----- echo "manifest: ${dockername}:15-3.5-alpine3.19" @@ -534,6 +480,40 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine \ --target ${dockername}:15-3.5-alpine || true +# ----- 15-3.5-bookworm ----- + +echo "manifest: ${dockername}:15-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5-bookworm \ + --target ${dockername}:15-3.5-bookworm || true + +echo "manifest: ${dockername}:15-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.0-bookworm \ + --target ${dockername}:15-3.5.0-bookworm || true + +echo "manifest: ${dockername}:15-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5 \ + --target ${dockername}:15-3.5 || true + +# ----- 15-3.5-bullseye ----- + +echo "manifest: ${dockername}:15-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5-bullseye \ + --target ${dockername}:15-3.5-bullseye || true + +echo "manifest: ${dockername}:15-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.0-bullseye \ + --target ${dockername}:15-3.5.0-bullseye || true + # ----- 16-3.3-alpine3.20 ----- echo "manifest: ${dockername}:16-3.3-alpine3.20" @@ -588,60 +568,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ --target ${dockername}:16-3.4-alpine || true -# ----- 16-3.4-bookworm ----- - -echo "manifest: ${dockername}:16-3.4-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bookworm \ - --target ${dockername}:16-3.4-bookworm || true - -echo "manifest: ${dockername}:16-3.4.3-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3-bookworm \ - --target ${dockername}:16-3.4.3-bookworm || true - -echo "manifest: ${dockername}:16-3.4" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4 \ - --target ${dockername}:16-3.4 || true - -# ----- 16-3.4-bullseye ----- - -echo "manifest: ${dockername}:16-3.4-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bullseye \ - --target ${dockername}:16-3.4-bullseye || true - -echo "manifest: ${dockername}:16-3.4.3-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3-bullseye \ - --target ${dockername}:16-3.4.3-bullseye || true - -# ----- 16-3.4-bundle0-bookworm ----- - -echo "manifest: ${dockername}:16-3.4-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle0-bookworm \ - --target ${dockername}:16-3.4-bundle0-bookworm || true - -echo "manifest: ${dockername}:16-3.4.3-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3-bundle0-bookworm \ - --target ${dockername}:16-3.4.3-bundle0-bookworm || true - -echo "manifest: ${dockername}:16-3.4-bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \ - --target ${dockername}:16-3.4-bundle0 || true - # ----- 16-3.5-alpine3.19 ----- echo "manifest: ${dockername}:16-3.5-alpine3.19" @@ -676,6 +602,40 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine \ --target ${dockername}:16-3.5-alpine || true +# ----- 16-3.5-bookworm ----- + +echo "manifest: ${dockername}:16-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-bookworm \ + --target ${dockername}:16-3.5-bookworm || true + +echo "manifest: ${dockername}:16-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0-bookworm \ + --target ${dockername}:16-3.5.0-bookworm || true + +echo "manifest: ${dockername}:16-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5 \ + --target ${dockername}:16-3.5 || true + +# ----- 16-3.5-bullseye ----- + +echo "manifest: ${dockername}:16-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-bullseye \ + --target ${dockername}:16-3.5-bullseye || true + +echo "manifest: ${dockername}:16-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0-bullseye \ + --target ${dockername}:16-3.5.0-bullseye || true + # ----- 16-master-bookworm ----- echo "manifest: ${dockername}:16-master-bookworm" @@ -736,12 +696,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.4-alpine \ --target ${dockername}:17-3.4-alpine || true -echo "manifest: ${dockername}:alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:alpine \ - --target ${dockername}:alpine || true - # ----- 17-3.5-alpine3.19 ----- echo "manifest: ${dockername}:17-3.5-alpine3.19" @@ -776,6 +730,52 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine \ --target ${dockername}:17-3.5-alpine || true +echo "manifest: ${dockername}:alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:alpine \ + --target ${dockername}:alpine || true + +# ----- 17-3.5-bookworm ----- + +echo "manifest: ${dockername}:17-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bookworm \ + --target ${dockername}:17-3.5-bookworm || true + +echo "manifest: ${dockername}:17-3.5.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.0-bookworm \ + --target ${dockername}:17-3.5.0-bookworm || true + +echo "manifest: ${dockername}:17-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5 \ + --target ${dockername}:17-3.5 || true + +echo "manifest: ${dockername}:latest" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:latest \ + --target ${dockername}:latest || true + +# ----- 17-3.5-bullseye ----- + +echo "manifest: ${dockername}:17-3.5-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bullseye \ + --target ${dockername}:17-3.5-bullseye || true + +echo "manifest: ${dockername}:17-3.5.0-bullseye" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.0-bullseye \ + --target ${dockername}:17-3.5.0-bullseye || true + # ----- 17-master-bookworm ----- echo "manifest: ${dockername}:17-master-bookworm" diff --git a/versions.json b/versions.json index f043d6831..aff51075d 100644 --- a/versions.json +++ b/versions.json @@ -16,30 +16,6 @@ } }, "12-3.4": { - "bullseye": { - "tags": "12-3.4-bullseye 12-3.4.3-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" - }, - "bookworm": { - "tags": "12-3.4-bookworm 12-3.4.3-bookworm 12-3.4", - "postgis": "3.4", - "readme_group": "bookworm", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - }, "alpine3.19": { "tags": "12-3.4-alpine3.19 12-3.4.3-alpine3.19", "readme_group": "alpine3.19", @@ -70,6 +46,30 @@ } }, "12-3.5": { + "bullseye": { + "tags": "12-3.5-bullseye 12-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "12-3.5-bookworm 12-3.5.0-bookworm 12-3.5", + "postgis": "3.5", + "readme_group": "bookworm", + "PG_MAJOR": "12", + "PG_DOCKER": "12", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "12-3.5-alpine3.19 12-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -116,30 +116,6 @@ } }, "13-3.4": { - "bullseye": { - "tags": "13-3.4-bullseye 13-3.4.3-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" - }, - "bookworm": { - "tags": "13-3.4-bookworm 13-3.4.3-bookworm 13-3.4", - "postgis": "3.4", - "readme_group": "bookworm", - "PG_MAJOR": "13", - "PG_DOCKER": "13", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - }, "alpine3.19": { "tags": "13-3.4-alpine3.19 13-3.4.3-alpine3.19", "readme_group": "alpine3.19", @@ -170,6 +146,30 @@ } }, "13-3.5": { + "bullseye": { + "tags": "13-3.5-bullseye 13-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "13-3.5-bookworm 13-3.5.0-bookworm 13-3.5", + "postgis": "3.5", + "readme_group": "bookworm", + "PG_MAJOR": "13", + "PG_DOCKER": "13", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "13-3.5-alpine3.19 13-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -216,30 +216,6 @@ } }, "14-3.4": { - "bullseye": { - "tags": "14-3.4-bullseye 14-3.4.3-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", - "PG_MAJOR": "14", - "PG_DOCKER": "14", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" - }, - "bookworm": { - "tags": "14-3.4-bookworm 14-3.4.3-bookworm 14-3.4", - "postgis": "3.4", - "readme_group": "bookworm", - "PG_MAJOR": "14", - "PG_DOCKER": "14", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - }, "alpine3.19": { "tags": "14-3.4-alpine3.19 14-3.4.3-alpine3.19", "readme_group": "alpine3.19", @@ -270,6 +246,30 @@ } }, "14-3.5": { + "bullseye": { + "tags": "14-3.5-bullseye 14-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "14-3.5-bookworm 14-3.5.0-bookworm 14-3.5", + "postgis": "3.5", + "readme_group": "bookworm", + "PG_MAJOR": "14", + "PG_DOCKER": "14", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "14-3.5-alpine3.19 14-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -316,30 +316,6 @@ } }, "15-3.4": { - "bullseye": { - "tags": "15-3.4-bullseye 15-3.4.3-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", - "PG_MAJOR": "15", - "PG_DOCKER": "15", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" - }, - "bookworm": { - "tags": "15-3.4-bookworm 15-3.4.3-bookworm 15-3.4", - "postgis": "3.4", - "readme_group": "bookworm", - "PG_MAJOR": "15", - "PG_DOCKER": "15", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - }, "alpine3.19": { "tags": "15-3.4-alpine3.19 15-3.4.3-alpine3.19", "readme_group": "alpine3.19", @@ -369,33 +345,31 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, - "15-3.4-bundle0": { + "15-3.5": { + "bullseye": { + "tags": "15-3.5-bullseye 15-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "15", + "PG_DOCKER": "15", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, "bookworm": { - "tags": "15-3.4-bundle0-bookworm 15-3.4.3-bundle0-bookworm 15-3.4-bundle0", - "postgis": "3.4", - "readme_group": "bundle0", + "tags": "15-3.5-bookworm 15-3.5.0-bookworm 15-3.5", + "postgis": "3.5", + "readme_group": "bookworm", "PG_MAJOR": "15", "PG_DOCKER": "15", "arch": "amd64 arm64", - "template": "Dockerfile.bundle0.template", - "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.2", - "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", - "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", - "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", - "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.0", - "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", - "DUCKDB_CHECKOUT": "tags/v1.1.2", - "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", - "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_2", - "PG_HINT_PLAN_CHECKOUT_SHA1": "fabd97bd76361051b91c0e772eb819a45f3fd095", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - } - }, - "15-3.5": { + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "15-3.5-alpine3.19 15-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -442,30 +416,6 @@ } }, "16-3.4": { - "bullseye": { - "tags": "16-3.4-bullseye 16-3.4.3-bullseye", - "postgis": "3.4", - "readme_group": "bullseye", - "PG_MAJOR": "16", - "PG_DOCKER": "16", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg110+1" - }, - "bookworm": { - "tags": "16-3.4-bookworm 16-3.4.3-bookworm 16-3.4", - "postgis": "3.4", - "readme_group": "bookworm", - "PG_MAJOR": "16", - "PG_DOCKER": "16", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - }, "alpine3.19": { "tags": "16-3.4-alpine3.19 16-3.4.3-alpine3.19", "readme_group": "alpine3.19", @@ -495,33 +445,31 @@ "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" } }, - "16-3.4-bundle0": { + "16-3.5": { + "bullseye": { + "tags": "16-3.5-bullseye 16-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, "bookworm": { - "tags": "16-3.4-bundle0-bookworm 16-3.4.3-bundle0-bookworm 16-3.4-bundle0", - "postgis": "3.4", - "readme_group": "bundle0", + "tags": "16-3.5-bookworm 16-3.5.0-bookworm 16-3.5", + "postgis": "3.5", + "readme_group": "bookworm", "PG_MAJOR": "16", "PG_DOCKER": "16", "arch": "amd64 arm64", - "template": "Dockerfile.bundle0.template", - "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.2", - "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", - "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", - "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", - "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.0", - "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", - "DUCKDB_CHECKOUT": "tags/v1.1.2", - "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", - "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", - "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.4.3+dfsg-2.pgdg120+1" - } - }, - "16-3.5": { + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "16-3.5-alpine3.19 16-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -605,7 +553,7 @@ }, "17-3.4": { "alpine3.20": { - "tags": "17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine alpine", + "tags": "17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -620,6 +568,30 @@ } }, "17-3.5": { + "bullseye": { + "tags": "17-3.5-bullseye 17-3.5.0-bullseye", + "postgis": "3.5", + "readme_group": "bullseye", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + }, + "bookworm": { + "tags": "17-3.5-bookworm 17-3.5.0-bookworm 17-3.5 latest", + "postgis": "3.5", + "readme_group": "bookworm", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + }, "alpine3.19": { "tags": "17-3.5-alpine3.19 17-3.5.0-alpine3.19", "readme_group": "alpine3.19", @@ -635,7 +607,7 @@ "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" }, "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine", + "tags": "17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", diff --git a/versions.sh b/versions.sh index 7a42f693b..9057c67eb 100755 --- a/versions.sh +++ b/versions.sh @@ -22,7 +22,7 @@ debian_variants=" bullseye bookworm " debian_latest="bookworm" alpine_latest="alpine3.20" -postgis_latest="3.4" +postgis_latest="3.5" postgres_latest="17" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" postgres_versions="11 12 13 14 15 16 17" From ee79a7892e8c0cf1a3e08574b268af2fc7b4c563 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 14 Oct 2024 23:39:47 +0200 Subject: [PATCH 127/167] fix debian postgis3.5 --- .circleci/config.yml | 6 ++- .github/workflows/main.yml | 6 ++- 12-3.4/bookworm/Dockerfile | 39 -------------- 12-3.4/bookworm/initdb-postgis.sh | 25 --------- 12-3.4/bookworm/tags | 1 - 12-3.4/bookworm/update-postgis.sh | 28 ---------- 12-3.4/bullseye/Dockerfile | 39 -------------- 12-3.4/bullseye/initdb-postgis.sh | 25 --------- 12-3.4/bullseye/tags | 1 - 12-3.4/bullseye/update-postgis.sh | 28 ---------- 13-3.4/bookworm/Dockerfile | 39 -------------- 13-3.4/bookworm/initdb-postgis.sh | 25 --------- 13-3.4/bookworm/tags | 1 - 13-3.4/bookworm/update-postgis.sh | 28 ---------- 13-3.4/bullseye/Dockerfile | 39 -------------- 13-3.4/bullseye/initdb-postgis.sh | 25 --------- 13-3.4/bullseye/tags | 1 - 13-3.4/bullseye/update-postgis.sh | 28 ---------- 14-3.4/bookworm/Dockerfile | 39 -------------- 14-3.4/bookworm/initdb-postgis.sh | 25 --------- 14-3.4/bookworm/tags | 1 - 14-3.4/bookworm/update-postgis.sh | 28 ---------- 14-3.4/bullseye/Dockerfile | 39 -------------- 14-3.4/bullseye/initdb-postgis.sh | 25 --------- 14-3.4/bullseye/tags | 1 - 14-3.4/bullseye/update-postgis.sh | 28 ---------- 15-3.4-bundle0/bookworm/tags | 1 - 15-3.4/bookworm/Dockerfile | 39 -------------- 15-3.4/bookworm/initdb-postgis.sh | 25 --------- 15-3.4/bookworm/tags | 1 - 15-3.4/bookworm/update-postgis.sh | 28 ---------- 15-3.4/bullseye/Dockerfile | 39 -------------- 15-3.4/bullseye/initdb-postgis.sh | 25 --------- 15-3.4/bullseye/tags | 1 - 15-3.4/bullseye/update-postgis.sh | 28 ---------- 16-3.4-bundle0/bookworm/tags | 1 - 16-3.4/bookworm/Dockerfile | 39 -------------- 16-3.4/bookworm/initdb-postgis.sh | 25 --------- 16-3.4/bookworm/tags | 1 - 16-3.4/bookworm/update-postgis.sh | 28 ---------- 16-3.4/bullseye/Dockerfile | 39 -------------- 16-3.4/bullseye/initdb-postgis.sh | 25 --------- 16-3.4/bullseye/tags | 1 - 16-3.4/bullseye/update-postgis.sh | 28 ---------- .../bookworm/Dockerfile | 6 +-- .../bookworm/initdb-bundle0.sh | 0 16-3.5-bundle0/bookworm/tags | 1 + .../bookworm/Dockerfile | 10 ++-- .../bookworm/initdb-bundle0.sh | 0 17-3.5-bundle0/bookworm/tags | 1 + README.md | 2 + manifest.sh | 46 ++++++++++++++++ versions.json | 52 +++++++++++++++++++ versions.sh | 1 + 54 files changed, 119 insertions(+), 944 deletions(-) delete mode 100644 12-3.4/bookworm/Dockerfile delete mode 100644 12-3.4/bookworm/initdb-postgis.sh delete mode 100644 12-3.4/bookworm/tags delete mode 100755 12-3.4/bookworm/update-postgis.sh delete mode 100644 12-3.4/bullseye/Dockerfile delete mode 100644 12-3.4/bullseye/initdb-postgis.sh delete mode 100644 12-3.4/bullseye/tags delete mode 100755 12-3.4/bullseye/update-postgis.sh delete mode 100644 13-3.4/bookworm/Dockerfile delete mode 100644 13-3.4/bookworm/initdb-postgis.sh delete mode 100644 13-3.4/bookworm/tags delete mode 100755 13-3.4/bookworm/update-postgis.sh delete mode 100644 13-3.4/bullseye/Dockerfile delete mode 100644 13-3.4/bullseye/initdb-postgis.sh delete mode 100644 13-3.4/bullseye/tags delete mode 100755 13-3.4/bullseye/update-postgis.sh delete mode 100644 14-3.4/bookworm/Dockerfile delete mode 100644 14-3.4/bookworm/initdb-postgis.sh delete mode 100644 14-3.4/bookworm/tags delete mode 100755 14-3.4/bookworm/update-postgis.sh delete mode 100644 14-3.4/bullseye/Dockerfile delete mode 100644 14-3.4/bullseye/initdb-postgis.sh delete mode 100644 14-3.4/bullseye/tags delete mode 100755 14-3.4/bullseye/update-postgis.sh delete mode 100644 15-3.4-bundle0/bookworm/tags delete mode 100644 15-3.4/bookworm/Dockerfile delete mode 100644 15-3.4/bookworm/initdb-postgis.sh delete mode 100644 15-3.4/bookworm/tags delete mode 100755 15-3.4/bookworm/update-postgis.sh delete mode 100644 15-3.4/bullseye/Dockerfile delete mode 100644 15-3.4/bullseye/initdb-postgis.sh delete mode 100644 15-3.4/bullseye/tags delete mode 100755 15-3.4/bullseye/update-postgis.sh delete mode 100644 16-3.4-bundle0/bookworm/tags delete mode 100644 16-3.4/bookworm/Dockerfile delete mode 100644 16-3.4/bookworm/initdb-postgis.sh delete mode 100644 16-3.4/bookworm/tags delete mode 100755 16-3.4/bookworm/update-postgis.sh delete mode 100644 16-3.4/bullseye/Dockerfile delete mode 100644 16-3.4/bullseye/initdb-postgis.sh delete mode 100644 16-3.4/bullseye/tags delete mode 100755 16-3.4/bullseye/update-postgis.sh rename {16-3.4-bundle0 => 16-3.5-bundle0}/bookworm/Dockerfile (99%) rename {15-3.4-bundle0 => 16-3.5-bundle0}/bookworm/initdb-bundle0.sh (100%) create mode 100644 16-3.5-bundle0/bookworm/tags rename {15-3.4-bundle0 => 17-3.5-bundle0}/bookworm/Dockerfile (97%) rename {16-3.4-bundle0 => 17-3.5-bundle0}/bookworm/initdb-bundle0.sh (100%) create mode 100644 17-3.5-bundle0/bookworm/tags diff --git a/.circleci/config.yml b/.circleci/config.yml index f8afccf92..91c876f32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,15 +160,17 @@ workflows: "16-3.4-alpine3.20", "16-3.5-alpine3.19", "16-3.5-alpine3.20", - "16-3.5-bookworm", +# --skip-- "16-3.5-bookworm", --> generated with the related bundle job! "16-3.5-bullseye", + "16-3.5-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", "17-3.4-alpine3.20", "17-3.5-alpine3.19", "17-3.5-alpine3.20", - "17-3.5-bookworm", +# --skip-- "17-3.5-bookworm", --> generated with the related bundle job! "17-3.5-bullseye", + "17-3.5-bundle0-bookworm", "17-master-bookworm", "17-recent-bookworm", #circleci-targets-end diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4bdcc1180..2a7d64d83 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,15 +61,17 @@ jobs: - { version: "16-3.4", variant: "alpine3.20" } - { version: "16-3.5", variant: "alpine3.19" } - { version: "16-3.5", variant: "alpine3.20" } - - { version: "16-3.5", variant: "bookworm" } +# --skip-- - { version: "16-3.5", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.5", variant: "bullseye" } + - { version: "16-3.5-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17-3.4", variant: "alpine3.20" } - { version: "17-3.5", variant: "alpine3.19" } - { version: "17-3.5", variant: "alpine3.20" } - - { version: "17-3.5", variant: "bookworm" } +# --skip-- - { version: "17-3.5", variant: "bookworm" } --> generated with the related bundle job! - { version: "17-3.5", variant: "bullseye" } + - { version: "17-3.5-bundle0", variant: "bookworm" } - { version: "17-master", variant: "bookworm" } - { version: "17-recent", variant: "bookworm" } #matrix-include-end diff --git a/12-3.4/bookworm/Dockerfile b/12-3.4/bookworm/Dockerfile deleted file mode 100644 index 9c849f2a8..000000000 --- a/12-3.4/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:12-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/bookworm/initdb-postgis.sh b/12-3.4/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.4/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.4/bookworm/tags b/12-3.4/bookworm/tags deleted file mode 100644 index a8b775788..000000000 --- a/12-3.4/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-bookworm 12-3.4.3-bookworm 12-3.4 diff --git a/12-3.4/bookworm/update-postgis.sh b/12-3.4/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.4/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.4/bullseye/Dockerfile b/12-3.4/bullseye/Dockerfile deleted file mode 100644 index d225ba351..000000000 --- a/12-3.4/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:12-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/bullseye/initdb-postgis.sh b/12-3.4/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.4/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.4/bullseye/tags b/12-3.4/bullseye/tags deleted file mode 100644 index bc96f84b2..000000000 --- a/12-3.4/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-bullseye 12-3.4.3-bullseye diff --git a/12-3.4/bullseye/update-postgis.sh b/12-3.4/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.4/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/13-3.4/bookworm/Dockerfile b/13-3.4/bookworm/Dockerfile deleted file mode 100644 index 526f3624a..000000000 --- a/13-3.4/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:13-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/bookworm/initdb-postgis.sh b/13-3.4/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/13-3.4/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/13-3.4/bookworm/tags b/13-3.4/bookworm/tags deleted file mode 100644 index 6d6aa6b85..000000000 --- a/13-3.4/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-bookworm 13-3.4.3-bookworm 13-3.4 diff --git a/13-3.4/bookworm/update-postgis.sh b/13-3.4/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/13-3.4/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/13-3.4/bullseye/Dockerfile b/13-3.4/bullseye/Dockerfile deleted file mode 100644 index 4807b90fe..000000000 --- a/13-3.4/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:13-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/13-3.4/bullseye/initdb-postgis.sh b/13-3.4/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/13-3.4/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/13-3.4/bullseye/tags b/13-3.4/bullseye/tags deleted file mode 100644 index 0b6193d30..000000000 --- a/13-3.4/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-bullseye 13-3.4.3-bullseye diff --git a/13-3.4/bullseye/update-postgis.sh b/13-3.4/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/13-3.4/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/14-3.4/bookworm/Dockerfile b/14-3.4/bookworm/Dockerfile deleted file mode 100644 index af91d7c8d..000000000 --- a/14-3.4/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:14-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/bookworm/initdb-postgis.sh b/14-3.4/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/14-3.4/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.4/bookworm/tags b/14-3.4/bookworm/tags deleted file mode 100644 index f954963b8..000000000 --- a/14-3.4/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-bookworm 14-3.4.3-bookworm 14-3.4 diff --git a/14-3.4/bookworm/update-postgis.sh b/14-3.4/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/14-3.4/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/14-3.4/bullseye/Dockerfile b/14-3.4/bullseye/Dockerfile deleted file mode 100644 index c9cab5391..000000000 --- a/14-3.4/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:14-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/14-3.4/bullseye/initdb-postgis.sh b/14-3.4/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/14-3.4/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/14-3.4/bullseye/tags b/14-3.4/bullseye/tags deleted file mode 100644 index e022878a4..000000000 --- a/14-3.4/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-bullseye 14-3.4.3-bullseye diff --git a/14-3.4/bullseye/update-postgis.sh b/14-3.4/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/14-3.4/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags deleted file mode 100644 index 67c8f721d..000000000 --- a/15-3.4-bundle0/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-bundle0-bookworm 15-3.4.3-bundle0-bookworm 15-3.4-bundle0 diff --git a/15-3.4/bookworm/Dockerfile b/15-3.4/bookworm/Dockerfile deleted file mode 100644 index c8a0fad1c..000000000 --- a/15-3.4/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:15-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4/bookworm/initdb-postgis.sh b/15-3.4/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/15-3.4/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags deleted file mode 100644 index d1915f763..000000000 --- a/15-3.4/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-bookworm 15-3.4.3-bookworm 15-3.4 diff --git a/15-3.4/bookworm/update-postgis.sh b/15-3.4/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/15-3.4/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/15-3.4/bullseye/Dockerfile b/15-3.4/bullseye/Dockerfile deleted file mode 100644 index e069c976a..000000000 --- a/15-3.4/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:15-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/15-3.4/bullseye/initdb-postgis.sh b/15-3.4/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/15-3.4/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/15-3.4/bullseye/tags b/15-3.4/bullseye/tags deleted file mode 100644 index c379f1160..000000000 --- a/15-3.4/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-bullseye 15-3.4.3-bullseye diff --git a/15-3.4/bullseye/update-postgis.sh b/15-3.4/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/15-3.4/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags deleted file mode 100644 index 40a07e675..000000000 --- a/16-3.4-bundle0/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-bundle0-bookworm 16-3.4.3-bundle0-bookworm 16-3.4-bundle0 diff --git a/16-3.4/bookworm/Dockerfile b/16-3.4/bookworm/Dockerfile deleted file mode 100644 index 500553b96..000000000 --- a/16-3.4/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:16-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/bookworm/initdb-postgis.sh b/16-3.4/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/16-3.4/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags deleted file mode 100644 index 6a87d154b..000000000 --- a/16-3.4/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-bookworm 16-3.4.3-bookworm 16-3.4 diff --git a/16-3.4/bookworm/update-postgis.sh b/16-3.4/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/16-3.4/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/16-3.4/bullseye/Dockerfile b/16-3.4/bullseye/Dockerfile deleted file mode 100644 index 157a88dd3..000000000 --- a/16-3.4/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:16-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/16-3.4/bullseye/initdb-postgis.sh b/16-3.4/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/16-3.4/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/16-3.4/bullseye/tags b/16-3.4/bullseye/tags deleted file mode 100644 index 0bf553b21..000000000 --- a/16-3.4/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-bullseye 16-3.4.3-bullseye diff --git a/16-3.4/bullseye/update-postgis.sh b/16-3.4/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/16-3.4/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile similarity index 99% rename from 16-3.4-bundle0/bookworm/Dockerfile rename to 16-3.5-bundle0/bookworm/Dockerfile index c4cbfec74..94aa641ee 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 @@ -248,10 +248,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.4-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 16-3.4-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 16-3.5-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/15-3.4-bundle0/bookworm/initdb-bundle0.sh b/16-3.5-bundle0/bookworm/initdb-bundle0.sh similarity index 100% rename from 15-3.4-bundle0/bookworm/initdb-bundle0.sh rename to 16-3.5-bundle0/bookworm/initdb-bundle0.sh diff --git a/16-3.5-bundle0/bookworm/tags b/16-3.5-bundle0/bookworm/tags new file mode 100644 index 000000000..43edcb45f --- /dev/null +++ b/16-3.5-bundle0/bookworm/tags @@ -0,0 +1 @@ +16-3.5-bundle0-bookworm 16-3.5.0-bundle0-bookworm 16-3.5-bundle0 diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/17-3.5-bundle0/bookworm/Dockerfile similarity index 97% rename from 15-3.4-bundle0/bookworm/Dockerfile rename to 17-3.5-bundle0/bookworm/Dockerfile index 1c03609c3..0284dd7ab 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/17-3.5-bundle0/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG REGISTRY=docker.io ARG REPO_NAME=imresamu ARG IMAGE_NAME=postgis-amd64 -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 @@ -36,8 +36,8 @@ ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git -ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_2 -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=fabd97bd76361051b91c0e772eb819a45f3fd095 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL17_1_7_0 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=85e07af6ca4675a26fa2281370c37371b883b2a9 ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.2 @@ -253,10 +253,10 @@ RUN set -eux \ && rm -rf .git #install: psql < /pg_svg/pg-svg-lib.sql -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:15-3.4-bookworm +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 15-3.4-bookworm " \ + org.opencontainers.image.description="PostGIS Bundle - 17-3.5-bookworm " \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" # install all utf8 locales; diff --git a/16-3.4-bundle0/bookworm/initdb-bundle0.sh b/17-3.5-bundle0/bookworm/initdb-bundle0.sh similarity index 100% rename from 16-3.4-bundle0/bookworm/initdb-bundle0.sh rename to 17-3.5-bundle0/bookworm/initdb-bundle0.sh diff --git a/17-3.5-bundle0/bookworm/tags b/17-3.5-bundle0/bookworm/tags new file mode 100644 index 000000000..c254c02db --- /dev/null +++ b/17-3.5-bundle0/bookworm/tags @@ -0,0 +1 @@ +17-3.5-bundle0-bookworm 17-3.5.0-bundle0-bookworm 17-3.5-bundle0 bundle0 diff --git a/README.md b/README.md index 6238aea46..98c62301c 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,8 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | +| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.0 | +| [`17-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bundle0-bookworm), [`17-3.5.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-bundle0-bookworm), [`17-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.0 | diff --git a/manifest.sh b/manifest.sh index 69d2a68e1..055d18154 100755 --- a/manifest.sh +++ b/manifest.sh @@ -636,6 +636,26 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5.0-bullseye \ --target ${dockername}:16-3.5.0-bullseye || true +# ----- 16-3.5-bundle0-bookworm ----- + +echo "manifest: ${dockername}:16-3.5-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-bundle0-bookworm \ + --target ${dockername}:16-3.5-bundle0-bookworm || true + +echo "manifest: ${dockername}:16-3.5.0-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.0-bundle0-bookworm \ + --target ${dockername}:16-3.5.0-bundle0-bookworm || true + +echo "manifest: ${dockername}:16-3.5-bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-bundle0 \ + --target ${dockername}:16-3.5-bundle0 || true + # ----- 16-master-bookworm ----- echo "manifest: ${dockername}:16-master-bookworm" @@ -776,6 +796,32 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5.0-bullseye \ --target ${dockername}:17-3.5.0-bullseye || true +# ----- 17-3.5-bundle0-bookworm ----- + +echo "manifest: ${dockername}:17-3.5-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bundle0-bookworm \ + --target ${dockername}:17-3.5-bundle0-bookworm || true + +echo "manifest: ${dockername}:17-3.5.0-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.0-bundle0-bookworm \ + --target ${dockername}:17-3.5.0-bundle0-bookworm || true + +echo "manifest: ${dockername}:17-3.5-bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bundle0 \ + --target ${dockername}:17-3.5-bundle0 || true + +echo "manifest: ${dockername}:bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:bundle0 \ + --target ${dockername}:bundle0 || true + # ----- 17-master-bookworm ----- echo "manifest: ${dockername}:17-master-bookworm" diff --git a/versions.json b/versions.json index aff51075d..9e2d460ad 100644 --- a/versions.json +++ b/versions.json @@ -499,6 +499,32 @@ "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, + "16-3.5-bundle0": { + "bookworm": { + "tags": "16-3.5-bundle0-bookworm 16-3.5.0-bundle0-bookworm 16-3.5-bundle0", + "postgis": "3.5", + "readme_group": "bundle0", + "PG_MAJOR": "16", + "PG_DOCKER": "16", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle0.template", + "initfile": "initdb-bundle0.sh", + "MOBILITYDB_CHECKOUT": "tags/v1.1.2", + "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", + "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.17.0", + "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", + "DUCKDB_CHECKOUT": "tags/v1.1.2", + "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", + "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", + "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + } + }, "16-master": { "bookworm": { "tags": "16-master-bookworm 16-master", @@ -621,6 +647,32 @@ "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, + "17-3.5-bundle0": { + "bookworm": { + "tags": "17-3.5-bundle0-bookworm 17-3.5.0-bundle0-bookworm 17-3.5-bundle0 bundle0", + "postgis": "3.5", + "readme_group": "bundle0", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle0.template", + "initfile": "initdb-bundle0.sh", + "MOBILITYDB_CHECKOUT": "tags/v1.1.2", + "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", + "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "TIMESCALEDB_CHECKOUT": "tags/2.17.0", + "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", + "DUCKDB_CHECKOUT": "tags/v1.1.2", + "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", + "PG_HINT_PLAN_CHECKOUT": "tags/REL17_1_7_0", + "PG_HINT_PLAN_CHECKOUT_SHA1": "85e07af6ca4675a26fa2281370c37371b883b2a9", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + } + }, "17-master": { "bookworm": { "tags": "17-master-bookworm 17-master", diff --git a/versions.sh b/versions.sh index 9057c67eb..849ed5464 100755 --- a/versions.sh +++ b/versions.sh @@ -271,6 +271,7 @@ get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases nore get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases norepo "${PROJ_CHECKOUT_LOCK}" get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases norepo "${SFCGAL_CHECKOUT_LOCK}" +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL17 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL14 "" From f1047e9022771487adc1e1aceeea04dc4eb70303 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 15 Oct 2024 12:32:03 +0200 Subject: [PATCH 128/167] remove 17-bundle0, some packages is not updated --- .circleci/config.yml | 3 +- .github/workflows/main.yml | 3 +- 16-3.5-bundle0/bookworm/Dockerfile | 8 +- 17-3.5-bundle0/bookworm/Dockerfile | 435 ---------------------- 17-3.5-bundle0/bookworm/initdb-bundle0.sh | 9 - 17-3.5-bundle0/bookworm/tags | 1 - Dockerfile.bundle0.template | 21 +- README.md | 3 +- manifest.sh | 26 -- tools/install_manifest-tool.sh | 2 +- versions.json | 26 -- 11 files changed, 29 insertions(+), 508 deletions(-) delete mode 100644 17-3.5-bundle0/bookworm/Dockerfile delete mode 100644 17-3.5-bundle0/bookworm/initdb-bundle0.sh delete mode 100644 17-3.5-bundle0/bookworm/tags diff --git a/.circleci/config.yml b/.circleci/config.yml index 91c876f32..724c537a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,9 +168,8 @@ workflows: "17-3.4-alpine3.20", "17-3.5-alpine3.19", "17-3.5-alpine3.20", -# --skip-- "17-3.5-bookworm", --> generated with the related bundle job! + "17-3.5-bookworm", "17-3.5-bullseye", - "17-3.5-bundle0-bookworm", "17-master-bookworm", "17-recent-bookworm", #circleci-targets-end diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a7d64d83..0a78d6552 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,9 +69,8 @@ jobs: - { version: "17-3.4", variant: "alpine3.20" } - { version: "17-3.5", variant: "alpine3.19" } - { version: "17-3.5", variant: "alpine3.20" } -# --skip-- - { version: "17-3.5", variant: "bookworm" } --> generated with the related bundle job! + - { version: "17-3.5", variant: "bookworm" } - { version: "17-3.5", variant: "bullseye" } - - { version: "17-3.5-bundle0", variant: "bookworm" } - { version: "17-master", variant: "bookworm" } - { version: "17-recent", variant: "bookworm" } #matrix-include-end diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 94aa641ee..d981443d4 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -55,6 +55,7 @@ RUN set -eux \ build-essential \ cmake \ curl \ + flex \ g++ \ git \ make \ @@ -202,16 +203,18 @@ RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks + RUN USE_PGXS=1 pgxn install sqlite_fdw + FROM builder as builder-other ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + # Add hydradatabase -# TODO hydradatabase version! RUN set -eux \ && git clone --depth 1 https://github.com/hydradatabase/hydra \ && cd hydra/columnar \ @@ -302,9 +305,10 @@ RUN set -eux \ vip-manager \ \ postgresql-$PG_MAJOR-age \ + postgresql-$PG_MAJOR-decoderbufs \ + \ postgresql-$PG_MAJOR-asn1oid \ postgresql-$PG_MAJOR-cron \ - postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ postgresql-$PG_MAJOR-h3 \ diff --git a/17-3.5-bundle0/bookworm/Dockerfile b/17-3.5-bundle0/bookworm/Dockerfile deleted file mode 100644 index 0284dd7ab..000000000 --- a/17-3.5-bundle0/bookworm/Dockerfile +++ /dev/null @@ -1,435 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle0.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - - -# Experimental Geo Bundle package. -# This is a work in progress and not yet ready for production. -# Some packages will be removed from this bundle and others will be added. -# The goal is to have a bundle that includes all the most popular extensions with PostGIS - -# set the base image , make build-* is overwriting with the actual value ! - -ARG REGISTRY=docker.io -ARG REPO_NAME=imresamu -ARG IMAGE_NAME=postgis-amd64 - -ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm - -ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 - -ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd - -ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git -ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 -ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 - -ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git -ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL17_1_7_0 -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=85e07af6ca4675a26fa2281370c37371b883b2a9 - -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.2 - -FROM ${PGIS1_BASE_IMAGE} AS builder - -ARG PGIS1_DUCKDB_CHECKOUT - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - autotools-dev \ - bison \ - build-essential \ - cmake \ - curl \ - g++ \ - git \ - make \ - pgxnclient \ - postgresql-server-dev-$PG_MAJOR \ - unzip \ - wget \ - # MobilityDB - libgeos++-dev \ - libgsl-dev \ - libjson-c-dev \ - libproj-dev \ - # TimescaleDB - libkrb5-dev \ - # pgsql-http - libcurl4-gnutls-dev \ - # hydra (columnar) - liblz4-dev \ - # pgsql-gzip - zlib1g-dev \ - # sqlite_fdw - sqlite3 \ - # plv8 - ninja-build \ - pkg-config \ - # bytemagic - libmagic-dev \ - # pgsoudium \ - libsodium-dev \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -FROM builder as builder-http-gzip - -ARG PGIS1_PGSQL_HTTP_REPOSITORY -ARG PGIS1_PGSQL_HTTP_CHECKOUT -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 - -ARG PGIS1_PGSQL_GZIP_REPOSITORY -ARG PGIS1_PGSQL_GZIP_CHECKOUT -ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 - -RUN set -eux \ - && mkdir -p /pgsql-gzip \ - && cd pgsql-gzip \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_gzip_last_commit.txt \ - && make -j$(nproc) \ - && make install - -RUN set -eux \ - && mkdir -p /pgsql-http \ - && cd pgsql-http \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_http_last_commit.txt \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-timescaledb - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY -ARG PGIS1_TIMESCALEDB_REPOSITORY -ARG PGIS1_TIMESCALEDB_CHECKOUT -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 - -# Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -eux \ - && mkdir -p /timescaledb \ - && cd timescaledb \ - && git init \ - && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_timescaledb_last_commit.txt \ - && ./bootstrap \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - \ - -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ - -DREGRESS_CHECKS=OFF \ - -DSEND_TELEMETRY_DEFAULT=NO \ - -DTAP_CHECKS=OFF \ - -DWARNINGS_AS_ERRORS=OFF \ - -DENABLE_DEBUG_UTILS=OFF \ - && cd build \ - && make -j$(nproc) \ - && make install - -FROM builder as builder-mobilitydb - -ARG PGIS1_MOBILITYDB_REPOSITORY -ARG PGIS1_MOBILITYDB_CHECKOUT -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 - -# Install MobilityDB -RUN set -eux \ - && mkdir -p /MobilityDB \ - && cd MobilityDB \ - && git init \ - && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_MobilityDB_last_commit.txt \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - .. \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-pgxn - -RUN pgxn install --verbose byteamagic -RUN pgxn install --verbose ddlx -RUN pgxn install --verbose dsef -RUN pgxn install --verbose json_accessors -RUN pgxn install --verbose lostgis - -#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet -RUN pgxn install --verbose permuteseq -RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl -RUN pgxn install --verbose pg_roaringbitmap -RUN pgxn install --verbose pg_rowalesce -RUN pgxn install --verbose pg_uuidv7 -RUN pgxn install --verbose pg_xenophile -RUN pgxn install --verbose pg_xxhash -RUN pgxn install --verbose pgsodium -RUN pgxn install --verbose pgsql_tweaks -RUN USE_PGXS=1 pgxn install sqlite_fdw - -FROM builder as builder-other - -ARG PGIS1_PG_HINT_PLAN_REPOSITORY -ARG PGIS1_PG_HINT_PLAN_CHECKOUT -ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 - -# Add hydradatabase -# TODO hydradatabase version! -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ - && cd hydra/columnar \ - && git checkout main \ - && export COLUMNAR_O3=1 \ - && ./configure \ - && make -j$(nproc) \ - && make install - -# # # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) -# # TODO: add pg_quack version! -# RUN set -eux \ -# && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ -# && cd pg_quack \ -# && make -j$(nproc) \ -# && make install -# -# install pg_hint_plan -RUN set -eux \ - && mkdir pg_hint_plan \ - && cd pg_hint_plan \ - && git init \ - && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ - && make -j$(nproc) \ - && make install - -RUN set -eux \ - && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ - && cd postgres_dba \ - && rm -rf .git - -RUN set -eux \ - && git clone --depth 1 https://github.com/dr-jts/pg_svg.git \ - && cd pg_svg \ - && rm -rf .git - #install: psql < /pg_svg/pg-svg-lib.sql - -FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 17-3.5-bookworm " \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -# install all utf8 locales; -# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization -RUN set -eux \ - && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ - && locale-gen - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - \ - bzip2 \ - curl \ - jq \ - unzip \ - wget \ - \ - gdal-bin \ - proj-bin \ - sqlite3 \ - \ - pipx \ - python-is-python3 \ - python3 \ - python3-geoalchemy2 \ - python3-pglast \ - python3-pip \ - python3-psycopg2 \ - python3-setuptools \ - python3-sqlalchemy \ - \ - postgis \ - postgresql \ - postgresql-client-common \ - postgresql-common \ - postgresql-contrib \ - postgresql-plpython3-$PG_MAJOR \ - postgresql-postgis \ - postgresql-postgis-scripts \ - \ - pg-activity \ - pgbackrest \ - pgbadger \ - pgtap \ - pgtop \ - pspg \ - vip-manager \ - \ - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-asn1oid \ - postgresql-$PG_MAJOR-cron \ - postgresql-$PG_MAJOR-decoderbufs \ - postgresql-$PG_MAJOR-extra-window-functions \ - postgresql-$PG_MAJOR-first-last-agg \ - postgresql-$PG_MAJOR-h3 \ - postgresql-$PG_MAJOR-hll \ - postgresql-$PG_MAJOR-hypopg \ - postgresql-$PG_MAJOR-icu-ext \ - postgresql-$PG_MAJOR-jsquery \ - postgresql-$PG_MAJOR-numeral \ - postgresql-$PG_MAJOR-ogr-fdw \ - postgresql-$PG_MAJOR-partman \ - postgresql-$PG_MAJOR-periods \ - postgresql-$PG_MAJOR-pg-fact-loader \ - postgresql-$PG_MAJOR-pg-failover-slots \ - postgresql-$PG_MAJOR-pg-stat-kcache \ - postgresql-$PG_MAJOR-pg-wait-sampling \ - postgresql-$PG_MAJOR-pgaudit \ - postgresql-$PG_MAJOR-pgl-ddl-deploy \ - postgresql-$PG_MAJOR-pglogical \ - postgresql-$PG_MAJOR-pgmp \ - postgresql-$PG_MAJOR-pgpcre \ - postgresql-$PG_MAJOR-pgq3 \ - postgresql-$PG_MAJOR-pgrouting \ - postgresql-$PG_MAJOR-pgrouting-scripts \ - postgresql-$PG_MAJOR-pgsphere \ - postgresql-$PG_MAJOR-pgtap \ - postgresql-$PG_MAJOR-pgvector \ - postgresql-$PG_MAJOR-pldebugger \ - postgresql-$PG_MAJOR-plpgsql-check \ - postgresql-$PG_MAJOR-pointcloud \ - postgresql-$PG_MAJOR-prefix \ - postgresql-$PG_MAJOR-prioritize \ - postgresql-$PG_MAJOR-q3c \ - postgresql-$PG_MAJOR-repack \ - postgresql-$PG_MAJOR-rum \ - postgresql-$PG_MAJOR-show-plans \ - postgresql-$PG_MAJOR-squeeze \ - # add MobilityDb missing dependency from libgsl-dev - libgsl27 \ - # MeCab based tokenizer for pgdg-pgroonga - groonga-tokenizer-mecab \ - # bytemagic - libmagic1 libmagic-mgc \ - # pgsodium - libsodium23 \ - \ - && rm -Rf /root/.cache/pip \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -ARG PGIS1_DUCKDB_CHECKOUT -ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} -RUN arch=$(uname -m) \ - && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') \ - && echo "DUCKDB_VERSION=${DUCKDB_VERSION}" \ - && echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" \ - && case "$arch" in \ - x86_64) \ - duck_binary="duckdb_cli-linux-amd64.zip" ;; \ - aarch64) \ - duck_binary="duckdb_cli-linux-aarch64.zip" ;; \ - *) \ - echo "Unsupported architecture: $arch"; exit 1 ;; \ - esac \ - && wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ - && unzip $duck_binary -d /usr/local/bin \ - && rm $duck_binary \ - && duckdb --version - -# install extensions -# https://duckdb.org/docs/extensions/overview.html -ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" -RUN for e in ${DUCKDB_EXTENSIONS} ; do \ - echo "Installing $e ..."; \ - duckdb -c "INSTALL $e;"; \ - echo "LOAD $e;" >> $HOME/.duckdbrc; \ - done - -# Install from stages -COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-other /postgres_dba /postgres_dba -COPY --from=builder-other /pg_svg /pg_svg - -# check any missing dependencies -RUN set -eux \ - && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true - -# multiple LLVM existance is not optimal; so we give a warning. -# known problem: duplicated LLVM -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "WARNING: More than one llvm package or none at all found!"; \ - dpkg -l | grep llvm ; \ - fi - -# add MobilityDB requirements -RUN set -eux \ - && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ - # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ - # MobilityDB recomendation - echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ - echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample - -# for postgres_dba Use ":dba" to see menu -RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc - -COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh diff --git a/17-3.5-bundle0/bookworm/initdb-bundle0.sh b/17-3.5-bundle0/bookworm/initdb-bundle0.sh deleted file mode 100644 index 5f2c5d116..000000000 --- a/17-3.5-bundle0/bookworm/initdb-bundle0.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# install pg-svg-lib -"${psql[@]}" diff --git a/manifest.sh b/manifest.sh index 055d18154..588949d22 100755 --- a/manifest.sh +++ b/manifest.sh @@ -796,32 +796,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5.0-bullseye \ --target ${dockername}:17-3.5.0-bullseye || true -# ----- 17-3.5-bundle0-bookworm ----- - -echo "manifest: ${dockername}:17-3.5-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5-bundle0-bookworm \ - --target ${dockername}:17-3.5-bundle0-bookworm || true - -echo "manifest: ${dockername}:17-3.5.0-bundle0-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.0-bundle0-bookworm \ - --target ${dockername}:17-3.5.0-bundle0-bookworm || true - -echo "manifest: ${dockername}:17-3.5-bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5-bundle0 \ - --target ${dockername}:17-3.5-bundle0 || true - -echo "manifest: ${dockername}:bundle0" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:bundle0 \ - --target ${dockername}:bundle0 || true - # ----- 17-master-bookworm ----- echo "manifest: ${dockername}:17-master-bookworm" diff --git a/tools/install_manifest-tool.sh b/tools/install_manifest-tool.sh index d20ac623a..c3de5e5b6 100755 --- a/tools/install_manifest-tool.sh +++ b/tools/install_manifest-tool.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail # https://github.com/estesp/manifest-tool -version="2.1.6" +version="2.1.8" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then diff --git a/versions.json b/versions.json index 9e2d460ad..d76e0c7cb 100644 --- a/versions.json +++ b/versions.json @@ -647,32 +647,6 @@ "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" } }, - "17-3.5-bundle0": { - "bookworm": { - "tags": "17-3.5-bundle0-bookworm 17-3.5.0-bundle0-bookworm 17-3.5-bundle0 bundle0", - "postgis": "3.5", - "readme_group": "bundle0", - "PG_MAJOR": "17", - "PG_DOCKER": "17", - "arch": "amd64 arm64", - "template": "Dockerfile.bundle0.template", - "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.2", - "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", - "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", - "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", - "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.0", - "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", - "DUCKDB_CHECKOUT": "tags/v1.1.2", - "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", - "PG_HINT_PLAN_CHECKOUT": "tags/REL17_1_7_0", - "PG_HINT_PLAN_CHECKOUT_SHA1": "85e07af6ca4675a26fa2281370c37371b883b2a9", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" - } - }, "17-master": { "bookworm": { "tags": "17-master-bookworm 17-master", From f01e853596e238d5a6425a2fdc149ebc6971919d Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 17 Oct 2024 20:00:17 +0000 Subject: [PATCH 129/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20MOBIL?= =?UTF-8?q?ITYDB:v1.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index d981443d4..2015a33de 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -19,8 +19,8 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.1.2 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=6088e7bc10a31dee34fbc3e3139288a218e4ec65 +ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.2.0 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=f457e35de8202a6e8f1b8bb72603b2fcb3dc0321 ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 diff --git a/README.md b/README.md index 356f37cb2..cb3e86d1f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-10-15) +## Versions (2024-10-17) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index d76e0c7cb..7c21ea0fa 100644 --- a/versions.json +++ b/versions.json @@ -509,8 +509,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.1.2", - "MOBILITYDB_CHECKOUT_SHA1": "6088e7bc10a31dee34fbc3e3139288a218e4ec65", + "MOBILITYDB_CHECKOUT": "tags/v1.2.0", + "MOBILITYDB_CHECKOUT_SHA1": "f457e35de8202a6e8f1b8bb72603b2fcb3dc0321", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", From ab9ededdd81aae7d9dc966ec73160957a219c4f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 19:29:58 +0200 Subject: [PATCH 130/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20(#67)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 2015a33de..7a24a4792 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.2.0 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=f457e35de8202a6e8f1b8bb72603b2fcb3dc0321 +ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=60048b5b4b7ce2f7560c024d1af024db73b3bd5b ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 diff --git a/README.md b/README.md index cb3e86d1f..371aca482 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-10-17) +## Versions (2024-10-18) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 7c21ea0fa..bf59c1896 100644 --- a/versions.json +++ b/versions.json @@ -510,7 +510,7 @@ "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", "MOBILITYDB_CHECKOUT": "tags/v1.2.0", - "MOBILITYDB_CHECKOUT_SHA1": "f457e35de8202a6e8f1b8bb72603b2fcb3dc0321", + "MOBILITYDB_CHECKOUT_SHA1": "60048b5b4b7ce2f7560c024d1af024db73b3bd5b", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", From 8d1c4ed438da14e2d2e686caee30a7b59612a41c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 21 Oct 2024 20:00:14 +0000 Subject: [PATCH 131/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20CGAL:?= =?UTF-8?q?v6.0.1,TIMESCALEDB:2.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 7a24a4792..68777f0da 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=beb03d6d4c61dbd02291ef2c661c00155ddb79c9 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index d8cb43d83..e2438ff44 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -21,7 +21,7 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 -ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -30,7 +30,7 @@ ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 -ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a +ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 95b759de2..24192e19f 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 804146401..a410adc69 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -21,7 +21,7 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 -ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -30,7 +30,7 @@ ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 -ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a +ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 645dd9a4d..2c9be173a 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 371aca482..de68130d8 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-10-18) +## Versions (2024-10-21) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 588949d22..ea12fe032 100755 --- a/manifest.sh +++ b/manifest.sh @@ -678,11 +678,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -818,11 +818,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index bf59c1896..cd7e0687a 100644 --- a/versions.json +++ b/versions.json @@ -515,8 +515,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.0", - "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", + "TIMESCALEDB_CHECKOUT": "tags/2.17.1", + "TIMESCALEDB_CHECKOUT_SHA1": "beb03d6d4c61dbd02291ef2c661c00155ddb79c9", "DUCKDB_CHECKOUT": "tags/v1.1.2", "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -572,8 +572,8 @@ "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", - "CGAL_CHECKOUT": "tags/v6.0", - "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", + "CGAL_CHECKOUT": "tags/v6.0.1", + "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" } }, @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -694,8 +694,8 @@ "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", - "CGAL_CHECKOUT": "tags/v6.0", - "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", + "CGAL_CHECKOUT": "tags/v6.0.1", + "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" } }, From 421c27310397c264a4bee02fa11953df572971e9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 4 Nov 2024 20:00:23 +0000 Subject: [PATCH 132/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 68777f0da..3eb888932 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.3 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index de68130d8..739382d0b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-10-21) +## Versions (2024-11-04) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index cd7e0687a..cdcdb410f 100644 --- a/versions.json +++ b/versions.json @@ -517,8 +517,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.17.1", "TIMESCALEDB_CHECKOUT_SHA1": "beb03d6d4c61dbd02291ef2c661c00155ddb79c9", - "DUCKDB_CHECKOUT": "tags/v1.1.2", - "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", + "DUCKDB_CHECKOUT": "tags/v1.1.3", + "DUCKDB_CHECKOUT_SHA1": "19864453f7d0ed095256d848b46e7b8630989bac", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From 49bcc1c63d29ff6ec1dbae40c6cd7f0c99deeaa4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:22:15 +0100 Subject: [PATCH 133/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GDAL:?= =?UTF-8?q?v3.10.0=20(#70)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 24 ++++++++++++------------ versions.json | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e2438ff44..9c18177a3 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 +ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 24192e19f..1d697270c 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index a410adc69..7a225bea3 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 +ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 2c9be173a..02f8ebfec 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 739382d0b..87cd37106 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-11-04) +## Versions (2024-11-06) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index ea12fe032..55114b56d 100755 --- a/manifest.sh +++ b/manifest.sh @@ -678,17 +678,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -818,17 +818,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index cdcdb410f..cc64ed928 100644 --- a/versions.json +++ b/versions.json @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -566,8 +566,8 @@ "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.3", - "GDAL_CHECKOUT_SHA1": "501754d048e07b07932ec268b6ed3c43ea0819e3", + "GDAL_CHECKOUT": "tags/v3.10.0", + "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -688,8 +688,8 @@ "PROJ_CHECKOUT": "tags/9.5.0", "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.9.3", - "GDAL_CHECKOUT_SHA1": "501754d048e07b07932ec268b6ed3c43ea0819e3", + "GDAL_CHECKOUT": "tags/v3.10.0", + "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", From 22666c3b9f7d8041e37021b2e2b639731cd4a57f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 22:01:13 +0100 Subject: [PATCH 134/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.17.2=20(#71)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 3eb888932..e6cedea29 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=beb03d6d4c61dbd02291ef2c661c00155ddb79c9 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=1fd5181f4b991e1213e34c283bcfab35c3650a48 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/versions.json b/versions.json index cc64ed928..0babd8a42 100644 --- a/versions.json +++ b/versions.json @@ -515,8 +515,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.1", - "TIMESCALEDB_CHECKOUT_SHA1": "beb03d6d4c61dbd02291ef2c661c00155ddb79c9", + "TIMESCALEDB_CHECKOUT": "tags/2.17.2", + "TIMESCALEDB_CHECKOUT_SHA1": "1fd5181f4b991e1213e34c283bcfab35c3650a48", "DUCKDB_CHECKOUT": "tags/v1.1.3", "DUCKDB_CHECKOUT_SHA1": "19864453f7d0ed095256d848b46e7b8630989bac", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 1624f773bc4f4d44bcf023b9d8eaecadba82c3ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 22:17:50 +0100 Subject: [PATCH 135/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20(#72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index e6cedea29..ebc1ac4fe 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -33,7 +33,7 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=1fd5181f4b991e1213e34c283bcfab35c3650a48 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b359d26de186ea43f93c28c08cd1b8c6449c91bd ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 87cd37106..78a197515 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-11-06) +## Versions (2024-11-07) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 0babd8a42..4c408ee08 100644 --- a/versions.json +++ b/versions.json @@ -516,7 +516,7 @@ "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.17.2", - "TIMESCALEDB_CHECKOUT_SHA1": "1fd5181f4b991e1213e34c283bcfab35c3650a48", + "TIMESCALEDB_CHECKOUT_SHA1": "b359d26de186ea43f93c28c08cd1b8c6449c91bd", "DUCKDB_CHECKOUT": "tags/v1.1.3", "DUCKDB_CHECKOUT_SHA1": "19864453f7d0ed095256d848b46e7b8630989bac", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From f10a2971b638ea768e823589b7be8d96cabeb9c0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 1 Dec 2024 18:21:07 +0000 Subject: [PATCH 136/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20PROJ:?= =?UTF-8?q?9.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- manifest.sh | 12 ++++++------ versions.json | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 9c18177a3..b35503c51 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 +ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 1d697270c..9da87e3ef 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 7a225bea3..081aaa2a5 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 -ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 +ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 02f8ebfec..ba65a62bb 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 78a197515..4bda3472a 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-11-07) +## Versions (2024-12-01) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 55114b56d..e254d0499 100755 --- a/manifest.sh +++ b/manifest.sh @@ -678,11 +678,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -818,11 +818,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 4c408ee08..768da1bf0 100644 --- a/versions.json +++ b/versions.json @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -563,8 +563,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.0", "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", - "PROJ_CHECKOUT": "tags/9.5.0", - "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", + "PROJ_CHECKOUT": "tags/9.5.1", + "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.0", "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -685,8 +685,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.0", "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", - "PROJ_CHECKOUT": "tags/9.5.0", - "PROJ_CHECKOUT_SHA1": "0a407325fbb5bf42407a7dc5d4f948be9707e302", + "PROJ_CHECKOUT": "tags/9.5.1", + "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.0", "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", From 23d43de16298166e827737dd45a27183e1596de4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 23 Dec 2024 20:00:12 +0000 Subject: [PATCH 137/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20POSTG?= =?UTF-8?q?IS:3.3.8,POSTGIS:3.4.4,POSTGIS:3.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 12-3.3/alpine3.20/Dockerfile | 4 +- 12-3.3/alpine3.20/tags | 2 +- 12-3.4/alpine3.19/Dockerfile | 4 +- 12-3.4/alpine3.19/tags | 2 +- 12-3.4/alpine3.20/Dockerfile | 4 +- 12-3.4/alpine3.20/tags | 2 +- 12-3.5/alpine3.19/Dockerfile | 4 +- 12-3.5/alpine3.19/tags | 2 +- 12-3.5/alpine3.20/Dockerfile | 4 +- 12-3.5/alpine3.20/tags | 2 +- 13-3.3/alpine3.20/Dockerfile | 4 +- 13-3.3/alpine3.20/tags | 2 +- 13-3.4/alpine3.19/Dockerfile | 4 +- 13-3.4/alpine3.19/tags | 2 +- 13-3.4/alpine3.20/Dockerfile | 4 +- 13-3.4/alpine3.20/tags | 2 +- 13-3.5/alpine3.19/Dockerfile | 4 +- 13-3.5/alpine3.19/tags | 2 +- 13-3.5/alpine3.20/Dockerfile | 4 +- 13-3.5/alpine3.20/tags | 2 +- 14-3.3/alpine3.20/Dockerfile | 4 +- 14-3.3/alpine3.20/tags | 2 +- 14-3.4/alpine3.19/Dockerfile | 4 +- 14-3.4/alpine3.19/tags | 2 +- 14-3.4/alpine3.20/Dockerfile | 4 +- 14-3.4/alpine3.20/tags | 2 +- 14-3.5/alpine3.19/Dockerfile | 4 +- 14-3.5/alpine3.19/tags | 2 +- 14-3.5/alpine3.20/Dockerfile | 4 +- 14-3.5/alpine3.20/tags | 2 +- 15-3.3/alpine3.20/Dockerfile | 4 +- 15-3.3/alpine3.20/tags | 2 +- 15-3.4/alpine3.19/Dockerfile | 4 +- 15-3.4/alpine3.19/tags | 2 +- 15-3.4/alpine3.20/Dockerfile | 4 +- 15-3.4/alpine3.20/tags | 2 +- 15-3.5/alpine3.19/Dockerfile | 4 +- 15-3.5/alpine3.19/tags | 2 +- 15-3.5/alpine3.20/Dockerfile | 4 +- 15-3.5/alpine3.20/tags | 2 +- 16-3.3/alpine3.20/Dockerfile | 4 +- 16-3.3/alpine3.20/tags | 2 +- 16-3.4/alpine3.19/Dockerfile | 4 +- 16-3.4/alpine3.19/tags | 2 +- 16-3.4/alpine3.20/Dockerfile | 4 +- 16-3.4/alpine3.20/tags | 2 +- 16-3.5/alpine3.19/Dockerfile | 4 +- 16-3.5/alpine3.19/tags | 2 +- 16-3.5/alpine3.20/Dockerfile | 4 +- 16-3.5/alpine3.20/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17-3.4/alpine3.20/Dockerfile | 4 +- 17-3.4/alpine3.20/tags | 2 +- 17-3.5/alpine3.19/Dockerfile | 4 +- 17-3.5/alpine3.19/tags | 2 +- 17-3.5/alpine3.20/Dockerfile | 4 +- 17-3.5/alpine3.20/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 +- 17-recent/bookworm/tags | 2 +- README.md | 62 ++++---- manifest.sh | 180 ++++++++++----------- versions.json | 292 +++++++++++++++++----------------- 63 files changed, 357 insertions(+), 357 deletions(-) diff --git a/12-3.3/alpine3.20/Dockerfile b/12-3.3/alpine3.20/Dockerfile index e01034f2b..61988fc66 100644 --- a/12-3.3/alpine3.20/Dockerfile +++ b/12-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.3/alpine3.20/tags b/12-3.3/alpine3.20/tags index 7eb40ee52..d6b79a011 100644 --- a/12-3.3/alpine3.20/tags +++ b/12-3.3/alpine3.20/tags @@ -1 +1 @@ -12-3.3-alpine3.20 12-3.3.7-alpine3.20 12-3.3-alpine +12-3.3-alpine3.20 12-3.3.8-alpine3.20 12-3.3-alpine diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.19/Dockerfile index ae2edca0f..bb2377ef7 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags index d18b20ca4..14d03c3e3 100644 --- a/12-3.4/alpine3.19/tags +++ b/12-3.4/alpine3.19/tags @@ -1 +1 @@ -12-3.4-alpine3.19 12-3.4.3-alpine3.19 +12-3.4-alpine3.19 12-3.4.4-alpine3.19 diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile index a2ca0ee0d..15d389505 100644 --- a/12-3.4/alpine3.20/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags index 0dfba80e4..bd450118c 100644 --- a/12-3.4/alpine3.20/tags +++ b/12-3.4/alpine3.20/tags @@ -1 +1 @@ -12-3.4-alpine3.20 12-3.4.3-alpine3.20 12-3.4-alpine +12-3.4-alpine3.20 12-3.4.4-alpine3.20 12-3.4-alpine diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index c7df6bf37..0f719c49b 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.19/tags b/12-3.5/alpine3.19/tags index 25d7c1e17..5641ee0ec 100644 --- a/12-3.5/alpine3.19/tags +++ b/12-3.5/alpine3.19/tags @@ -1 +1 @@ -12-3.5-alpine3.19 12-3.5.0-alpine3.19 +12-3.5-alpine3.19 12-3.5.1-alpine3.19 diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index a018bd004..3225ae1e2 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags index 799eed3e6..03f7e9e21 100644 --- a/12-3.5/alpine3.20/tags +++ b/12-3.5/alpine3.20/tags @@ -1 +1 @@ -12-3.5-alpine3.20 12-3.5.0-alpine3.20 12-3.5-alpine +12-3.5-alpine3.20 12-3.5.1-alpine3.20 12-3.5-alpine diff --git a/13-3.3/alpine3.20/Dockerfile b/13-3.3/alpine3.20/Dockerfile index 6a9c61d1e..2af695525 100644 --- a/13-3.3/alpine3.20/Dockerfile +++ b/13-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.3/alpine3.20/tags b/13-3.3/alpine3.20/tags index 6a58d94ef..7fd6fd07e 100644 --- a/13-3.3/alpine3.20/tags +++ b/13-3.3/alpine3.20/tags @@ -1 +1 @@ -13-3.3-alpine3.20 13-3.3.7-alpine3.20 13-3.3-alpine +13-3.3-alpine3.20 13-3.3.8-alpine3.20 13-3.3-alpine diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.19/Dockerfile index c8ac8cdc4..53535f18a 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags index d455e2cf5..3a48a84b5 100644 --- a/13-3.4/alpine3.19/tags +++ b/13-3.4/alpine3.19/tags @@ -1 +1 @@ -13-3.4-alpine3.19 13-3.4.3-alpine3.19 +13-3.4-alpine3.19 13-3.4.4-alpine3.19 diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile index 52dc445f8..73f33fb5d 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags index fc62a43ec..5c9c0b6fc 100644 --- a/13-3.4/alpine3.20/tags +++ b/13-3.4/alpine3.20/tags @@ -1 +1 @@ -13-3.4-alpine3.20 13-3.4.3-alpine3.20 13-3.4-alpine +13-3.4-alpine3.20 13-3.4.4-alpine3.20 13-3.4-alpine diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index fed4b0176..23269a931 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.19/tags b/13-3.5/alpine3.19/tags index 2604f04bd..68e30a40a 100644 --- a/13-3.5/alpine3.19/tags +++ b/13-3.5/alpine3.19/tags @@ -1 +1 @@ -13-3.5-alpine3.19 13-3.5.0-alpine3.19 +13-3.5-alpine3.19 13-3.5.1-alpine3.19 diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 865b6ee64..bb63d8abb 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index 2906c5c50..84411002a 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5-alpine3.20 13-3.5.0-alpine3.20 13-3.5-alpine +13-3.5-alpine3.20 13-3.5.1-alpine3.20 13-3.5-alpine diff --git a/14-3.3/alpine3.20/Dockerfile b/14-3.3/alpine3.20/Dockerfile index c5a4ddbbb..5fb7d32bb 100644 --- a/14-3.3/alpine3.20/Dockerfile +++ b/14-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.3/alpine3.20/tags b/14-3.3/alpine3.20/tags index 6347df270..01324fe67 100644 --- a/14-3.3/alpine3.20/tags +++ b/14-3.3/alpine3.20/tags @@ -1 +1 @@ -14-3.3-alpine3.20 14-3.3.7-alpine3.20 14-3.3-alpine +14-3.3-alpine3.20 14-3.3.8-alpine3.20 14-3.3-alpine diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.19/Dockerfile index 8ac8c3bd6..ac1bcfc19 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags index 769999303..1f73f63df 100644 --- a/14-3.4/alpine3.19/tags +++ b/14-3.4/alpine3.19/tags @@ -1 +1 @@ -14-3.4-alpine3.19 14-3.4.3-alpine3.19 +14-3.4-alpine3.19 14-3.4.4-alpine3.19 diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile index c8629edb5..4bb0daa6f 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags index 3a70b7587..07d0aed83 100644 --- a/14-3.4/alpine3.20/tags +++ b/14-3.4/alpine3.20/tags @@ -1 +1 @@ -14-3.4-alpine3.20 14-3.4.3-alpine3.20 14-3.4-alpine +14-3.4-alpine3.20 14-3.4.4-alpine3.20 14-3.4-alpine diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index 75592a901..592fb61a5 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.19/tags b/14-3.5/alpine3.19/tags index 268dcff1b..e0c77abff 100644 --- a/14-3.5/alpine3.19/tags +++ b/14-3.5/alpine3.19/tags @@ -1 +1 @@ -14-3.5-alpine3.19 14-3.5.0-alpine3.19 +14-3.5-alpine3.19 14-3.5.1-alpine3.19 diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index a82afcd53..3d9846410 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index 17ff69249..89016790c 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5-alpine3.20 14-3.5.0-alpine3.20 14-3.5-alpine +14-3.5-alpine3.20 14-3.5.1-alpine3.20 14-3.5-alpine diff --git a/15-3.3/alpine3.20/Dockerfile b/15-3.3/alpine3.20/Dockerfile index 8f32ed134..a8cfee7b9 100644 --- a/15-3.3/alpine3.20/Dockerfile +++ b/15-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.3/alpine3.20/tags b/15-3.3/alpine3.20/tags index 7708eed1c..7b742a5a5 100644 --- a/15-3.3/alpine3.20/tags +++ b/15-3.3/alpine3.20/tags @@ -1 +1 @@ -15-3.3-alpine3.20 15-3.3.7-alpine3.20 15-3.3-alpine +15-3.3-alpine3.20 15-3.3.8-alpine3.20 15-3.3-alpine diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.19/Dockerfile index 31b739472..a9109e0ef 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags index 9561d271b..867ddcdca 100644 --- a/15-3.4/alpine3.19/tags +++ b/15-3.4/alpine3.19/tags @@ -1 +1 @@ -15-3.4-alpine3.19 15-3.4.3-alpine3.19 +15-3.4-alpine3.19 15-3.4.4-alpine3.19 diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile index ae9feee1c..acf8d09ef 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags index f1d9a97a2..3bd056412 100644 --- a/15-3.4/alpine3.20/tags +++ b/15-3.4/alpine3.20/tags @@ -1 +1 @@ -15-3.4-alpine3.20 15-3.4.3-alpine3.20 15-3.4-alpine +15-3.4-alpine3.20 15-3.4.4-alpine3.20 15-3.4-alpine diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 6155ce6f5..5959fccfc 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.19/tags b/15-3.5/alpine3.19/tags index 2be00231d..69bf16dc0 100644 --- a/15-3.5/alpine3.19/tags +++ b/15-3.5/alpine3.19/tags @@ -1 +1 @@ -15-3.5-alpine3.19 15-3.5.0-alpine3.19 +15-3.5-alpine3.19 15-3.5.1-alpine3.19 diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index 63a02c991..e07909e99 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index a438c715b..409972666 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5-alpine3.20 15-3.5.0-alpine3.20 15-3.5-alpine +15-3.5-alpine3.20 15-3.5.1-alpine3.20 15-3.5-alpine diff --git a/16-3.3/alpine3.20/Dockerfile b/16-3.3/alpine3.20/Dockerfile index 2b803356f..7297c3ef3 100644 --- a/16-3.3/alpine3.20/Dockerfile +++ b/16-3.3/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.7 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=a0c796766cbcd369d871283f559fd97a186464dd +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.3/alpine3.20/tags b/16-3.3/alpine3.20/tags index c34cf9302..184c2ab88 100644 --- a/16-3.3/alpine3.20/tags +++ b/16-3.3/alpine3.20/tags @@ -1 +1 @@ -16-3.3-alpine3.20 16-3.3.7-alpine3.20 16-3.3-alpine +16-3.3-alpine3.20 16-3.3.8-alpine3.20 16-3.3-alpine diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.19/Dockerfile index e7b68086e..8f60b9b11 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags index 2a2d42cbd..30b1556f5 100644 --- a/16-3.4/alpine3.19/tags +++ b/16-3.4/alpine3.19/tags @@ -1 +1 @@ -16-3.4-alpine3.19 16-3.4.3-alpine3.19 +16-3.4-alpine3.19 16-3.4.4-alpine3.19 diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile index 5b73f50d2..da2cc7d77 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index ee68de5cd..bb1bc0d02 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine +16-3.4-alpine3.20 16-3.4.4-alpine3.20 16-3.4-alpine diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index ff20df952..e6aabc01f 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.19/tags b/16-3.5/alpine3.19/tags index 01925efa6..05d7788fc 100644 --- a/16-3.5/alpine3.19/tags +++ b/16-3.5/alpine3.19/tags @@ -1 +1 @@ -16-3.5-alpine3.19 16-3.5.0-alpine3.19 +16-3.5-alpine3.19 16-3.5.1-alpine3.19 diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 840e95fa6..21e3f9b5f 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index 7db4f3d44..e341ecd73 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5-alpine3.20 16-3.5.0-alpine3.20 16-3.5-alpine +16-3.5-alpine3.20 16-3.5.1-alpine3.20 16-3.5-alpine diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index b35503c51..35c2aa013 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 9da87e3ef..d648c80d1 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-3.4/alpine3.20/Dockerfile b/17-3.4/alpine3.20/Dockerfile index fcc34ce08..c90aad8e2 100644 --- a/17-3.4/alpine3.20/Dockerfile +++ b/17-3.4/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.3 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e36594574671877ca6178c944e6d430f87f310bf +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.4/alpine3.20/tags b/17-3.4/alpine3.20/tags index a5e397b99..2cab7103f 100644 --- a/17-3.4/alpine3.20/tags +++ b/17-3.4/alpine3.20/tags @@ -1 +1 @@ -17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine +17-3.4-alpine3.20 17-3.4.4-alpine3.20 17-3.4-alpine diff --git a/17-3.5/alpine3.19/Dockerfile b/17-3.5/alpine3.19/Dockerfile index 30583cdc4..b525ef995 100644 --- a/17-3.5/alpine3.19/Dockerfile +++ b/17-3.5/alpine3.19/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.19 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.19/tags b/17-3.5/alpine3.19/tags index 64852a2e1..ce4cdb3da 100644 --- a/17-3.5/alpine3.19/tags +++ b/17-3.5/alpine3.19/tags @@ -1 +1 @@ -17-3.5-alpine3.19 17-3.5.0-alpine3.19 +17-3.5-alpine3.19 17-3.5.1-alpine3.19 diff --git a/17-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.20/Dockerfile index 1632abba0..36798eb4f 100644 --- a/17-3.5/alpine3.20/Dockerfile +++ b/17-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags index 407558ff9..0805e2423 100644 --- a/17-3.5/alpine3.20/tags +++ b/17-3.5/alpine3.20/tags @@ -1 +1 @@ -17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine alpine +17-3.5-alpine3.20 17-3.5.1-alpine3.20 17-3.5-alpine alpine diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 081aaa2a5..d7c15bc61 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.0 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=d2c3ca48e648571deda98d8e4d9bb4e2c82fde16 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index ba65a62bb..8c5d60a7a 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 4bda3472a..0d56f9285 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-12-01) +## Versions (2024-12-23) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) @@ -133,17 +133,17 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.3 | -| [`12-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.19), [`12-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.0 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.3 | -| [`13-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.19), [`13-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.0 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.3 | -| [`14-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.19), [`14-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.0 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.3 | -| [`15-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.19), [`15-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.0 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.3-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.3 | -| [`16-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.19), [`16-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.0 | -| [`17-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.19), [`17-3.5.0-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17 | 3.5.0 | +| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.4 | +| [`12-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.19), [`12-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.1 | +| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.4 | +| [`13-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.19), [`13-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.1 | +| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.4 | +| [`14-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.19), [`14-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.1 | +| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.4 | +| [`15-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.19), [`15-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.1 | +| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.4 | +| [`16-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.19), [`16-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.1 | +| [`17-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.19), [`17-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17 | 3.5.1 | ### ⛰️Alpine 3.20 based @@ -155,23 +155,23 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.7-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.7 | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.3-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.3 | -| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-alpine3.20), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.0 | -| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.7-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.7 | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.3-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.3 | -| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-alpine3.20), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.0 | -| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.7-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.7 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.3-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.3 | -| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-alpine3.20), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.0 | -| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.7-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.7 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.3-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.3 | -| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-alpine3.20), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.0 | -| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.7-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.7-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.7 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.3-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.3 | -| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-alpine3.20), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.0 | -| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.3-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.3 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.0-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.0 | +| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.8 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 | +| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.20), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 | +| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.8 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | +| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.20), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 | +| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.8 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | +| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.20), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 | +| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.8 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | +| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.20), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 | +| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.8 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | +| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.20), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 | +| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.4 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 | diff --git a/manifest.sh b/manifest.sh index e254d0499..122c92954 100755 --- a/manifest.sh +++ b/manifest.sh @@ -20,11 +20,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.20 \ --target ${dockername}:12-3.3-alpine3.20 || true -echo "manifest: ${dockername}:12-3.3.7-alpine3.20" +echo "manifest: ${dockername}:12-3.3.8-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.7-alpine3.20 \ - --target ${dockername}:12-3.3.7-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.3.8-alpine3.20 \ + --target ${dockername}:12-3.3.8-alpine3.20 || true echo "manifest: ${dockername}:12-3.3-alpine" manifest-tool push from-args \ @@ -40,11 +40,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ --target ${dockername}:12-3.4-alpine3.19 || true -echo "manifest: ${dockername}:12-3.4.3-alpine3.19" +echo "manifest: ${dockername}:12-3.4.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3-alpine3.19 \ - --target ${dockername}:12-3.4.3-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.19 \ + --target ${dockername}:12-3.4.4-alpine3.19 || true # ----- 12-3.4-alpine3.20 ----- @@ -54,11 +54,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ --target ${dockername}:12-3.4-alpine3.20 || true -echo "manifest: ${dockername}:12-3.4.3-alpine3.20" +echo "manifest: ${dockername}:12-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.3-alpine3.20 \ - --target ${dockername}:12-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.20 \ + --target ${dockername}:12-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ @@ -74,11 +74,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.19 \ --target ${dockername}:12-3.5-alpine3.19 || true -echo "manifest: ${dockername}:12-3.5.0-alpine3.19" +echo "manifest: ${dockername}:12-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0-alpine3.19 \ - --target ${dockername}:12-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.19 \ + --target ${dockername}:12-3.5.1-alpine3.19 || true # ----- 12-3.5-alpine3.20 ----- @@ -88,11 +88,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.20 \ --target ${dockername}:12-3.5-alpine3.20 || true -echo "manifest: ${dockername}:12-3.5.0-alpine3.20" +echo "manifest: ${dockername}:12-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0-alpine3.20 \ - --target ${dockername}:12-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.20 \ + --target ${dockername}:12-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:12-3.5-alpine" manifest-tool push from-args \ @@ -142,11 +142,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.20 \ --target ${dockername}:13-3.3-alpine3.20 || true -echo "manifest: ${dockername}:13-3.3.7-alpine3.20" +echo "manifest: ${dockername}:13-3.3.8-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3.7-alpine3.20 \ - --target ${dockername}:13-3.3.7-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.3.8-alpine3.20 \ + --target ${dockername}:13-3.3.8-alpine3.20 || true echo "manifest: ${dockername}:13-3.3-alpine" manifest-tool push from-args \ @@ -162,11 +162,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ --target ${dockername}:13-3.4-alpine3.19 || true -echo "manifest: ${dockername}:13-3.4.3-alpine3.19" +echo "manifest: ${dockername}:13-3.4.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3-alpine3.19 \ - --target ${dockername}:13-3.4.3-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.19 \ + --target ${dockername}:13-3.4.4-alpine3.19 || true # ----- 13-3.4-alpine3.20 ----- @@ -176,11 +176,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ --target ${dockername}:13-3.4-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4.3-alpine3.20" +echo "manifest: ${dockername}:13-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.3-alpine3.20 \ - --target ${dockername}:13-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.20 \ + --target ${dockername}:13-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ @@ -196,11 +196,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.19 \ --target ${dockername}:13-3.5-alpine3.19 || true -echo "manifest: ${dockername}:13-3.5.0-alpine3.19" +echo "manifest: ${dockername}:13-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0-alpine3.19 \ - --target ${dockername}:13-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.19 \ + --target ${dockername}:13-3.5.1-alpine3.19 || true # ----- 13-3.5-alpine3.20 ----- @@ -210,11 +210,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.20 \ --target ${dockername}:13-3.5-alpine3.20 || true -echo "manifest: ${dockername}:13-3.5.0-alpine3.20" +echo "manifest: ${dockername}:13-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0-alpine3.20 \ - --target ${dockername}:13-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.20 \ + --target ${dockername}:13-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:13-3.5-alpine" manifest-tool push from-args \ @@ -264,11 +264,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.20 \ --target ${dockername}:14-3.3-alpine3.20 || true -echo "manifest: ${dockername}:14-3.3.7-alpine3.20" +echo "manifest: ${dockername}:14-3.3.8-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3.7-alpine3.20 \ - --target ${dockername}:14-3.3.7-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.3.8-alpine3.20 \ + --target ${dockername}:14-3.3.8-alpine3.20 || true echo "manifest: ${dockername}:14-3.3-alpine" manifest-tool push from-args \ @@ -284,11 +284,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ --target ${dockername}:14-3.4-alpine3.19 || true -echo "manifest: ${dockername}:14-3.4.3-alpine3.19" +echo "manifest: ${dockername}:14-3.4.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3-alpine3.19 \ - --target ${dockername}:14-3.4.3-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.19 \ + --target ${dockername}:14-3.4.4-alpine3.19 || true # ----- 14-3.4-alpine3.20 ----- @@ -298,11 +298,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ --target ${dockername}:14-3.4-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4.3-alpine3.20" +echo "manifest: ${dockername}:14-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.3-alpine3.20 \ - --target ${dockername}:14-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.20 \ + --target ${dockername}:14-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ @@ -318,11 +318,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.19 \ --target ${dockername}:14-3.5-alpine3.19 || true -echo "manifest: ${dockername}:14-3.5.0-alpine3.19" +echo "manifest: ${dockername}:14-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0-alpine3.19 \ - --target ${dockername}:14-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.19 \ + --target ${dockername}:14-3.5.1-alpine3.19 || true # ----- 14-3.5-alpine3.20 ----- @@ -332,11 +332,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.20 \ --target ${dockername}:14-3.5-alpine3.20 || true -echo "manifest: ${dockername}:14-3.5.0-alpine3.20" +echo "manifest: ${dockername}:14-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0-alpine3.20 \ - --target ${dockername}:14-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.20 \ + --target ${dockername}:14-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ @@ -400,11 +400,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.20 \ --target ${dockername}:15-3.3-alpine3.20 || true -echo "manifest: ${dockername}:15-3.3.7-alpine3.20" +echo "manifest: ${dockername}:15-3.3.8-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3.7-alpine3.20 \ - --target ${dockername}:15-3.3.7-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.3.8-alpine3.20 \ + --target ${dockername}:15-3.3.8-alpine3.20 || true echo "manifest: ${dockername}:15-3.3-alpine" manifest-tool push from-args \ @@ -420,11 +420,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ --target ${dockername}:15-3.4-alpine3.19 || true -echo "manifest: ${dockername}:15-3.4.3-alpine3.19" +echo "manifest: ${dockername}:15-3.4.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3-alpine3.19 \ - --target ${dockername}:15-3.4.3-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.19 \ + --target ${dockername}:15-3.4.4-alpine3.19 || true # ----- 15-3.4-alpine3.20 ----- @@ -434,11 +434,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ --target ${dockername}:15-3.4-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4.3-alpine3.20" +echo "manifest: ${dockername}:15-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.3-alpine3.20 \ - --target ${dockername}:15-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.20 \ + --target ${dockername}:15-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ @@ -454,11 +454,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.19 \ --target ${dockername}:15-3.5-alpine3.19 || true -echo "manifest: ${dockername}:15-3.5.0-alpine3.19" +echo "manifest: ${dockername}:15-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0-alpine3.19 \ - --target ${dockername}:15-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.19 \ + --target ${dockername}:15-3.5.1-alpine3.19 || true # ----- 15-3.5-alpine3.20 ----- @@ -468,11 +468,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.20 \ --target ${dockername}:15-3.5-alpine3.20 || true -echo "manifest: ${dockername}:15-3.5.0-alpine3.20" +echo "manifest: ${dockername}:15-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0-alpine3.20 \ - --target ${dockername}:15-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.20 \ + --target ${dockername}:15-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ @@ -522,11 +522,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.20 \ --target ${dockername}:16-3.3-alpine3.20 || true -echo "manifest: ${dockername}:16-3.3.7-alpine3.20" +echo "manifest: ${dockername}:16-3.3.8-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3.7-alpine3.20 \ - --target ${dockername}:16-3.3.7-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.3.8-alpine3.20 \ + --target ${dockername}:16-3.3.8-alpine3.20 || true echo "manifest: ${dockername}:16-3.3-alpine" manifest-tool push from-args \ @@ -542,11 +542,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ --target ${dockername}:16-3.4-alpine3.19 || true -echo "manifest: ${dockername}:16-3.4.3-alpine3.19" +echo "manifest: ${dockername}:16-3.4.4-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3-alpine3.19 \ - --target ${dockername}:16-3.4.3-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.19 \ + --target ${dockername}:16-3.4.4-alpine3.19 || true # ----- 16-3.4-alpine3.20 ----- @@ -556,11 +556,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ --target ${dockername}:16-3.4-alpine3.20 || true -echo "manifest: ${dockername}:16-3.4.3-alpine3.20" +echo "manifest: ${dockername}:16-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.3-alpine3.20 \ - --target ${dockername}:16-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.20 \ + --target ${dockername}:16-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ @@ -576,11 +576,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.19 \ --target ${dockername}:16-3.5-alpine3.19 || true -echo "manifest: ${dockername}:16-3.5.0-alpine3.19" +echo "manifest: ${dockername}:16-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0-alpine3.19 \ - --target ${dockername}:16-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.19 \ + --target ${dockername}:16-3.5.1-alpine3.19 || true # ----- 16-3.5-alpine3.20 ----- @@ -590,11 +590,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.20 \ --target ${dockername}:16-3.5-alpine3.20 || true -echo "manifest: ${dockername}:16-3.5.0-alpine3.20" +echo "manifest: ${dockername}:16-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0-alpine3.20 \ - --target ${dockername}:16-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.20 \ + --target ${dockername}:16-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ @@ -678,11 +678,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -704,11 +704,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.4-alpine3.20 \ --target ${dockername}:17-3.4-alpine3.20 || true -echo "manifest: ${dockername}:17-3.4.3-alpine3.20" +echo "manifest: ${dockername}:17-3.4.4-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.4.3-alpine3.20 \ - --target ${dockername}:17-3.4.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.20 \ + --target ${dockername}:17-3.4.4-alpine3.20 || true echo "manifest: ${dockername}:17-3.4-alpine" manifest-tool push from-args \ @@ -724,11 +724,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.19 \ --target ${dockername}:17-3.5-alpine3.19 || true -echo "manifest: ${dockername}:17-3.5.0-alpine3.19" +echo "manifest: ${dockername}:17-3.5.1-alpine3.19" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.0-alpine3.19 \ - --target ${dockername}:17-3.5.0-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.19 \ + --target ${dockername}:17-3.5.1-alpine3.19 || true # ----- 17-3.5-alpine3.20 ----- @@ -738,11 +738,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.20 \ --target ${dockername}:17-3.5-alpine3.20 || true -echo "manifest: ${dockername}:17-3.5.0-alpine3.20" +echo "manifest: ${dockername}:17-3.5.1-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.0-alpine3.20 \ - --target ${dockername}:17-3.5.0-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.20 \ + --target ${dockername}:17-3.5.1-alpine3.20 || true echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ @@ -818,11 +818,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 768da1bf0..aefd95161 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "12-3.3": { "alpine3.20": { - "tags": "12-3.3-alpine3.20 12-3.3.7-alpine3.20 12-3.3-alpine", + "tags": "12-3.3-alpine3.20 12-3.3.8-alpine3.20 12-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -9,15 +9,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.3.7", - "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", - "POSTGIS_CHECKOUT": "tags/3.3.7", - "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" + "POSTGIS_VERSION": "3.3.8", + "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", + "POSTGIS_CHECKOUT": "tags/3.3.8", + "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" } }, "12-3.4": { "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.3-alpine3.19", + "tags": "12-3.4-alpine3.19 12-3.4.4-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -25,13 +25,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, "alpine3.20": { - "tags": "12-3.4-alpine3.20 12-3.4.3-alpine3.20 12-3.4-alpine", + "tags": "12-3.4-alpine3.20 12-3.4.4-alpine3.20 12-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -39,10 +39,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "12-3.5": { @@ -71,7 +71,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "12-3.5-alpine3.19 12-3.5.0-alpine3.19", + "tags": "12-3.5-alpine3.19 12-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -79,13 +79,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "12-3.5-alpine3.20 12-3.5.0-alpine3.20 12-3.5-alpine", + "tags": "12-3.5-alpine3.20 12-3.5.1-alpine3.20 12-3.5-alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -93,15 +93,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "13-3.3": { "alpine3.20": { - "tags": "13-3.3-alpine3.20 13-3.3.7-alpine3.20 13-3.3-alpine", + "tags": "13-3.3-alpine3.20 13-3.3.8-alpine3.20 13-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -109,15 +109,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.3.7", - "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", - "POSTGIS_CHECKOUT": "tags/3.3.7", - "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" + "POSTGIS_VERSION": "3.3.8", + "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", + "POSTGIS_CHECKOUT": "tags/3.3.8", + "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" } }, "13-3.4": { "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.3-alpine3.19", + "tags": "13-3.4-alpine3.19 13-3.4.4-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -125,13 +125,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, "alpine3.20": { - "tags": "13-3.4-alpine3.20 13-3.4.3-alpine3.20 13-3.4-alpine", + "tags": "13-3.4-alpine3.20 13-3.4.4-alpine3.20 13-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -139,10 +139,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "13-3.5": { @@ -171,7 +171,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "13-3.5-alpine3.19 13-3.5.0-alpine3.19", + "tags": "13-3.5-alpine3.19 13-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -179,13 +179,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "13-3.5-alpine3.20 13-3.5.0-alpine3.20 13-3.5-alpine", + "tags": "13-3.5-alpine3.20 13-3.5.1-alpine3.20 13-3.5-alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -193,15 +193,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "14-3.3": { "alpine3.20": { - "tags": "14-3.3-alpine3.20 14-3.3.7-alpine3.20 14-3.3-alpine", + "tags": "14-3.3-alpine3.20 14-3.3.8-alpine3.20 14-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -209,15 +209,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.3.7", - "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", - "POSTGIS_CHECKOUT": "tags/3.3.7", - "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" + "POSTGIS_VERSION": "3.3.8", + "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", + "POSTGIS_CHECKOUT": "tags/3.3.8", + "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" } }, "14-3.4": { "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.3-alpine3.19", + "tags": "14-3.4-alpine3.19 14-3.4.4-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -225,13 +225,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, "alpine3.20": { - "tags": "14-3.4-alpine3.20 14-3.4.3-alpine3.20 14-3.4-alpine", + "tags": "14-3.4-alpine3.20 14-3.4.4-alpine3.20 14-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -239,10 +239,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "14-3.5": { @@ -271,7 +271,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "14-3.5-alpine3.19 14-3.5.0-alpine3.19", + "tags": "14-3.5-alpine3.19 14-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -279,13 +279,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "14-3.5-alpine3.20 14-3.5.0-alpine3.20 14-3.5-alpine", + "tags": "14-3.5-alpine3.20 14-3.5.1-alpine3.20 14-3.5-alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -293,15 +293,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "15-3.3": { "alpine3.20": { - "tags": "15-3.3-alpine3.20 15-3.3.7-alpine3.20 15-3.3-alpine", + "tags": "15-3.3-alpine3.20 15-3.3.8-alpine3.20 15-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -309,15 +309,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.3.7", - "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", - "POSTGIS_CHECKOUT": "tags/3.3.7", - "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" + "POSTGIS_VERSION": "3.3.8", + "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", + "POSTGIS_CHECKOUT": "tags/3.3.8", + "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" } }, "15-3.4": { "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.3-alpine3.19", + "tags": "15-3.4-alpine3.19 15-3.4.4-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -325,13 +325,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, "alpine3.20": { - "tags": "15-3.4-alpine3.20 15-3.4.3-alpine3.20 15-3.4-alpine", + "tags": "15-3.4-alpine3.20 15-3.4.4-alpine3.20 15-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -339,10 +339,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "15-3.5": { @@ -371,7 +371,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "15-3.5-alpine3.19 15-3.5.0-alpine3.19", + "tags": "15-3.5-alpine3.19 15-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -379,13 +379,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "15-3.5-alpine3.20 15-3.5.0-alpine3.20 15-3.5-alpine", + "tags": "15-3.5-alpine3.20 15-3.5.1-alpine3.20 15-3.5-alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -393,15 +393,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "16-3.3": { "alpine3.20": { - "tags": "16-3.3-alpine3.20 16-3.3.7-alpine3.20 16-3.3-alpine", + "tags": "16-3.3-alpine3.20 16-3.3.8-alpine3.20 16-3.3-alpine", "readme_group": "alpine3.20", "postgis": "3.3", "arch": "amd64 arm64", @@ -409,15 +409,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.3.7", - "POSTGIS_SHA256": "faa796035df95e1dac5a92ebe7090b2865d36128cdf6feb36643914f8056ad80", - "POSTGIS_CHECKOUT": "tags/3.3.7", - "POSTGIS_CHECKOUT_SHA1": "a0c796766cbcd369d871283f559fd97a186464dd" + "POSTGIS_VERSION": "3.3.8", + "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", + "POSTGIS_CHECKOUT": "tags/3.3.8", + "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" } }, "16-3.4": { "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.3-alpine3.19", + "tags": "16-3.4-alpine3.19 16-3.4.4-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.4", "arch": "amd64 arm64", @@ -425,13 +425,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.3-alpine3.20 16-3.4-alpine", + "tags": "16-3.4-alpine3.20 16-3.4.4-alpine3.20 16-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -439,10 +439,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "16-3.5": { @@ -471,7 +471,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "16-3.5-alpine3.19 16-3.5.0-alpine3.19", + "tags": "16-3.5-alpine3.19 16-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -479,13 +479,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "16-3.5-alpine3.20 16-3.5.0-alpine3.20 16-3.5-alpine", + "tags": "16-3.5-alpine3.20 16-3.5.1-alpine3.20 16-3.5-alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -493,10 +493,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "16-3.5-bundle0": { @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -561,8 +561,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79", "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", @@ -579,7 +579,7 @@ }, "17-3.4": { "alpine3.20": { - "tags": "17-3.4-alpine3.20 17-3.4.3-alpine3.20 17-3.4-alpine", + "tags": "17-3.4-alpine3.20 17-3.4.4-alpine3.20 17-3.4-alpine", "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", @@ -587,10 +587,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.4.3", - "POSTGIS_SHA256": "802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b", - "POSTGIS_CHECKOUT": "tags/3.4.3", - "POSTGIS_CHECKOUT_SHA1": "e36594574671877ca6178c944e6d430f87f310bf" + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "17-3.5": { @@ -619,7 +619,7 @@ "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, "alpine3.19": { - "tags": "17-3.5-alpine3.19 17-3.5.0-alpine3.19", + "tags": "17-3.5-alpine3.19 17-3.5.1-alpine3.19", "readme_group": "alpine3.19", "postgis": "3.5", "arch": "amd64 arm64", @@ -627,13 +627,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.0-alpine3.20 17-3.5-alpine alpine", + "tags": "17-3.5-alpine3.20 17-3.5.1-alpine3.20 17-3.5-alpine alpine", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -641,10 +641,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.0", - "POSTGIS_SHA256": "a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16" + "POSTGIS_VERSION": "3.5.1", + "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" } }, "17-master": { @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -683,8 +683,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.0", - "POSTGIS_CHECKOUT_SHA1": "d2c3ca48e648571deda98d8e4d9bb4e2c82fde16", + "POSTGIS_CHECKOUT": "tags/3.5.1", + "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79", "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", From af5fdd531a865075e4841fdf0675c48348699023 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 25 Dec 2024 07:32:29 +0100 Subject: [PATCH 138/167] update alpine to 3.21,3.20 --- .circleci/config.yml | 34 +- .github/workflows/main.yml | 34 +- 12-3.3/alpine3.20/tags | 1 - 12-3.3/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 12-3.3/alpine3.21/tags | 1 + .../update-postgis.sh | 0 12-3.4/alpine3.19/tags | 1 - 12-3.4/alpine3.20/tags | 2 +- 12-3.4/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 12-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 12-3.5/alpine3.19/tags | 1 - 12-3.5/alpine3.20/tags | 2 +- 12-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 12-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 13-3.3/alpine3.20/tags | 1 - 13-3.3/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.3/alpine3.21/tags | 1 + .../update-postgis.sh | 0 13-3.4/alpine3.19/tags | 1 - 13-3.4/alpine3.20/tags | 2 +- 13-3.4/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 13-3.5/alpine3.19/tags | 1 - 13-3.5/alpine3.20/tags | 2 +- 13-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 14-3.3/alpine3.20/tags | 1 - 14-3.3/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.3/alpine3.21/tags | 1 + .../update-postgis.sh | 0 14-3.4/alpine3.19/tags | 1 - 14-3.4/alpine3.20/tags | 2 +- 14-3.4/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 14-3.5/alpine3.19/tags | 1 - 14-3.5/alpine3.20/tags | 2 +- 14-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 15-3.3/alpine3.20/tags | 1 - 15-3.3/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.3/alpine3.21/tags | 1 + .../update-postgis.sh | 0 15-3.4/alpine3.19/tags | 1 - 15-3.4/alpine3.20/tags | 2 +- 15-3.4/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 15-3.5/alpine3.19/tags | 1 - 15-3.5/alpine3.20/tags | 2 +- 15-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 16-3.3/alpine3.20/tags | 1 - 16-3.3/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.3/alpine3.21/tags | 1 + .../update-postgis.sh | 0 16-3.4/alpine3.19/tags | 1 - 16-3.4/alpine3.20/tags | 2 +- 16-3.4/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 16-3.5/alpine3.19/tags | 1 - 16-3.5/alpine3.20/tags | 2 +- 16-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 17-3.4/alpine3.20/tags | 1 - 17-3.4/{alpine3.20 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 17-3.4/alpine3.21/tags | 1 + .../update-postgis.sh | 0 17-3.5/alpine3.19/tags | 1 - 17-3.5/alpine3.20/tags | 2 +- 17-3.5/{alpine3.19 => alpine3.21}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 17-3.5/alpine3.21/tags | 1 + .../update-postgis.sh | 0 README.md | 66 ++-- manifest.sh | 362 +++++++++--------- versions.json | 168 ++++---- versions.sh | 6 +- 102 files changed, 397 insertions(+), 397 deletions(-) delete mode 100644 12-3.3/alpine3.20/tags rename 12-3.3/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 12-3.3/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 12-3.3/alpine3.21/tags rename 12-3.3/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 12-3.4/alpine3.19/tags rename 12-3.4/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 12-3.4/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 12-3.4/alpine3.21/tags rename 12-3.4/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 12-3.5/alpine3.19/tags rename 12-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 12-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 12-3.5/alpine3.21/tags rename 12-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 13-3.3/alpine3.20/tags rename 13-3.3/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 13-3.3/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 13-3.3/alpine3.21/tags rename 13-3.3/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 13-3.4/alpine3.19/tags rename 13-3.4/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 13-3.4/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 13-3.4/alpine3.21/tags rename 13-3.4/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 13-3.5/alpine3.19/tags rename 13-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 13-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 13-3.5/alpine3.21/tags rename 13-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 14-3.3/alpine3.20/tags rename 14-3.3/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 14-3.3/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 14-3.3/alpine3.21/tags rename 14-3.3/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 14-3.4/alpine3.19/tags rename 14-3.4/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 14-3.4/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 14-3.4/alpine3.21/tags rename 14-3.4/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 14-3.5/alpine3.19/tags rename 14-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 14-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 14-3.5/alpine3.21/tags rename 14-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 15-3.3/alpine3.20/tags rename 15-3.3/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 15-3.3/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 15-3.3/alpine3.21/tags rename 15-3.3/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 15-3.4/alpine3.19/tags rename 15-3.4/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 15-3.4/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 15-3.4/alpine3.21/tags rename 15-3.4/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 15-3.5/alpine3.19/tags rename 15-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 15-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 15-3.5/alpine3.21/tags rename 15-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 16-3.3/alpine3.20/tags rename 16-3.3/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 16-3.3/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 16-3.3/alpine3.21/tags rename 16-3.3/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 16-3.4/alpine3.19/tags rename 16-3.4/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 16-3.4/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 16-3.4/alpine3.21/tags rename 16-3.4/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 16-3.5/alpine3.19/tags rename 16-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 16-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 16-3.5/alpine3.21/tags rename 16-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 17-3.4/alpine3.20/tags rename 17-3.4/{alpine3.20 => alpine3.21}/Dockerfile (99%) rename 17-3.4/{alpine3.20 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 17-3.4/alpine3.21/tags rename 17-3.4/{alpine3.20 => alpine3.21}/update-postgis.sh (100%) delete mode 100644 17-3.5/alpine3.19/tags rename 17-3.5/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 17-3.5/{alpine3.19 => alpine3.21}/initdb-postgis.sh (100%) create mode 100644 17-3.5/alpine3.21/tags rename 17-3.5/{alpine3.19 => alpine3.21}/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 724c537a8..e20d96d5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,48 +126,48 @@ workflows: # hence they must be generated within the bundle JOB. # #circleci-targets-start - "12-3.3-alpine3.20", - "12-3.4-alpine3.19", + "12-3.3-alpine3.21", "12-3.4-alpine3.20", - "12-3.5-alpine3.19", + "12-3.4-alpine3.21", "12-3.5-alpine3.20", + "12-3.5-alpine3.21", "12-3.5-bookworm", "12-3.5-bullseye", - "13-3.3-alpine3.20", - "13-3.4-alpine3.19", + "13-3.3-alpine3.21", "13-3.4-alpine3.20", - "13-3.5-alpine3.19", + "13-3.4-alpine3.21", "13-3.5-alpine3.20", + "13-3.5-alpine3.21", "13-3.5-bookworm", "13-3.5-bullseye", - "14-3.3-alpine3.20", - "14-3.4-alpine3.19", + "14-3.3-alpine3.21", "14-3.4-alpine3.20", - "14-3.5-alpine3.19", + "14-3.4-alpine3.21", "14-3.5-alpine3.20", + "14-3.5-alpine3.21", "14-3.5-bookworm", "14-3.5-bullseye", "14-l3.1.9gcp-bookworm", - "15-3.3-alpine3.20", - "15-3.4-alpine3.19", + "15-3.3-alpine3.21", "15-3.4-alpine3.20", - "15-3.5-alpine3.19", + "15-3.4-alpine3.21", "15-3.5-alpine3.20", + "15-3.5-alpine3.21", "15-3.5-bookworm", "15-3.5-bullseye", - "16-3.3-alpine3.20", - "16-3.4-alpine3.19", + "16-3.3-alpine3.21", "16-3.4-alpine3.20", - "16-3.5-alpine3.19", + "16-3.4-alpine3.21", "16-3.5-alpine3.20", + "16-3.5-alpine3.21", # --skip-- "16-3.5-bookworm", --> generated with the related bundle job! "16-3.5-bullseye", "16-3.5-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", - "17-3.4-alpine3.20", - "17-3.5-alpine3.19", + "17-3.4-alpine3.21", "17-3.5-alpine3.20", + "17-3.5-alpine3.21", "17-3.5-bookworm", "17-3.5-bullseye", "17-master-bookworm", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a78d6552..9a08aaed1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,48 +27,48 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.3", variant: "alpine3.20" } - - { version: "12-3.4", variant: "alpine3.19" } + - { version: "12-3.3", variant: "alpine3.21" } - { version: "12-3.4", variant: "alpine3.20" } - - { version: "12-3.5", variant: "alpine3.19" } + - { version: "12-3.4", variant: "alpine3.21" } - { version: "12-3.5", variant: "alpine3.20" } + - { version: "12-3.5", variant: "alpine3.21" } - { version: "12-3.5", variant: "bookworm" } - { version: "12-3.5", variant: "bullseye" } - - { version: "13-3.3", variant: "alpine3.20" } - - { version: "13-3.4", variant: "alpine3.19" } + - { version: "13-3.3", variant: "alpine3.21" } - { version: "13-3.4", variant: "alpine3.20" } - - { version: "13-3.5", variant: "alpine3.19" } + - { version: "13-3.4", variant: "alpine3.21" } - { version: "13-3.5", variant: "alpine3.20" } + - { version: "13-3.5", variant: "alpine3.21" } - { version: "13-3.5", variant: "bookworm" } - { version: "13-3.5", variant: "bullseye" } - - { version: "14-3.3", variant: "alpine3.20" } - - { version: "14-3.4", variant: "alpine3.19" } + - { version: "14-3.3", variant: "alpine3.21" } - { version: "14-3.4", variant: "alpine3.20" } - - { version: "14-3.5", variant: "alpine3.19" } + - { version: "14-3.4", variant: "alpine3.21" } - { version: "14-3.5", variant: "alpine3.20" } + - { version: "14-3.5", variant: "alpine3.21" } - { version: "14-3.5", variant: "bookworm" } - { version: "14-3.5", variant: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - - { version: "15-3.3", variant: "alpine3.20" } - - { version: "15-3.4", variant: "alpine3.19" } + - { version: "15-3.3", variant: "alpine3.21" } - { version: "15-3.4", variant: "alpine3.20" } - - { version: "15-3.5", variant: "alpine3.19" } + - { version: "15-3.4", variant: "alpine3.21" } - { version: "15-3.5", variant: "alpine3.20" } + - { version: "15-3.5", variant: "alpine3.21" } - { version: "15-3.5", variant: "bookworm" } - { version: "15-3.5", variant: "bullseye" } - - { version: "16-3.3", variant: "alpine3.20" } - - { version: "16-3.4", variant: "alpine3.19" } + - { version: "16-3.3", variant: "alpine3.21" } - { version: "16-3.4", variant: "alpine3.20" } - - { version: "16-3.5", variant: "alpine3.19" } + - { version: "16-3.4", variant: "alpine3.21" } - { version: "16-3.5", variant: "alpine3.20" } + - { version: "16-3.5", variant: "alpine3.21" } # --skip-- - { version: "16-3.5", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.5", variant: "bullseye" } - { version: "16-3.5-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - - { version: "17-3.4", variant: "alpine3.20" } - - { version: "17-3.5", variant: "alpine3.19" } + - { version: "17-3.4", variant: "alpine3.21" } - { version: "17-3.5", variant: "alpine3.20" } + - { version: "17-3.5", variant: "alpine3.21" } - { version: "17-3.5", variant: "bookworm" } - { version: "17-3.5", variant: "bullseye" } - { version: "17-master", variant: "bookworm" } diff --git a/12-3.3/alpine3.20/tags b/12-3.3/alpine3.20/tags deleted file mode 100644 index d6b79a011..000000000 --- a/12-3.3/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.3-alpine3.20 12-3.3.8-alpine3.20 12-3.3-alpine diff --git a/12-3.3/alpine3.20/Dockerfile b/12-3.3/alpine3.21/Dockerfile similarity index 99% rename from 12-3.3/alpine3.20/Dockerfile rename to 12-3.3/alpine3.21/Dockerfile index 61988fc66..0499b7ab5 100644 --- a/12-3.3/alpine3.20/Dockerfile +++ b/12-3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.3/alpine3.20/initdb-postgis.sh b/12-3.3/alpine3.21/initdb-postgis.sh similarity index 100% rename from 12-3.3/alpine3.20/initdb-postgis.sh rename to 12-3.3/alpine3.21/initdb-postgis.sh diff --git a/12-3.3/alpine3.21/tags b/12-3.3/alpine3.21/tags new file mode 100644 index 000000000..684b21ac3 --- /dev/null +++ b/12-3.3/alpine3.21/tags @@ -0,0 +1 @@ +12-3.3-alpine3.21 12-3.3.8-alpine3.21 12-3.3-alpine diff --git a/12-3.3/alpine3.20/update-postgis.sh b/12-3.3/alpine3.21/update-postgis.sh similarity index 100% rename from 12-3.3/alpine3.20/update-postgis.sh rename to 12-3.3/alpine3.21/update-postgis.sh diff --git a/12-3.4/alpine3.19/tags b/12-3.4/alpine3.19/tags deleted file mode 100644 index 14d03c3e3..000000000 --- a/12-3.4/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-alpine3.19 12-3.4.4-alpine3.19 diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags index bd450118c..f8d47d4e1 100644 --- a/12-3.4/alpine3.20/tags +++ b/12-3.4/alpine3.20/tags @@ -1 +1 @@ -12-3.4-alpine3.20 12-3.4.4-alpine3.20 12-3.4-alpine +12-3.4-alpine3.20 12-3.4.4-alpine3.20 diff --git a/12-3.4/alpine3.19/Dockerfile b/12-3.4/alpine3.21/Dockerfile similarity index 99% rename from 12-3.4/alpine3.19/Dockerfile rename to 12-3.4/alpine3.21/Dockerfile index bb2377ef7..59f5b16ef 100644 --- a/12-3.4/alpine3.19/Dockerfile +++ b/12-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.4/alpine3.19/initdb-postgis.sh b/12-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 12-3.4/alpine3.19/initdb-postgis.sh rename to 12-3.4/alpine3.21/initdb-postgis.sh diff --git a/12-3.4/alpine3.21/tags b/12-3.4/alpine3.21/tags new file mode 100644 index 000000000..57ac90e0f --- /dev/null +++ b/12-3.4/alpine3.21/tags @@ -0,0 +1 @@ +12-3.4-alpine3.21 12-3.4.4-alpine3.21 12-3.4-alpine diff --git a/12-3.4/alpine3.19/update-postgis.sh b/12-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 12-3.4/alpine3.19/update-postgis.sh rename to 12-3.4/alpine3.21/update-postgis.sh diff --git a/12-3.5/alpine3.19/tags b/12-3.5/alpine3.19/tags deleted file mode 100644 index 5641ee0ec..000000000 --- a/12-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.5-alpine3.19 12-3.5.1-alpine3.19 diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags index 03f7e9e21..1ebb5a62d 100644 --- a/12-3.5/alpine3.20/tags +++ b/12-3.5/alpine3.20/tags @@ -1 +1 @@ -12-3.5-alpine3.20 12-3.5.1-alpine3.20 12-3.5-alpine +12-3.5-alpine3.20 12-3.5.1-alpine3.20 diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.21/Dockerfile similarity index 99% rename from 12-3.5/alpine3.19/Dockerfile rename to 12-3.5/alpine3.21/Dockerfile index 0f719c49b..dd152e67d 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/12-3.5/alpine3.19/initdb-postgis.sh b/12-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 12-3.5/alpine3.19/initdb-postgis.sh rename to 12-3.5/alpine3.21/initdb-postgis.sh diff --git a/12-3.5/alpine3.21/tags b/12-3.5/alpine3.21/tags new file mode 100644 index 000000000..cfb90292c --- /dev/null +++ b/12-3.5/alpine3.21/tags @@ -0,0 +1 @@ +12-3.5-alpine3.21 12-3.5.1-alpine3.21 12-3.5-alpine diff --git a/12-3.5/alpine3.19/update-postgis.sh b/12-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 12-3.5/alpine3.19/update-postgis.sh rename to 12-3.5/alpine3.21/update-postgis.sh diff --git a/13-3.3/alpine3.20/tags b/13-3.3/alpine3.20/tags deleted file mode 100644 index 7fd6fd07e..000000000 --- a/13-3.3/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.3-alpine3.20 13-3.3.8-alpine3.20 13-3.3-alpine diff --git a/13-3.3/alpine3.20/Dockerfile b/13-3.3/alpine3.21/Dockerfile similarity index 99% rename from 13-3.3/alpine3.20/Dockerfile rename to 13-3.3/alpine3.21/Dockerfile index 2af695525..d91c64aef 100644 --- a/13-3.3/alpine3.20/Dockerfile +++ b/13-3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.3/alpine3.20/initdb-postgis.sh b/13-3.3/alpine3.21/initdb-postgis.sh similarity index 100% rename from 13-3.3/alpine3.20/initdb-postgis.sh rename to 13-3.3/alpine3.21/initdb-postgis.sh diff --git a/13-3.3/alpine3.21/tags b/13-3.3/alpine3.21/tags new file mode 100644 index 000000000..4ca665425 --- /dev/null +++ b/13-3.3/alpine3.21/tags @@ -0,0 +1 @@ +13-3.3-alpine3.21 13-3.3.8-alpine3.21 13-3.3-alpine diff --git a/13-3.3/alpine3.20/update-postgis.sh b/13-3.3/alpine3.21/update-postgis.sh similarity index 100% rename from 13-3.3/alpine3.20/update-postgis.sh rename to 13-3.3/alpine3.21/update-postgis.sh diff --git a/13-3.4/alpine3.19/tags b/13-3.4/alpine3.19/tags deleted file mode 100644 index 3a48a84b5..000000000 --- a/13-3.4/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-alpine3.19 13-3.4.4-alpine3.19 diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags index 5c9c0b6fc..92857045e 100644 --- a/13-3.4/alpine3.20/tags +++ b/13-3.4/alpine3.20/tags @@ -1 +1 @@ -13-3.4-alpine3.20 13-3.4.4-alpine3.20 13-3.4-alpine +13-3.4-alpine3.20 13-3.4.4-alpine3.20 diff --git a/13-3.4/alpine3.19/Dockerfile b/13-3.4/alpine3.21/Dockerfile similarity index 99% rename from 13-3.4/alpine3.19/Dockerfile rename to 13-3.4/alpine3.21/Dockerfile index 53535f18a..df650a377 100644 --- a/13-3.4/alpine3.19/Dockerfile +++ b/13-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.4/alpine3.19/initdb-postgis.sh b/13-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 13-3.4/alpine3.19/initdb-postgis.sh rename to 13-3.4/alpine3.21/initdb-postgis.sh diff --git a/13-3.4/alpine3.21/tags b/13-3.4/alpine3.21/tags new file mode 100644 index 000000000..d08dc5d6f --- /dev/null +++ b/13-3.4/alpine3.21/tags @@ -0,0 +1 @@ +13-3.4-alpine3.21 13-3.4.4-alpine3.21 13-3.4-alpine diff --git a/13-3.4/alpine3.19/update-postgis.sh b/13-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 13-3.4/alpine3.19/update-postgis.sh rename to 13-3.4/alpine3.21/update-postgis.sh diff --git a/13-3.5/alpine3.19/tags b/13-3.5/alpine3.19/tags deleted file mode 100644 index 68e30a40a..000000000 --- a/13-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.5-alpine3.19 13-3.5.1-alpine3.19 diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index 84411002a..16bd54762 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5-alpine3.20 13-3.5.1-alpine3.20 13-3.5-alpine +13-3.5-alpine3.20 13-3.5.1-alpine3.20 diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.21/Dockerfile similarity index 99% rename from 13-3.5/alpine3.19/Dockerfile rename to 13-3.5/alpine3.21/Dockerfile index 23269a931..852131449 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.5/alpine3.19/initdb-postgis.sh b/13-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 13-3.5/alpine3.19/initdb-postgis.sh rename to 13-3.5/alpine3.21/initdb-postgis.sh diff --git a/13-3.5/alpine3.21/tags b/13-3.5/alpine3.21/tags new file mode 100644 index 000000000..0fd6c74b8 --- /dev/null +++ b/13-3.5/alpine3.21/tags @@ -0,0 +1 @@ +13-3.5-alpine3.21 13-3.5.1-alpine3.21 13-3.5-alpine diff --git a/13-3.5/alpine3.19/update-postgis.sh b/13-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 13-3.5/alpine3.19/update-postgis.sh rename to 13-3.5/alpine3.21/update-postgis.sh diff --git a/14-3.3/alpine3.20/tags b/14-3.3/alpine3.20/tags deleted file mode 100644 index 01324fe67..000000000 --- a/14-3.3/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.3-alpine3.20 14-3.3.8-alpine3.20 14-3.3-alpine diff --git a/14-3.3/alpine3.20/Dockerfile b/14-3.3/alpine3.21/Dockerfile similarity index 99% rename from 14-3.3/alpine3.20/Dockerfile rename to 14-3.3/alpine3.21/Dockerfile index 5fb7d32bb..face26a3b 100644 --- a/14-3.3/alpine3.20/Dockerfile +++ b/14-3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.3/alpine3.20/initdb-postgis.sh b/14-3.3/alpine3.21/initdb-postgis.sh similarity index 100% rename from 14-3.3/alpine3.20/initdb-postgis.sh rename to 14-3.3/alpine3.21/initdb-postgis.sh diff --git a/14-3.3/alpine3.21/tags b/14-3.3/alpine3.21/tags new file mode 100644 index 000000000..33cbb15d8 --- /dev/null +++ b/14-3.3/alpine3.21/tags @@ -0,0 +1 @@ +14-3.3-alpine3.21 14-3.3.8-alpine3.21 14-3.3-alpine diff --git a/14-3.3/alpine3.20/update-postgis.sh b/14-3.3/alpine3.21/update-postgis.sh similarity index 100% rename from 14-3.3/alpine3.20/update-postgis.sh rename to 14-3.3/alpine3.21/update-postgis.sh diff --git a/14-3.4/alpine3.19/tags b/14-3.4/alpine3.19/tags deleted file mode 100644 index 1f73f63df..000000000 --- a/14-3.4/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-alpine3.19 14-3.4.4-alpine3.19 diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags index 07d0aed83..41b430df7 100644 --- a/14-3.4/alpine3.20/tags +++ b/14-3.4/alpine3.20/tags @@ -1 +1 @@ -14-3.4-alpine3.20 14-3.4.4-alpine3.20 14-3.4-alpine +14-3.4-alpine3.20 14-3.4.4-alpine3.20 diff --git a/14-3.4/alpine3.19/Dockerfile b/14-3.4/alpine3.21/Dockerfile similarity index 99% rename from 14-3.4/alpine3.19/Dockerfile rename to 14-3.4/alpine3.21/Dockerfile index ac1bcfc19..c3b2a74dc 100644 --- a/14-3.4/alpine3.19/Dockerfile +++ b/14-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.4/alpine3.19/initdb-postgis.sh b/14-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 14-3.4/alpine3.19/initdb-postgis.sh rename to 14-3.4/alpine3.21/initdb-postgis.sh diff --git a/14-3.4/alpine3.21/tags b/14-3.4/alpine3.21/tags new file mode 100644 index 000000000..00bf9f873 --- /dev/null +++ b/14-3.4/alpine3.21/tags @@ -0,0 +1 @@ +14-3.4-alpine3.21 14-3.4.4-alpine3.21 14-3.4-alpine diff --git a/14-3.4/alpine3.19/update-postgis.sh b/14-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 14-3.4/alpine3.19/update-postgis.sh rename to 14-3.4/alpine3.21/update-postgis.sh diff --git a/14-3.5/alpine3.19/tags b/14-3.5/alpine3.19/tags deleted file mode 100644 index e0c77abff..000000000 --- a/14-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.5-alpine3.19 14-3.5.1-alpine3.19 diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index 89016790c..2da8f9b08 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5-alpine3.20 14-3.5.1-alpine3.20 14-3.5-alpine +14-3.5-alpine3.20 14-3.5.1-alpine3.20 diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.21/Dockerfile similarity index 99% rename from 14-3.5/alpine3.19/Dockerfile rename to 14-3.5/alpine3.21/Dockerfile index 592fb61a5..b2f36d1c3 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.5/alpine3.19/initdb-postgis.sh b/14-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 14-3.5/alpine3.19/initdb-postgis.sh rename to 14-3.5/alpine3.21/initdb-postgis.sh diff --git a/14-3.5/alpine3.21/tags b/14-3.5/alpine3.21/tags new file mode 100644 index 000000000..f68cec1ff --- /dev/null +++ b/14-3.5/alpine3.21/tags @@ -0,0 +1 @@ +14-3.5-alpine3.21 14-3.5.1-alpine3.21 14-3.5-alpine diff --git a/14-3.5/alpine3.19/update-postgis.sh b/14-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 14-3.5/alpine3.19/update-postgis.sh rename to 14-3.5/alpine3.21/update-postgis.sh diff --git a/15-3.3/alpine3.20/tags b/15-3.3/alpine3.20/tags deleted file mode 100644 index 7b742a5a5..000000000 --- a/15-3.3/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.3-alpine3.20 15-3.3.8-alpine3.20 15-3.3-alpine diff --git a/15-3.3/alpine3.20/Dockerfile b/15-3.3/alpine3.21/Dockerfile similarity index 99% rename from 15-3.3/alpine3.20/Dockerfile rename to 15-3.3/alpine3.21/Dockerfile index a8cfee7b9..33e21c473 100644 --- a/15-3.3/alpine3.20/Dockerfile +++ b/15-3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.3/alpine3.20/initdb-postgis.sh b/15-3.3/alpine3.21/initdb-postgis.sh similarity index 100% rename from 15-3.3/alpine3.20/initdb-postgis.sh rename to 15-3.3/alpine3.21/initdb-postgis.sh diff --git a/15-3.3/alpine3.21/tags b/15-3.3/alpine3.21/tags new file mode 100644 index 000000000..a4bdf9722 --- /dev/null +++ b/15-3.3/alpine3.21/tags @@ -0,0 +1 @@ +15-3.3-alpine3.21 15-3.3.8-alpine3.21 15-3.3-alpine diff --git a/15-3.3/alpine3.20/update-postgis.sh b/15-3.3/alpine3.21/update-postgis.sh similarity index 100% rename from 15-3.3/alpine3.20/update-postgis.sh rename to 15-3.3/alpine3.21/update-postgis.sh diff --git a/15-3.4/alpine3.19/tags b/15-3.4/alpine3.19/tags deleted file mode 100644 index 867ddcdca..000000000 --- a/15-3.4/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-alpine3.19 15-3.4.4-alpine3.19 diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags index 3bd056412..86d005dcb 100644 --- a/15-3.4/alpine3.20/tags +++ b/15-3.4/alpine3.20/tags @@ -1 +1 @@ -15-3.4-alpine3.20 15-3.4.4-alpine3.20 15-3.4-alpine +15-3.4-alpine3.20 15-3.4.4-alpine3.20 diff --git a/15-3.4/alpine3.19/Dockerfile b/15-3.4/alpine3.21/Dockerfile similarity index 99% rename from 15-3.4/alpine3.19/Dockerfile rename to 15-3.4/alpine3.21/Dockerfile index a9109e0ef..259ee0d1d 100644 --- a/15-3.4/alpine3.19/Dockerfile +++ b/15-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.4/alpine3.19/initdb-postgis.sh b/15-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 15-3.4/alpine3.19/initdb-postgis.sh rename to 15-3.4/alpine3.21/initdb-postgis.sh diff --git a/15-3.4/alpine3.21/tags b/15-3.4/alpine3.21/tags new file mode 100644 index 000000000..668597e90 --- /dev/null +++ b/15-3.4/alpine3.21/tags @@ -0,0 +1 @@ +15-3.4-alpine3.21 15-3.4.4-alpine3.21 15-3.4-alpine diff --git a/15-3.4/alpine3.19/update-postgis.sh b/15-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 15-3.4/alpine3.19/update-postgis.sh rename to 15-3.4/alpine3.21/update-postgis.sh diff --git a/15-3.5/alpine3.19/tags b/15-3.5/alpine3.19/tags deleted file mode 100644 index 69bf16dc0..000000000 --- a/15-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.5-alpine3.19 15-3.5.1-alpine3.19 diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index 409972666..b6a27a735 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5-alpine3.20 15-3.5.1-alpine3.20 15-3.5-alpine +15-3.5-alpine3.20 15-3.5.1-alpine3.20 diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.21/Dockerfile similarity index 99% rename from 15-3.5/alpine3.19/Dockerfile rename to 15-3.5/alpine3.21/Dockerfile index 5959fccfc..283fc2ca9 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.5/alpine3.19/initdb-postgis.sh b/15-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 15-3.5/alpine3.19/initdb-postgis.sh rename to 15-3.5/alpine3.21/initdb-postgis.sh diff --git a/15-3.5/alpine3.21/tags b/15-3.5/alpine3.21/tags new file mode 100644 index 000000000..8e6048ed8 --- /dev/null +++ b/15-3.5/alpine3.21/tags @@ -0,0 +1 @@ +15-3.5-alpine3.21 15-3.5.1-alpine3.21 15-3.5-alpine diff --git a/15-3.5/alpine3.19/update-postgis.sh b/15-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 15-3.5/alpine3.19/update-postgis.sh rename to 15-3.5/alpine3.21/update-postgis.sh diff --git a/16-3.3/alpine3.20/tags b/16-3.3/alpine3.20/tags deleted file mode 100644 index 184c2ab88..000000000 --- a/16-3.3/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.3-alpine3.20 16-3.3.8-alpine3.20 16-3.3-alpine diff --git a/16-3.3/alpine3.20/Dockerfile b/16-3.3/alpine3.21/Dockerfile similarity index 99% rename from 16-3.3/alpine3.20/Dockerfile rename to 16-3.3/alpine3.21/Dockerfile index 7297c3ef3..8ee69639e 100644 --- a/16-3.3/alpine3.20/Dockerfile +++ b/16-3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.3/alpine3.20/initdb-postgis.sh b/16-3.3/alpine3.21/initdb-postgis.sh similarity index 100% rename from 16-3.3/alpine3.20/initdb-postgis.sh rename to 16-3.3/alpine3.21/initdb-postgis.sh diff --git a/16-3.3/alpine3.21/tags b/16-3.3/alpine3.21/tags new file mode 100644 index 000000000..66c6017c6 --- /dev/null +++ b/16-3.3/alpine3.21/tags @@ -0,0 +1 @@ +16-3.3-alpine3.21 16-3.3.8-alpine3.21 16-3.3-alpine diff --git a/16-3.3/alpine3.20/update-postgis.sh b/16-3.3/alpine3.21/update-postgis.sh similarity index 100% rename from 16-3.3/alpine3.20/update-postgis.sh rename to 16-3.3/alpine3.21/update-postgis.sh diff --git a/16-3.4/alpine3.19/tags b/16-3.4/alpine3.19/tags deleted file mode 100644 index 30b1556f5..000000000 --- a/16-3.4/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-alpine3.19 16-3.4.4-alpine3.19 diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags index bb1bc0d02..b7e7dcad1 100644 --- a/16-3.4/alpine3.20/tags +++ b/16-3.4/alpine3.20/tags @@ -1 +1 @@ -16-3.4-alpine3.20 16-3.4.4-alpine3.20 16-3.4-alpine +16-3.4-alpine3.20 16-3.4.4-alpine3.20 diff --git a/16-3.4/alpine3.19/Dockerfile b/16-3.4/alpine3.21/Dockerfile similarity index 99% rename from 16-3.4/alpine3.19/Dockerfile rename to 16-3.4/alpine3.21/Dockerfile index 8f60b9b11..8e960c52a 100644 --- a/16-3.4/alpine3.19/Dockerfile +++ b/16-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.4/alpine3.19/initdb-postgis.sh b/16-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 16-3.4/alpine3.19/initdb-postgis.sh rename to 16-3.4/alpine3.21/initdb-postgis.sh diff --git a/16-3.4/alpine3.21/tags b/16-3.4/alpine3.21/tags new file mode 100644 index 000000000..fd2dbec83 --- /dev/null +++ b/16-3.4/alpine3.21/tags @@ -0,0 +1 @@ +16-3.4-alpine3.21 16-3.4.4-alpine3.21 16-3.4-alpine diff --git a/16-3.4/alpine3.19/update-postgis.sh b/16-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 16-3.4/alpine3.19/update-postgis.sh rename to 16-3.4/alpine3.21/update-postgis.sh diff --git a/16-3.5/alpine3.19/tags b/16-3.5/alpine3.19/tags deleted file mode 100644 index 05d7788fc..000000000 --- a/16-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.5-alpine3.19 16-3.5.1-alpine3.19 diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index e341ecd73..a8f1b9f9a 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5-alpine3.20 16-3.5.1-alpine3.20 16-3.5-alpine +16-3.5-alpine3.20 16-3.5.1-alpine3.20 diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.21/Dockerfile similarity index 99% rename from 16-3.5/alpine3.19/Dockerfile rename to 16-3.5/alpine3.21/Dockerfile index e6aabc01f..13f6a0cc9 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.5/alpine3.19/initdb-postgis.sh b/16-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 16-3.5/alpine3.19/initdb-postgis.sh rename to 16-3.5/alpine3.21/initdb-postgis.sh diff --git a/16-3.5/alpine3.21/tags b/16-3.5/alpine3.21/tags new file mode 100644 index 000000000..6f7abd265 --- /dev/null +++ b/16-3.5/alpine3.21/tags @@ -0,0 +1 @@ +16-3.5-alpine3.21 16-3.5.1-alpine3.21 16-3.5-alpine diff --git a/16-3.5/alpine3.19/update-postgis.sh b/16-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 16-3.5/alpine3.19/update-postgis.sh rename to 16-3.5/alpine3.21/update-postgis.sh diff --git a/17-3.4/alpine3.20/tags b/17-3.4/alpine3.20/tags deleted file mode 100644 index 2cab7103f..000000000 --- a/17-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17-3.4-alpine3.20 17-3.4.4-alpine3.20 17-3.4-alpine diff --git a/17-3.4/alpine3.20/Dockerfile b/17-3.4/alpine3.21/Dockerfile similarity index 99% rename from 17-3.4/alpine3.20/Dockerfile rename to 17-3.4/alpine3.21/Dockerfile index c90aad8e2..3a26e42db 100644 --- a/17-3.4/alpine3.20/Dockerfile +++ b/17-3.4/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17-3.4/alpine3.20/initdb-postgis.sh b/17-3.4/alpine3.21/initdb-postgis.sh similarity index 100% rename from 17-3.4/alpine3.20/initdb-postgis.sh rename to 17-3.4/alpine3.21/initdb-postgis.sh diff --git a/17-3.4/alpine3.21/tags b/17-3.4/alpine3.21/tags new file mode 100644 index 000000000..c21461ffd --- /dev/null +++ b/17-3.4/alpine3.21/tags @@ -0,0 +1 @@ +17-3.4-alpine3.21 17-3.4.4-alpine3.21 17-3.4-alpine diff --git a/17-3.4/alpine3.20/update-postgis.sh b/17-3.4/alpine3.21/update-postgis.sh similarity index 100% rename from 17-3.4/alpine3.20/update-postgis.sh rename to 17-3.4/alpine3.21/update-postgis.sh diff --git a/17-3.5/alpine3.19/tags b/17-3.5/alpine3.19/tags deleted file mode 100644 index ce4cdb3da..000000000 --- a/17-3.5/alpine3.19/tags +++ /dev/null @@ -1 +0,0 @@ -17-3.5-alpine3.19 17-3.5.1-alpine3.19 diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags index 0805e2423..94a85c1b3 100644 --- a/17-3.5/alpine3.20/tags +++ b/17-3.5/alpine3.20/tags @@ -1 +1 @@ -17-3.5-alpine3.20 17-3.5.1-alpine3.20 17-3.5-alpine alpine +17-3.5-alpine3.20 17-3.5.1-alpine3.20 diff --git a/17-3.5/alpine3.19/Dockerfile b/17-3.5/alpine3.21/Dockerfile similarity index 99% rename from 17-3.5/alpine3.19/Dockerfile rename to 17-3.5/alpine3.21/Dockerfile index b525ef995..fe07105d4 100644 --- a/17-3.5/alpine3.19/Dockerfile +++ b/17-3.5/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.19 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.19" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.21" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17-3.5/alpine3.19/initdb-postgis.sh b/17-3.5/alpine3.21/initdb-postgis.sh similarity index 100% rename from 17-3.5/alpine3.19/initdb-postgis.sh rename to 17-3.5/alpine3.21/initdb-postgis.sh diff --git a/17-3.5/alpine3.21/tags b/17-3.5/alpine3.21/tags new file mode 100644 index 000000000..41449ea03 --- /dev/null +++ b/17-3.5/alpine3.21/tags @@ -0,0 +1 @@ +17-3.5-alpine3.21 17-3.5.1-alpine3.21 17-3.5-alpine alpine diff --git a/17-3.5/alpine3.19/update-postgis.sh b/17-3.5/alpine3.21/update-postgis.sh similarity index 100% rename from 17-3.5/alpine3.19/update-postgis.sh rename to 17-3.5/alpine3.21/update-postgis.sh diff --git a/README.md b/README.md index 0d56f9285..d4860a3e7 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-12-23) +## Versions (2024-12-25) We provide multi-platform image support for the following architectures: @@ -124,27 +124,33 @@ Please note that the included package list is subject to change as we continue t -### ⛰️Alpine 3.19 based +### ⛰️Alpine 3.21 based - The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -- In the Alpine 3.19 version, the package versions are: geos=3.12.1, gdal=3.8.1, proj=9.3.1, and sfcgal=1.5.0 +- In the Alpine 3.21 version, the package versions are: geos=3.13, gdal=3.10, proj=9.5, and sfcgal=2.0 - PostGIS is compiled from source, making it a bit more challenging to extend. - + | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.19), [`12-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.4.4 | -| [`12-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.19), [`12-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 12 | 3.5.1 | -| [`13-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.19), [`13-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.4.4 | -| [`13-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.19), [`13-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 13 | 3.5.1 | -| [`14-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.19), [`14-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.4.4 | -| [`14-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.19), [`14-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 14 | 3.5.1 | -| [`15-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.19), [`15-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.4.4 | -| [`15-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.19), [`15-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 15 | 3.5.1 | -| [`16-3.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.19), [`16-3.4.4-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.4.4 | -| [`16-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.19), [`16-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 16 | 3.5.1 | -| [`17-3.5-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.19), [`17-3.5.1-alpine3.19`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.19) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.19/Dockerfile) | amd64 arm64 | alpine3.19 | 17 | 3.5.1 | - +| [`12-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.21), [`12-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.21), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.3.8 | +| [`12-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.21), [`12-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.21), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.4.4 | +| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.1 | +| [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | +| [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | +| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.1 | +| [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 | +| [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 | +| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.1 | +| [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 | +| [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 | +| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.1 | +| [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 | +| [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 | +| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.1 | +| [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 | +| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.1 | + ### ⛰️Alpine 3.20 based @@ -155,23 +161,17 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.20), [`12-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.20), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.3.8 | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 | -| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.20), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 | -| [`13-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.20), [`13-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.20), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.3.8 | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | -| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.20), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 | -| [`14-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.20), [`14-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.20), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.3.8 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | -| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.20), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 | -| [`15-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.20), [`15-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.20), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.3.8 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | -| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.20), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 | -| [`16-3.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.20), [`16-3.3.8-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.20), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.3.8 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | -| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.20), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 | -| [`17-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.20), [`17-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.20), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.4.4 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.20), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 | +| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 | +| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 | +| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | +| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 | +| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | +| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 | +| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | +| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 | +| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | +| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 | diff --git a/manifest.sh b/manifest.sh index 122c92954..7adafdaf2 100755 --- a/manifest.sh +++ b/manifest.sh @@ -12,19 +12,19 @@ source tools/environment_init.sh # PLEASE DO NOT EDIT IT DIRECTLY. # -# ----- 12-3.3-alpine3.20 ----- +# ----- 12-3.3-alpine3.21 ----- -echo "manifest: ${dockername}:12-3.3-alpine3.20" +echo "manifest: ${dockername}:12-3.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.20 \ - --target ${dockername}:12-3.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.21 \ + --target ${dockername}:12-3.3-alpine3.21 || true -echo "manifest: ${dockername}:12-3.3.8-alpine3.20" +echo "manifest: ${dockername}:12-3.3.8-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.8-alpine3.20 \ - --target ${dockername}:12-3.3.8-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.3.8-alpine3.21 \ + --target ${dockername}:12-3.3.8-alpine3.21 || true echo "manifest: ${dockername}:12-3.3-alpine" manifest-tool push from-args \ @@ -32,20 +32,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.3-alpine \ --target ${dockername}:12-3.3-alpine || true -# ----- 12-3.4-alpine3.19 ----- - -echo "manifest: ${dockername}:12-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.19 \ - --target ${dockername}:12-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:12-3.4.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.19 \ - --target ${dockername}:12-3.4.4-alpine3.19 || true - # ----- 12-3.4-alpine3.20 ----- echo "manifest: ${dockername}:12-3.4-alpine3.20" @@ -60,25 +46,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.20 \ --target ${dockername}:12-3.4.4-alpine3.20 || true -echo "manifest: ${dockername}:12-3.4-alpine" +# ----- 12-3.4-alpine3.21 ----- + +echo "manifest: ${dockername}:12-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ - --target ${dockername}:12-3.4-alpine || true - -# ----- 12-3.5-alpine3.19 ----- + --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.21 \ + --target ${dockername}:12-3.4-alpine3.21 || true -echo "manifest: ${dockername}:12-3.5-alpine3.19" +echo "manifest: ${dockername}:12-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.19 \ - --target ${dockername}:12-3.5-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.21 \ + --target ${dockername}:12-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:12-3.5.1-alpine3.19" +echo "manifest: ${dockername}:12-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.19 \ - --target ${dockername}:12-3.5.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ + --target ${dockername}:12-3.4-alpine || true # ----- 12-3.5-alpine3.20 ----- @@ -94,6 +80,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.20 \ --target ${dockername}:12-3.5.1-alpine3.20 || true +# ----- 12-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:12-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.21 \ + --target ${dockername}:12-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:12-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.21 \ + --target ${dockername}:12-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:12-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -134,19 +134,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5.0-bullseye \ --target ${dockername}:12-3.5.0-bullseye || true -# ----- 13-3.3-alpine3.20 ----- +# ----- 13-3.3-alpine3.21 ----- -echo "manifest: ${dockername}:13-3.3-alpine3.20" +echo "manifest: ${dockername}:13-3.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.20 \ - --target ${dockername}:13-3.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.3-alpine3.21 \ + --target ${dockername}:13-3.3-alpine3.21 || true -echo "manifest: ${dockername}:13-3.3.8-alpine3.20" +echo "manifest: ${dockername}:13-3.3.8-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3.8-alpine3.20 \ - --target ${dockername}:13-3.3.8-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.3.8-alpine3.21 \ + --target ${dockername}:13-3.3.8-alpine3.21 || true echo "manifest: ${dockername}:13-3.3-alpine" manifest-tool push from-args \ @@ -154,20 +154,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.3-alpine \ --target ${dockername}:13-3.3-alpine || true -# ----- 13-3.4-alpine3.19 ----- - -echo "manifest: ${dockername}:13-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.19 \ - --target ${dockername}:13-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:13-3.4.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.19 \ - --target ${dockername}:13-3.4.4-alpine3.19 || true - # ----- 13-3.4-alpine3.20 ----- echo "manifest: ${dockername}:13-3.4-alpine3.20" @@ -182,25 +168,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.20 \ --target ${dockername}:13-3.4.4-alpine3.20 || true -echo "manifest: ${dockername}:13-3.4-alpine" +# ----- 13-3.4-alpine3.21 ----- + +echo "manifest: ${dockername}:13-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ - --target ${dockername}:13-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.21 \ + --target ${dockername}:13-3.4-alpine3.21 || true -# ----- 13-3.5-alpine3.19 ----- - -echo "manifest: ${dockername}:13-3.5-alpine3.19" +echo "manifest: ${dockername}:13-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.19 \ - --target ${dockername}:13-3.5-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.21 \ + --target ${dockername}:13-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:13-3.5.1-alpine3.19" +echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.19 \ - --target ${dockername}:13-3.5.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ + --target ${dockername}:13-3.4-alpine || true # ----- 13-3.5-alpine3.20 ----- @@ -216,6 +202,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.20 \ --target ${dockername}:13-3.5.1-alpine3.20 || true +# ----- 13-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:13-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.21 \ + --target ${dockername}:13-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:13-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.21 \ + --target ${dockername}:13-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:13-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -256,19 +256,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5.0-bullseye \ --target ${dockername}:13-3.5.0-bullseye || true -# ----- 14-3.3-alpine3.20 ----- +# ----- 14-3.3-alpine3.21 ----- -echo "manifest: ${dockername}:14-3.3-alpine3.20" +echo "manifest: ${dockername}:14-3.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.20 \ - --target ${dockername}:14-3.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.3-alpine3.21 \ + --target ${dockername}:14-3.3-alpine3.21 || true -echo "manifest: ${dockername}:14-3.3.8-alpine3.20" +echo "manifest: ${dockername}:14-3.3.8-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3.8-alpine3.20 \ - --target ${dockername}:14-3.3.8-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.3.8-alpine3.21 \ + --target ${dockername}:14-3.3.8-alpine3.21 || true echo "manifest: ${dockername}:14-3.3-alpine" manifest-tool push from-args \ @@ -276,20 +276,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.3-alpine \ --target ${dockername}:14-3.3-alpine || true -# ----- 14-3.4-alpine3.19 ----- - -echo "manifest: ${dockername}:14-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.19 \ - --target ${dockername}:14-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:14-3.4.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.19 \ - --target ${dockername}:14-3.4.4-alpine3.19 || true - # ----- 14-3.4-alpine3.20 ----- echo "manifest: ${dockername}:14-3.4-alpine3.20" @@ -304,25 +290,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.20 \ --target ${dockername}:14-3.4.4-alpine3.20 || true -echo "manifest: ${dockername}:14-3.4-alpine" +# ----- 14-3.4-alpine3.21 ----- + +echo "manifest: ${dockername}:14-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ - --target ${dockername}:14-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.21 \ + --target ${dockername}:14-3.4-alpine3.21 || true -# ----- 14-3.5-alpine3.19 ----- - -echo "manifest: ${dockername}:14-3.5-alpine3.19" +echo "manifest: ${dockername}:14-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.19 \ - --target ${dockername}:14-3.5-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.21 \ + --target ${dockername}:14-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:14-3.5.1-alpine3.19" +echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.19 \ - --target ${dockername}:14-3.5.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ + --target ${dockername}:14-3.4-alpine || true # ----- 14-3.5-alpine3.20 ----- @@ -338,6 +324,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.20 \ --target ${dockername}:14-3.5.1-alpine3.20 || true +# ----- 14-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:14-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.21 \ + --target ${dockername}:14-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:14-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.21 \ + --target ${dockername}:14-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -392,19 +392,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm \ --target ${dockername}:14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm || true -# ----- 15-3.3-alpine3.20 ----- +# ----- 15-3.3-alpine3.21 ----- -echo "manifest: ${dockername}:15-3.3-alpine3.20" +echo "manifest: ${dockername}:15-3.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.20 \ - --target ${dockername}:15-3.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.3-alpine3.21 \ + --target ${dockername}:15-3.3-alpine3.21 || true -echo "manifest: ${dockername}:15-3.3.8-alpine3.20" +echo "manifest: ${dockername}:15-3.3.8-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3.8-alpine3.20 \ - --target ${dockername}:15-3.3.8-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.3.8-alpine3.21 \ + --target ${dockername}:15-3.3.8-alpine3.21 || true echo "manifest: ${dockername}:15-3.3-alpine" manifest-tool push from-args \ @@ -412,20 +412,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.3-alpine \ --target ${dockername}:15-3.3-alpine || true -# ----- 15-3.4-alpine3.19 ----- - -echo "manifest: ${dockername}:15-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.19 \ - --target ${dockername}:15-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:15-3.4.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.19 \ - --target ${dockername}:15-3.4.4-alpine3.19 || true - # ----- 15-3.4-alpine3.20 ----- echo "manifest: ${dockername}:15-3.4-alpine3.20" @@ -440,25 +426,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.20 \ --target ${dockername}:15-3.4.4-alpine3.20 || true -echo "manifest: ${dockername}:15-3.4-alpine" +# ----- 15-3.4-alpine3.21 ----- + +echo "manifest: ${dockername}:15-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ - --target ${dockername}:15-3.4-alpine || true - -# ----- 15-3.5-alpine3.19 ----- + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.21 \ + --target ${dockername}:15-3.4-alpine3.21 || true -echo "manifest: ${dockername}:15-3.5-alpine3.19" +echo "manifest: ${dockername}:15-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.19 \ - --target ${dockername}:15-3.5-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.21 \ + --target ${dockername}:15-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:15-3.5.1-alpine3.19" +echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.19 \ - --target ${dockername}:15-3.5.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ + --target ${dockername}:15-3.4-alpine || true # ----- 15-3.5-alpine3.20 ----- @@ -474,6 +460,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.20 \ --target ${dockername}:15-3.5.1-alpine3.20 || true +# ----- 15-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:15-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.21 \ + --target ${dockername}:15-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:15-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.21 \ + --target ${dockername}:15-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -514,19 +514,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5.0-bullseye \ --target ${dockername}:15-3.5.0-bullseye || true -# ----- 16-3.3-alpine3.20 ----- +# ----- 16-3.3-alpine3.21 ----- -echo "manifest: ${dockername}:16-3.3-alpine3.20" +echo "manifest: ${dockername}:16-3.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.20 \ - --target ${dockername}:16-3.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.3-alpine3.21 \ + --target ${dockername}:16-3.3-alpine3.21 || true -echo "manifest: ${dockername}:16-3.3.8-alpine3.20" +echo "manifest: ${dockername}:16-3.3.8-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3.8-alpine3.20 \ - --target ${dockername}:16-3.3.8-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.3.8-alpine3.21 \ + --target ${dockername}:16-3.3.8-alpine3.21 || true echo "manifest: ${dockername}:16-3.3-alpine" manifest-tool push from-args \ @@ -534,20 +534,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.3-alpine \ --target ${dockername}:16-3.3-alpine || true -# ----- 16-3.4-alpine3.19 ----- - -echo "manifest: ${dockername}:16-3.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.19 \ - --target ${dockername}:16-3.4-alpine3.19 || true - -echo "manifest: ${dockername}:16-3.4.4-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.19 \ - --target ${dockername}:16-3.4.4-alpine3.19 || true - # ----- 16-3.4-alpine3.20 ----- echo "manifest: ${dockername}:16-3.4-alpine3.20" @@ -562,25 +548,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.20 \ --target ${dockername}:16-3.4.4-alpine3.20 || true -echo "manifest: ${dockername}:16-3.4-alpine" +# ----- 16-3.4-alpine3.21 ----- + +echo "manifest: ${dockername}:16-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ - --target ${dockername}:16-3.4-alpine || true + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.21 \ + --target ${dockername}:16-3.4-alpine3.21 || true -# ----- 16-3.5-alpine3.19 ----- - -echo "manifest: ${dockername}:16-3.5-alpine3.19" +echo "manifest: ${dockername}:16-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.19 \ - --target ${dockername}:16-3.5-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.21 \ + --target ${dockername}:16-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:16-3.5.1-alpine3.19" +echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.19 \ - --target ${dockername}:16-3.5.1-alpine3.19 || true + --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ + --target ${dockername}:16-3.4-alpine || true # ----- 16-3.5-alpine3.20 ----- @@ -596,6 +582,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.20 \ --target ${dockername}:16-3.5.1-alpine3.20 || true +# ----- 16-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:16-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.21 \ + --target ${dockername}:16-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:16-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.21 \ + --target ${dockername}:16-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -696,19 +696,19 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent \ --target ${dockername}:16-recent || true -# ----- 17-3.4-alpine3.20 ----- +# ----- 17-3.4-alpine3.21 ----- -echo "manifest: ${dockername}:17-3.4-alpine3.20" +echo "manifest: ${dockername}:17-3.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.4-alpine3.20 \ - --target ${dockername}:17-3.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.4-alpine3.21 \ + --target ${dockername}:17-3.4-alpine3.21 || true -echo "manifest: ${dockername}:17-3.4.4-alpine3.20" +echo "manifest: ${dockername}:17-3.4.4-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.20 \ - --target ${dockername}:17-3.4.4-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.21 \ + --target ${dockername}:17-3.4.4-alpine3.21 || true echo "manifest: ${dockername}:17-3.4-alpine" manifest-tool push from-args \ @@ -716,20 +716,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.4-alpine \ --target ${dockername}:17-3.4-alpine || true -# ----- 17-3.5-alpine3.19 ----- - -echo "manifest: ${dockername}:17-3.5-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.19 \ - --target ${dockername}:17-3.5-alpine3.19 || true - -echo "manifest: ${dockername}:17-3.5.1-alpine3.19" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.19 \ - --target ${dockername}:17-3.5.1-alpine3.19 || true - # ----- 17-3.5-alpine3.20 ----- echo "manifest: ${dockername}:17-3.5-alpine3.20" @@ -744,6 +730,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.20 \ --target ${dockername}:17-3.5.1-alpine3.20 || true +# ----- 17-3.5-alpine3.21 ----- + +echo "manifest: ${dockername}:17-3.5-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.21 \ + --target ${dockername}:17-3.5-alpine3.21 || true + +echo "manifest: ${dockername}:17-3.5.1-alpine3.21" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.21 \ + --target ${dockername}:17-3.5.1-alpine3.21 || true + echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ diff --git a/versions.json b/versions.json index aefd95161..eee895bd5 100644 --- a/versions.json +++ b/versions.json @@ -1,8 +1,8 @@ { "12-3.3": { - "alpine3.20": { - "tags": "12-3.3-alpine3.20 12-3.3.8-alpine3.20 12-3.3-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "12-3.3-alpine3.21 12-3.3.8-alpine3.21 12-3.3-alpine", + "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -16,9 +16,9 @@ } }, "12-3.4": { - "alpine3.19": { - "tags": "12-3.4-alpine3.19 12-3.4.4-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "12-3.4-alpine3.20 12-3.4.4-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -30,9 +30,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.20": { - "tags": "12-3.4-alpine3.20 12-3.4.4-alpine3.20 12-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "12-3.4-alpine3.21 12-3.4.4-alpine3.21 12-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -70,9 +70,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "12-3.5-alpine3.19 12-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "12-3.5-alpine3.20 12-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -84,9 +84,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "12-3.5-alpine3.20 12-3.5.1-alpine3.20 12-3.5-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "12-3.5-alpine3.21 12-3.5.1-alpine3.21 12-3.5-alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -100,9 +100,9 @@ } }, "13-3.3": { - "alpine3.20": { - "tags": "13-3.3-alpine3.20 13-3.3.8-alpine3.20 13-3.3-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "13-3.3-alpine3.21 13-3.3.8-alpine3.21 13-3.3-alpine", + "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -116,9 +116,9 @@ } }, "13-3.4": { - "alpine3.19": { - "tags": "13-3.4-alpine3.19 13-3.4.4-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "13-3.4-alpine3.20 13-3.4.4-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -130,9 +130,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.20": { - "tags": "13-3.4-alpine3.20 13-3.4.4-alpine3.20 13-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "13-3.4-alpine3.21 13-3.4.4-alpine3.21 13-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -170,9 +170,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "13-3.5-alpine3.19 13-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "13-3.5-alpine3.20 13-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -184,9 +184,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "13-3.5-alpine3.20 13-3.5.1-alpine3.20 13-3.5-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "13-3.5-alpine3.21 13-3.5.1-alpine3.21 13-3.5-alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -200,9 +200,9 @@ } }, "14-3.3": { - "alpine3.20": { - "tags": "14-3.3-alpine3.20 14-3.3.8-alpine3.20 14-3.3-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "14-3.3-alpine3.21 14-3.3.8-alpine3.21 14-3.3-alpine", + "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -216,9 +216,9 @@ } }, "14-3.4": { - "alpine3.19": { - "tags": "14-3.4-alpine3.19 14-3.4.4-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "14-3.4-alpine3.20 14-3.4.4-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -230,9 +230,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.20": { - "tags": "14-3.4-alpine3.20 14-3.4.4-alpine3.20 14-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "14-3.4-alpine3.21 14-3.4.4-alpine3.21 14-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -270,9 +270,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "14-3.5-alpine3.19 14-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "14-3.5-alpine3.20 14-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -284,9 +284,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "14-3.5-alpine3.20 14-3.5.1-alpine3.20 14-3.5-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "14-3.5-alpine3.21 14-3.5.1-alpine3.21 14-3.5-alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -300,9 +300,9 @@ } }, "15-3.3": { - "alpine3.20": { - "tags": "15-3.3-alpine3.20 15-3.3.8-alpine3.20 15-3.3-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "15-3.3-alpine3.21 15-3.3.8-alpine3.21 15-3.3-alpine", + "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -316,9 +316,9 @@ } }, "15-3.4": { - "alpine3.19": { - "tags": "15-3.4-alpine3.19 15-3.4.4-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "15-3.4-alpine3.20 15-3.4.4-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -330,9 +330,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.20": { - "tags": "15-3.4-alpine3.20 15-3.4.4-alpine3.20 15-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "15-3.4-alpine3.21 15-3.4.4-alpine3.21 15-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -370,9 +370,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "15-3.5-alpine3.19 15-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "15-3.5-alpine3.20 15-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -384,9 +384,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "15-3.5-alpine3.20 15-3.5.1-alpine3.20 15-3.5-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "15-3.5-alpine3.21 15-3.5.1-alpine3.21 15-3.5-alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -400,9 +400,9 @@ } }, "16-3.3": { - "alpine3.20": { - "tags": "16-3.3-alpine3.20 16-3.3.8-alpine3.20 16-3.3-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "16-3.3-alpine3.21 16-3.3.8-alpine3.21 16-3.3-alpine", + "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -416,9 +416,9 @@ } }, "16-3.4": { - "alpine3.19": { - "tags": "16-3.4-alpine3.19 16-3.4.4-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "16-3.4-alpine3.20 16-3.4.4-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -430,9 +430,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.4-alpine3.20 16-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "16-3.4-alpine3.21 16-3.4.4-alpine3.21 16-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -470,9 +470,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "16-3.5-alpine3.19 16-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "16-3.5-alpine3.20 16-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -484,9 +484,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "16-3.5-alpine3.20 16-3.5.1-alpine3.20 16-3.5-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "16-3.5-alpine3.21 16-3.5.1-alpine3.21 16-3.5-alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -578,9 +578,9 @@ } }, "17-3.4": { - "alpine3.20": { - "tags": "17-3.4-alpine3.20 17-3.4.4-alpine3.20 17-3.4-alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "17-3.4-alpine3.21 17-3.4.4-alpine3.21 17-3.4-alpine", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -618,9 +618,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" }, - "alpine3.19": { - "tags": "17-3.5-alpine3.19 17-3.5.1-alpine3.19", - "readme_group": "alpine3.19", + "alpine3.20": { + "tags": "17-3.5-alpine3.20 17-3.5.1-alpine3.20", + "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -632,9 +632,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.1", "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" }, - "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.1-alpine3.20 17-3.5-alpine alpine", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "17-3.5-alpine3.21 17-3.5.1-alpine3.21 17-3.5-alpine alpine", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", diff --git a/versions.sh b/versions.sh index 849ed5464..59dae52a6 100755 --- a/versions.sh +++ b/versions.sh @@ -17,15 +17,15 @@ source tools/environment_init.sh api_preference="github" #api_preference="osgeo" -- not working yet -alpine_variants=" alpine3.19 alpine3.20 " +alpine_variants=" alpine3.20 alpine3.21 " debian_variants=" bullseye bookworm " debian_latest="bookworm" -alpine_latest="alpine3.20" +alpine_latest="alpine3.21" postgis_latest="3.5" postgres_latest="17" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="11 12 13 14 15 16 17" +postgres_versions="12 13 14 15 16 17" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used From 6ee940632c5ed4e87e6749bd2aaa8574b05cb954 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 4 Jan 2025 17:43:44 +0100 Subject: [PATCH 139/167] check version.json schema, add debian: postgis 3.5.1 (#76) add versions.schema.json update: debian: postgis 3.5.1 update: ci files --- .circleci/config.yml | 8 +-- .github/workflows/localtest.yml | 4 +- .github/workflows/main.yml | 8 +-- .github/workflows/shellcheck.yml | 2 +- .github/workflows/update.yml | 10 +-- 12-3.5/bookworm/Dockerfile | 4 +- 12-3.5/bookworm/tags | 2 +- 12-3.5/bullseye/Dockerfile | 4 +- 12-3.5/bullseye/tags | 2 +- 13-3.5/bookworm/Dockerfile | 4 +- 13-3.5/bookworm/tags | 2 +- 13-3.5/bullseye/Dockerfile | 4 +- 13-3.5/bullseye/tags | 2 +- 14-3.5/bookworm/Dockerfile | 4 +- 14-3.5/bookworm/tags | 2 +- 14-3.5/bullseye/Dockerfile | 4 +- 14-3.5/bullseye/tags | 2 +- 15-3.5/bookworm/Dockerfile | 4 +- 15-3.5/bookworm/tags | 2 +- 15-3.5/bullseye/Dockerfile | 4 +- 15-3.5/bullseye/tags | 2 +- 16-3.5-bundle0/bookworm/tags | 2 +- 16-3.5/bookworm/Dockerfile | 4 +- 16-3.5/bookworm/tags | 2 +- 16-3.5/bullseye/Dockerfile | 4 +- 16-3.5/bullseye/tags | 2 +- 17-3.5/bookworm/Dockerfile | 4 +- 17-3.5/bookworm/tags | 2 +- 17-3.5/bullseye/Dockerfile | 4 +- 17-3.5/bullseye/tags | 2 +- README.md | 28 ++++----- localtest.sh | 2 + manifest.sh | 78 +++++++++++------------ tools/environment_init.sh | 2 +- versions.json | 52 ++++++++-------- versions.schema.json | 104 +++++++++++++++++++++++++++++++ 36 files changed, 239 insertions(+), 133 deletions(-) create mode 100644 versions.schema.json diff --git a/.circleci/config.yml b/.circleci/config.yml index e20d96d5f..1c360d07d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,9 +5,9 @@ version: 2.1 orbs: # https://circleci.com/developer/orbs/orb/circleci/docker - docker: circleci/docker@2.7.1 + docker: circleci/docker@2.8.1 # https://circleci.com/developer/orbs/orb/circleci/python - python: circleci/python@2.1.1 + python: circleci/python@3.0.0 # https://circleci.com/developer/orbs/orb/circleci/shellcheck shellcheck: circleci/shellcheck@3.2.0 @@ -17,7 +17,7 @@ jobs: # Note: Include parallel GitHub CI jobs when calculating the total load, as they run simultaneously! parallelism: 8 machine: - image: ubuntu-2204:current + image: ubuntu-2404:current resource_class: arm.large environment: BUILDX_PLATFORMS: linux/arm64v8 @@ -58,7 +58,7 @@ jobs: - run: docker --version - run: docker info - run: pip3 install --upgrade pip - - run: pip3 install --upgrade lastversion + - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/install_dive.sh - run: tools/environment_init.sh diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index 96fe531e8..eb6dcd4b5 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -9,12 +9,12 @@ on: jobs: localtest: name: "testing ./localtest.sh ( update.sh and build test and push to local registry )" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - run: docker ps -a - run: pip3 install --upgrade pip - - run: pip3 install --upgrade lastversion + - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - run: ./localtest.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a08aaed1..496d07db5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,7 +76,7 @@ jobs: #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 continue-on-error: ${{ endsWith(matrix.version, '-master') }} env: PLATFORM: linux/amd64 @@ -88,7 +88,7 @@ jobs: uses: actions/checkout@v4 - run: pip3 install --upgrade pip - - run: pip3 install --upgrade lastversion + - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/install_dive.sh - run: tools/environment_init.sh @@ -174,7 +174,7 @@ jobs: make-readme: name: update readme needs: make-docker-images - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: PLATFORM: linux/amd64 DOCKER_BUILDKIT: '1' @@ -185,7 +185,7 @@ jobs: uses: actions/checkout@v4 - run: pip3 install --upgrade pip - - run: pip3 install --upgrade lastversion + - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - run: make check_version diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index aca5fb60f..5d1f0c8fe 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -7,7 +7,7 @@ on: jobs: shellcheck: name: Shellcheck - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Run ShellCheck diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 8bc44af3f..9c1e1626c 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -11,7 +11,7 @@ env: jobs: update_dockerfiles: name: "update_dockerfiles" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -24,12 +24,13 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - run: pip3 install --upgrade pip - - run: pip3 install --upgrade lastversion + - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - run: ./update.sh - run: git status - run: git diff versions.json + - run: check-jsonschema --schemafile versions.schema.json versions.json - name: Check if versions.json changed id: version_check @@ -64,7 +65,7 @@ jobs: # https://github.com/peter-evans/create-pull-request - name: Create Pull Request if: env.versions_changed == 'true' && steps.check_prs.outputs.create_pr == 'true' - id: create-pr + id: create-pr uses: peter-evans/create-pull-request@v6 with: committer: GitHub @@ -97,10 +98,9 @@ jobs: gh pr close $PR_NUMBER --comment "Closing to trigger full CI/CD pipeline" sleep 5 # Wait for 5 seconds to ensure the PR is fully closed gh pr reopen $PR_NUMBER --comment "Reopening to trigger full CI/CD pipeline" - + - name: Comment PR if: steps.create-pr.outputs.pull-request-number run: | PR_NUMBER=${{ steps.create-pr.outputs.pull-request-number }} gh pr comment $PR_NUMBER --body "This PR was automatically created and reopened by the update_dockerfiles workflow to trigger the full CI/CD pipeline. Please review the changes carefully." - \ No newline at end of file diff --git a/12-3.5/bookworm/Dockerfile b/12-3.5/bookworm/Dockerfile index 83c6b6dda..8788d94ab 100644 --- a/12-3.5/bookworm/Dockerfile +++ b/12-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.5/bookworm/tags b/12-3.5/bookworm/tags index 7fc29cf79..69c6e42f4 100644 --- a/12-3.5/bookworm/tags +++ b/12-3.5/bookworm/tags @@ -1 +1 @@ -12-3.5-bookworm 12-3.5.0-bookworm 12-3.5 +12-3.5-bookworm 12-3.5.1-bookworm 12-3.5 diff --git a/12-3.5/bullseye/Dockerfile b/12-3.5/bullseye/Dockerfile index c652c85f1..f8499e238 100644 --- a/12-3.5/bullseye/Dockerfile +++ b/12-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.5/bullseye/tags b/12-3.5/bullseye/tags index 9edbdd7de..bdc43016c 100644 --- a/12-3.5/bullseye/tags +++ b/12-3.5/bullseye/tags @@ -1 +1 @@ -12-3.5-bullseye 12-3.5.0-bullseye +12-3.5-bullseye 12-3.5.1-bullseye diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile index e6335a018..2af2aa46c 100644 --- a/13-3.5/bookworm/Dockerfile +++ b/13-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.5/bookworm/tags b/13-3.5/bookworm/tags index 1b2c9eb45..71b145fa6 100644 --- a/13-3.5/bookworm/tags +++ b/13-3.5/bookworm/tags @@ -1 +1 @@ -13-3.5-bookworm 13-3.5.0-bookworm 13-3.5 +13-3.5-bookworm 13-3.5.1-bookworm 13-3.5 diff --git a/13-3.5/bullseye/Dockerfile b/13-3.5/bullseye/Dockerfile index efe79d47f..cf4010cd7 100644 --- a/13-3.5/bullseye/Dockerfile +++ b/13-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.5/bullseye/tags b/13-3.5/bullseye/tags index f59017c17..19cb96033 100644 --- a/13-3.5/bullseye/tags +++ b/13-3.5/bullseye/tags @@ -1 +1 @@ -13-3.5-bullseye 13-3.5.0-bullseye +13-3.5-bullseye 13-3.5.1-bullseye diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile index c0d806ac8..e17be52c4 100644 --- a/14-3.5/bookworm/Dockerfile +++ b/14-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.5/bookworm/tags b/14-3.5/bookworm/tags index f4a5e22f4..abf9f2e48 100644 --- a/14-3.5/bookworm/tags +++ b/14-3.5/bookworm/tags @@ -1 +1 @@ -14-3.5-bookworm 14-3.5.0-bookworm 14-3.5 +14-3.5-bookworm 14-3.5.1-bookworm 14-3.5 diff --git a/14-3.5/bullseye/Dockerfile b/14-3.5/bullseye/Dockerfile index 4a4e82d7c..753171c82 100644 --- a/14-3.5/bullseye/Dockerfile +++ b/14-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.5/bullseye/tags b/14-3.5/bullseye/tags index 9011cd437..155de3c0d 100644 --- a/14-3.5/bullseye/tags +++ b/14-3.5/bullseye/tags @@ -1 +1 @@ -14-3.5-bullseye 14-3.5.0-bullseye +14-3.5-bullseye 14-3.5.1-bullseye diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile index 153e0b49d..aaf727d16 100644 --- a/15-3.5/bookworm/Dockerfile +++ b/15-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.5/bookworm/tags b/15-3.5/bookworm/tags index 4c34c05d5..00dda9475 100644 --- a/15-3.5/bookworm/tags +++ b/15-3.5/bookworm/tags @@ -1 +1 @@ -15-3.5-bookworm 15-3.5.0-bookworm 15-3.5 +15-3.5-bookworm 15-3.5.1-bookworm 15-3.5 diff --git a/15-3.5/bullseye/Dockerfile b/15-3.5/bullseye/Dockerfile index 25f1f5408..2f62defdd 100644 --- a/15-3.5/bullseye/Dockerfile +++ b/15-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.5/bullseye/tags b/15-3.5/bullseye/tags index 6402453ed..816a4af0c 100644 --- a/15-3.5/bullseye/tags +++ b/15-3.5/bullseye/tags @@ -1 +1 @@ -15-3.5-bullseye 15-3.5.0-bullseye +15-3.5-bullseye 15-3.5.1-bullseye diff --git a/16-3.5-bundle0/bookworm/tags b/16-3.5-bundle0/bookworm/tags index 43edcb45f..5f07c3e57 100644 --- a/16-3.5-bundle0/bookworm/tags +++ b/16-3.5-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.5-bundle0-bookworm 16-3.5.0-bundle0-bookworm 16-3.5-bundle0 +16-3.5-bundle0-bookworm 16-3.5.1-bundle0-bookworm 16-3.5-bundle0 diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile index a42a2f5ea..a5d1e2e9f 100644 --- a/16-3.5/bookworm/Dockerfile +++ b/16-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.5/bookworm/tags b/16-3.5/bookworm/tags index 71ac787a2..60de13892 100644 --- a/16-3.5/bookworm/tags +++ b/16-3.5/bookworm/tags @@ -1 +1 @@ -16-3.5-bookworm 16-3.5.0-bookworm 16-3.5 +16-3.5-bookworm 16-3.5.1-bookworm 16-3.5 diff --git a/16-3.5/bullseye/Dockerfile b/16-3.5/bullseye/Dockerfile index 2a4043561..a0d149adb 100644 --- a/16-3.5/bullseye/Dockerfile +++ b/16-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.5/bullseye/tags b/16-3.5/bullseye/tags index 547297fe1..2a8e87723 100644 --- a/16-3.5/bullseye/tags +++ b/16-3.5/bullseye/tags @@ -1 +1 @@ -16-3.5-bullseye 16-3.5.0-bullseye +16-3.5-bullseye 16-3.5.1-bullseye diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile index 6617b1b19..60888decd 100644 --- a/17-3.5/bookworm/Dockerfile +++ b/17-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:17-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/17-3.5/bookworm/tags b/17-3.5/bookworm/tags index 6df75ab5d..02191624a 100644 --- a/17-3.5/bookworm/tags +++ b/17-3.5/bookworm/tags @@ -1 +1 @@ -17-3.5-bookworm 17-3.5.0-bookworm 17-3.5 latest +17-3.5-bookworm 17-3.5.1-bookworm 17-3.5 latest diff --git a/17-3.5/bullseye/Dockerfile b/17-3.5/bullseye/Dockerfile index fd4813a10..be6095563 100644 --- a/17-3.5/bullseye/Dockerfile +++ b/17-3.5/bullseye/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:17-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.0+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/17-3.5/bullseye/tags b/17-3.5/bullseye/tags index 776d51be4..10a092f3d 100644 --- a/17-3.5/bullseye/tags +++ b/17-3.5/bullseye/tags @@ -1 +1 @@ -17-3.5-bullseye 17-3.5.0-bullseye +17-3.5-bullseye 17-3.5.1-bullseye diff --git a/README.md b/README.md index d4860a3e7..10053e496 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2024-12-25) +## Versions (2025-01-04) We provide multi-platform image support for the following architectures: @@ -71,12 +71,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.0 | -| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.0 | -| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.0 | -| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.0 | -| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.0 | -| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.0 | +| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.1 | +| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.1 | +| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.1 | +| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.1 | +| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 | +| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.1 | ### 📘Debian - bullseye @@ -88,12 +88,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.0 | -| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.0 | -| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.0 | -| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.0 | -| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.0 | -| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.0-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.0-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.0 | +| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.1 | +| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.1 | +| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.1 | +| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.1 | +| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.1 | +| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.1 | @@ -120,7 +120,7 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.0-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.0 | +| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 | diff --git a/localtest.sh b/localtest.sh index 5f4491258..f478cff5e 100755 --- a/localtest.sh +++ b/localtest.sh @@ -28,6 +28,8 @@ fi # check update code ./update.sh +check-jsonschema --schemafile versions.schema.json versions.json + test_tag=17-3.5-bookworm # check commands diff --git a/manifest.sh b/manifest.sh index 7adafdaf2..f27c990a4 100755 --- a/manifest.sh +++ b/manifest.sh @@ -108,11 +108,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-bookworm \ --target ${dockername}:12-3.5-bookworm || true -echo "manifest: ${dockername}:12-3.5.0-bookworm" +echo "manifest: ${dockername}:12-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0-bookworm \ - --target ${dockername}:12-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.5.1-bookworm \ + --target ${dockername}:12-3.5.1-bookworm || true echo "manifest: ${dockername}:12-3.5" manifest-tool push from-args \ @@ -128,11 +128,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-bullseye \ --target ${dockername}:12-3.5-bullseye || true -echo "manifest: ${dockername}:12-3.5.0-bullseye" +echo "manifest: ${dockername}:12-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.0-bullseye \ - --target ${dockername}:12-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.5.1-bullseye \ + --target ${dockername}:12-3.5.1-bullseye || true # ----- 13-3.3-alpine3.21 ----- @@ -230,11 +230,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-bookworm \ --target ${dockername}:13-3.5-bookworm || true -echo "manifest: ${dockername}:13-3.5.0-bookworm" +echo "manifest: ${dockername}:13-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0-bookworm \ - --target ${dockername}:13-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.5.1-bookworm \ + --target ${dockername}:13-3.5.1-bookworm || true echo "manifest: ${dockername}:13-3.5" manifest-tool push from-args \ @@ -250,11 +250,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-bullseye \ --target ${dockername}:13-3.5-bullseye || true -echo "manifest: ${dockername}:13-3.5.0-bullseye" +echo "manifest: ${dockername}:13-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.0-bullseye \ - --target ${dockername}:13-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.5.1-bullseye \ + --target ${dockername}:13-3.5.1-bullseye || true # ----- 14-3.3-alpine3.21 ----- @@ -352,11 +352,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-bookworm \ --target ${dockername}:14-3.5-bookworm || true -echo "manifest: ${dockername}:14-3.5.0-bookworm" +echo "manifest: ${dockername}:14-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0-bookworm \ - --target ${dockername}:14-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.5.1-bookworm \ + --target ${dockername}:14-3.5.1-bookworm || true echo "manifest: ${dockername}:14-3.5" manifest-tool push from-args \ @@ -372,11 +372,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-bullseye \ --target ${dockername}:14-3.5-bullseye || true -echo "manifest: ${dockername}:14-3.5.0-bullseye" +echo "manifest: ${dockername}:14-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.0-bullseye \ - --target ${dockername}:14-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.5.1-bullseye \ + --target ${dockername}:14-3.5.1-bullseye || true # ----- 14-l3.1.9gcp-bookworm ----- @@ -488,11 +488,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-bookworm \ --target ${dockername}:15-3.5-bookworm || true -echo "manifest: ${dockername}:15-3.5.0-bookworm" +echo "manifest: ${dockername}:15-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0-bookworm \ - --target ${dockername}:15-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.5.1-bookworm \ + --target ${dockername}:15-3.5.1-bookworm || true echo "manifest: ${dockername}:15-3.5" manifest-tool push from-args \ @@ -508,11 +508,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-bullseye \ --target ${dockername}:15-3.5-bullseye || true -echo "manifest: ${dockername}:15-3.5.0-bullseye" +echo "manifest: ${dockername}:15-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.0-bullseye \ - --target ${dockername}:15-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.5.1-bullseye \ + --target ${dockername}:15-3.5.1-bullseye || true # ----- 16-3.3-alpine3.21 ----- @@ -610,11 +610,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bookworm \ --target ${dockername}:16-3.5-bookworm || true -echo "manifest: ${dockername}:16-3.5.0-bookworm" +echo "manifest: ${dockername}:16-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0-bookworm \ - --target ${dockername}:16-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.1-bookworm \ + --target ${dockername}:16-3.5.1-bookworm || true echo "manifest: ${dockername}:16-3.5" manifest-tool push from-args \ @@ -630,11 +630,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bullseye \ --target ${dockername}:16-3.5-bullseye || true -echo "manifest: ${dockername}:16-3.5.0-bullseye" +echo "manifest: ${dockername}:16-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0-bullseye \ - --target ${dockername}:16-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.5.1-bullseye \ + --target ${dockername}:16-3.5.1-bullseye || true # ----- 16-3.5-bundle0-bookworm ----- @@ -644,11 +644,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bundle0-bookworm \ --target ${dockername}:16-3.5-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.5.0-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.5.1-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.0-bundle0-bookworm \ - --target ${dockername}:16-3.5.0-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.1-bundle0-bookworm \ + --target ${dockername}:16-3.5.1-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.5-bundle0" manifest-tool push from-args \ @@ -764,11 +764,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-bookworm \ --target ${dockername}:17-3.5-bookworm || true -echo "manifest: ${dockername}:17-3.5.0-bookworm" +echo "manifest: ${dockername}:17-3.5.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.0-bookworm \ - --target ${dockername}:17-3.5.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-3.5.1-bookworm \ + --target ${dockername}:17-3.5.1-bookworm || true echo "manifest: ${dockername}:17-3.5" manifest-tool push from-args \ @@ -790,11 +790,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-bullseye \ --target ${dockername}:17-3.5-bullseye || true -echo "manifest: ${dockername}:17-3.5.0-bullseye" +echo "manifest: ${dockername}:17-3.5.1-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.0-bullseye \ - --target ${dockername}:17-3.5.0-bullseye || true + --template ${dockername}-ARCHVARIANT:17-3.5.1-bullseye \ + --target ${dockername}:17-3.5.1-bullseye || true # ----- 17-master-bookworm ----- diff --git a/tools/environment_init.sh b/tools/environment_init.sh index 1657e36ea..2577b8332 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -78,7 +78,7 @@ echo " " # Verify that the required command-line tools (jq, gawk, python3, .. ) are available in the system's PATH. # Exit with an error message if any of them are missing. -for cmd in docker jq gawk curl python3 manifest-tool lastversion; do +for cmd in docker jq check-jsonschema gawk curl python3 manifest-tool lastversion; do if ! command -v "$cmd" &>/dev/null; then echo "Error: $cmd is not installed." exit 1 diff --git a/versions.json b/versions.json index eee895bd5..8aa136fb3 100644 --- a/versions.json +++ b/versions.json @@ -47,7 +47,7 @@ }, "12-3.5": { "bullseye": { - "tags": "12-3.5-bullseye 12-3.5.0-bullseye", + "tags": "12-3.5-bullseye 12-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "12", @@ -56,10 +56,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.5-bookworm 12-3.5.0-bookworm 12-3.5", + "tags": "12-3.5-bookworm 12-3.5.1-bookworm 12-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "12", @@ -68,7 +68,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "12-3.5-alpine3.20 12-3.5.1-alpine3.20", @@ -147,7 +147,7 @@ }, "13-3.5": { "bullseye": { - "tags": "13-3.5-bullseye 13-3.5.0-bullseye", + "tags": "13-3.5-bullseye 13-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "13", @@ -156,10 +156,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.5-bookworm 13-3.5.0-bookworm 13-3.5", + "tags": "13-3.5-bookworm 13-3.5.1-bookworm 13-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -168,7 +168,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "13-3.5-alpine3.20 13-3.5.1-alpine3.20", @@ -247,7 +247,7 @@ }, "14-3.5": { "bullseye": { - "tags": "14-3.5-bullseye 14-3.5.0-bullseye", + "tags": "14-3.5-bullseye 14-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "14", @@ -256,10 +256,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.5-bookworm 14-3.5.0-bookworm 14-3.5", + "tags": "14-3.5-bookworm 14-3.5.1-bookworm 14-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -268,7 +268,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "14-3.5-alpine3.20 14-3.5.1-alpine3.20", @@ -347,7 +347,7 @@ }, "15-3.5": { "bullseye": { - "tags": "15-3.5-bullseye 15-3.5.0-bullseye", + "tags": "15-3.5-bullseye 15-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "15", @@ -356,10 +356,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.5-bookworm 15-3.5.0-bookworm 15-3.5", + "tags": "15-3.5-bookworm 15-3.5.1-bookworm 15-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -368,7 +368,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "15-3.5-alpine3.20 15-3.5.1-alpine3.20", @@ -447,7 +447,7 @@ }, "16-3.5": { "bullseye": { - "tags": "16-3.5-bullseye 16-3.5.0-bullseye", + "tags": "16-3.5-bullseye 16-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "16", @@ -456,10 +456,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.5-bookworm 16-3.5.0-bookworm 16-3.5", + "tags": "16-3.5-bookworm 16-3.5.1-bookworm 16-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -468,7 +468,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "16-3.5-alpine3.20 16-3.5.1-alpine3.20", @@ -501,7 +501,7 @@ }, "16-3.5-bundle0": { "bookworm": { - "tags": "16-3.5-bundle0-bookworm 16-3.5.0-bundle0-bookworm 16-3.5-bundle0", + "tags": "16-3.5-bundle0-bookworm 16-3.5.1-bundle0-bookworm 16-3.5-bundle0", "postgis": "3.5", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -522,7 +522,7 @@ "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" } }, "16-master": { @@ -595,7 +595,7 @@ }, "17-3.5": { "bullseye": { - "tags": "17-3.5-bullseye 17-3.5.0-bullseye", + "tags": "17-3.5-bullseye 17-3.5.1-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "17", @@ -604,10 +604,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "17-3.5-bookworm 17-3.5.0-bookworm 17-3.5 latest", + "tags": "17-3.5-bookworm 17-3.5.1-bookworm 17-3.5 latest", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "17", @@ -616,7 +616,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.0+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" }, "alpine3.20": { "tags": "17-3.5-alpine3.20 17-3.5.1-alpine3.20", diff --git a/versions.schema.json b/versions.schema.json new file mode 100644 index 000000000..67efffbec --- /dev/null +++ b/versions.schema.json @@ -0,0 +1,104 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "definitions": { + "git_checkout_ref": { + "type": "string", + "pattern": "^(master|main|develop|tags/(((v|V)?[0-9]+(\\.[0-9]+)*([-_]?[a-zA-Z0-9]+)*)|((REL|rel)_?[0-9]+(_[0-9]+)*(_[a-zA-Z0-9]+)*)))$" + }, + "sha1_value": { + "type": "string", + "pattern": "^(nocheck|[0-9a-f]{40})$" + }, + "pg_version": { + "type": "string", + "pattern": "^[0-9]{2}$" + }, + "gdal_build_type": { + "type": "string", + "enum": ["with_extra", "minimal"] + }, + "shell_script": { + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9_-]*\\.sh$" + }, + "docker_tags": { + "type": "string", + "pattern": "^(([0-9]{2}-[a-zA-Z0-9.-]+|recent|latest|alpine)\\s*)+$" + }, + "readme_group_type": { + "type": "string", + "pattern": "^(alpine[0-9.]+|bullseye|bookworm|bundle0|locked|recent|test)$" + }, + "distribution": { + "type": "object", + "required": [ + "tags", + "postgis", + "arch", + "template", + "initfile", + "PG_MAJOR", + "PG_DOCKER", + "readme_group" + ], + "properties": { + "tags": {"$ref": "#/definitions/docker_tags"}, + "postgis": {"type": "string"}, + "readme_group": {"$ref": "#/definitions/readme_group_type"}, + "arch": {"type": "string", "pattern": "^(amd64|arm64|amd64 arm64)$"}, + "template": { + "type": "string", + "enum": [ + "Dockerfile.alpine.template", + "Dockerfile.debian.template", + "Dockerfile.master.template", + "Dockerfile.bundle0.template" + ] + }, + "initfile": {"$ref": "#/definitions/shell_script"}, + "PG_MAJOR": {"$ref": "#/definitions/pg_version"}, + "PG_DOCKER": {"$ref": "#/definitions/pg_version"}, + "GDAL_BUILD": {"$ref": "#/definitions/gdal_build_type"}, + "POSTGIS_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "PROJ_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "GDAL_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "GEOS_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "SFCGAL_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "CGAL_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "MOBILITYDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "PGSQL_HTTP_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "PGSQL_GZIP_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "TIMESCALEDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "DUCKDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "PG_HINT_PLAN_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, + "POSTGIS_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "PROJ_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "GDAL_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "GEOS_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "SFCGAL_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "CGAL_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "MOBILITYDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "PGSQL_HTTP_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "PGSQL_GZIP_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "TIMESCALEDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "DUCKDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, + "PG_HINT_PLAN_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"} + }, + "patternProperties": { + ".*_CHECKOUT_SHA1$": {"$ref": "#/definitions/sha1_value"} + } + } + }, + "patternProperties": { + "^[0-9]+-[0-9.]+(?:-[a-zA-Z0-9]+)?$": { + "type": "object", + "patternProperties": { + "^(alpine[0-9.]+|bullseye|bookworm)$": { + "$ref": "#/definitions/distribution" + } + }, + "additionalProperties": false + } + } +} \ No newline at end of file From c328d8c3e655d4d1a42b146675b0f7e85299013a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 31 Jan 2025 00:32:01 +0100 Subject: [PATCH 140/167] 2025refactor01 + postgis 3.5.2 (#78) * refactoring . * update.sh * fix localtest ci --- .github/workflows/localtest.yml | 2 +- 12-3.3/alpine3.21/Dockerfile | 4 +- 12-3.4/alpine3.20/Dockerfile | 4 +- 12-3.4/alpine3.21/Dockerfile | 4 +- 12-3.5/alpine3.20/Dockerfile | 8 +- 12-3.5/alpine3.20/tags | 2 +- 12-3.5/alpine3.21/Dockerfile | 8 +- 12-3.5/alpine3.21/tags | 2 +- 12-3.5/bookworm/Dockerfile | 8 +- 12-3.5/bookworm/tags | 2 +- 12-3.5/bullseye/Dockerfile | 8 +- 12-3.5/bullseye/tags | 2 +- 13-3.3/alpine3.21/Dockerfile | 4 +- 13-3.4/alpine3.20/Dockerfile | 4 +- 13-3.4/alpine3.21/Dockerfile | 4 +- 13-3.5/alpine3.20/Dockerfile | 8 +- 13-3.5/alpine3.20/tags | 2 +- 13-3.5/alpine3.21/Dockerfile | 8 +- 13-3.5/alpine3.21/tags | 2 +- 13-3.5/bookworm/Dockerfile | 8 +- 13-3.5/bookworm/tags | 2 +- 13-3.5/bullseye/Dockerfile | 8 +- 13-3.5/bullseye/tags | 2 +- 14-3.3/alpine3.21/Dockerfile | 4 +- 14-3.4/alpine3.20/Dockerfile | 4 +- 14-3.4/alpine3.21/Dockerfile | 4 +- 14-3.5/alpine3.20/Dockerfile | 8 +- 14-3.5/alpine3.20/tags | 2 +- 14-3.5/alpine3.21/Dockerfile | 8 +- 14-3.5/alpine3.21/tags | 2 +- 14-3.5/bookworm/Dockerfile | 8 +- 14-3.5/bookworm/tags | 2 +- 14-3.5/bullseye/Dockerfile | 8 +- 14-3.5/bullseye/tags | 2 +- 14-l3.1.9gcp/bookworm/Dockerfile | 4 +- 15-3.3/alpine3.21/Dockerfile | 4 +- 15-3.4/alpine3.20/Dockerfile | 4 +- 15-3.4/alpine3.21/Dockerfile | 4 +- 15-3.5/alpine3.20/Dockerfile | 8 +- 15-3.5/alpine3.20/tags | 2 +- 15-3.5/alpine3.21/Dockerfile | 8 +- 15-3.5/alpine3.21/tags | 2 +- 15-3.5/bookworm/Dockerfile | 8 +- 15-3.5/bookworm/tags | 2 +- 15-3.5/bullseye/Dockerfile | 8 +- 15-3.5/bullseye/tags | 2 +- 16-3.3/alpine3.21/Dockerfile | 4 +- 16-3.4/alpine3.20/Dockerfile | 4 +- 16-3.4/alpine3.21/Dockerfile | 4 +- 16-3.5-bundle0/bookworm/Dockerfile | 12 +- 16-3.5-bundle0/bookworm/tags | 2 +- 16-3.5/alpine3.20/Dockerfile | 8 +- 16-3.5/alpine3.20/tags | 2 +- 16-3.5/alpine3.21/Dockerfile | 8 +- 16-3.5/alpine3.21/tags | 2 +- 16-3.5/bookworm/Dockerfile | 8 +- 16-3.5/bookworm/tags | 2 +- 16-3.5/bullseye/Dockerfile | 8 +- 16-3.5/bullseye/tags | 2 +- 16-master/bookworm/Dockerfile | 4 +- 16-recent/bookworm/Dockerfile | 12 +- 16-recent/bookworm/tags | 2 +- 17-3.4/alpine3.21/Dockerfile | 4 +- 17-3.5/alpine3.20/Dockerfile | 8 +- 17-3.5/alpine3.20/tags | 2 +- 17-3.5/alpine3.21/Dockerfile | 8 +- 17-3.5/alpine3.21/tags | 2 +- 17-3.5/bookworm/Dockerfile | 8 +- 17-3.5/bookworm/tags | 2 +- 17-3.5/bullseye/Dockerfile | 8 +- 17-3.5/bullseye/tags | 2 +- 17-master/bookworm/Dockerfile | 4 +- 17-recent/bookworm/Dockerfile | 12 +- 17-recent/bookworm/tags | 2 +- README.md | 56 ++--- .../Dockerfile.alpine.template | 0 .../Dockerfile.bundle0.template | 0 .../Dockerfile.debian.template | 0 .../Dockerfile.master.template | 0 .../initdb-bundle0.sh | 0 .../initdb-postgis.sh | 0 .../update-postgis.sh | 0 _migrate.sh => tools/_migrate.sh | 0 apply-ci.sh => tools/apply-ci.sh | 0 apply-manifest.sh => tools/apply-manifest.sh | 15 +- apply-readme.sh => tools/apply-readme.sh | 0 .../apply-templates.sh | 11 +- localtest.sh => tools/localtest.sh | 1 + manifest.sh => tools/manifest.sh | 165 ++++++++------- versions.sh => tools/versions.sh | 5 +- update.sh | 11 +- versions.json | 200 +++++++++--------- 92 files changed, 414 insertions(+), 410 deletions(-) rename Dockerfile.alpine.template => templates/Dockerfile.alpine.template (100%) rename Dockerfile.bundle0.template => templates/Dockerfile.bundle0.template (100%) rename Dockerfile.debian.template => templates/Dockerfile.debian.template (100%) rename Dockerfile.master.template => templates/Dockerfile.master.template (100%) rename initdb-bundle0.sh => templates/initdb-bundle0.sh (100%) rename initdb-postgis.sh => templates/initdb-postgis.sh (100%) rename update-postgis.sh => templates/update-postgis.sh (100%) rename _migrate.sh => tools/_migrate.sh (100%) rename apply-ci.sh => tools/apply-ci.sh (100%) rename apply-manifest.sh => tools/apply-manifest.sh (88%) rename apply-readme.sh => tools/apply-readme.sh (100%) rename apply-templates.sh => tools/apply-templates.sh (85%) rename localtest.sh => tools/localtest.sh (98%) rename manifest.sh => tools/manifest.sh (84%) rename versions.sh => tools/versions.sh (99%) diff --git a/.github/workflows/localtest.yml b/.github/workflows/localtest.yml index eb6dcd4b5..add6075c9 100644 --- a/.github/workflows/localtest.yml +++ b/.github/workflows/localtest.yml @@ -17,5 +17,5 @@ jobs: - run: pip3 install --upgrade lastversion check-jsonschema - run: tools/install_manifest-tool.sh - run: tools/environment_init.sh - - run: ./localtest.sh + - run: tools/localtest.sh - run: docker images diff --git a/12-3.3/alpine3.21/Dockerfile b/12-3.3/alpine3.21/Dockerfile index 0499b7ab5..849f6203a 100644 --- a/12-3.3/alpine3.21/Dockerfile +++ b/12-3.3/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile index 15d389505..b6c4801d5 100644 --- a/12-3.4/alpine3.20/Dockerfile +++ b/12-3.4/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/12-3.4/alpine3.21/Dockerfile b/12-3.4/alpine3.21/Dockerfile index 59f5b16ef..4ba566427 100644 --- a/12-3.4/alpine3.21/Dockerfile +++ b/12-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index 3225ae1e2..2dccb79bd 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags index 1ebb5a62d..2e2a99fa3 100644 --- a/12-3.5/alpine3.20/tags +++ b/12-3.5/alpine3.20/tags @@ -1 +1 @@ -12-3.5-alpine3.20 12-3.5.1-alpine3.20 +12-3.5-alpine3.20 12-3.5.2-alpine3.20 diff --git a/12-3.5/alpine3.21/Dockerfile b/12-3.5/alpine3.21/Dockerfile index dd152e67d..4be7efd25 100644 --- a/12-3.5/alpine3.21/Dockerfile +++ b/12-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/12-3.5/alpine3.21/tags b/12-3.5/alpine3.21/tags index cfb90292c..7649a7687 100644 --- a/12-3.5/alpine3.21/tags +++ b/12-3.5/alpine3.21/tags @@ -1 +1 @@ -12-3.5-alpine3.21 12-3.5.1-alpine3.21 12-3.5-alpine +12-3.5-alpine3.21 12-3.5.2-alpine3.21 12-3.5-alpine diff --git a/12-3.5/bookworm/Dockerfile b/12-3.5/bookworm/Dockerfile index 8788d94ab..626ac8269 100644 --- a/12-3.5/bookworm/Dockerfile +++ b/12-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:12-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.5/bookworm/tags b/12-3.5/bookworm/tags index 69c6e42f4..4780a2300 100644 --- a/12-3.5/bookworm/tags +++ b/12-3.5/bookworm/tags @@ -1 +1 @@ -12-3.5-bookworm 12-3.5.1-bookworm 12-3.5 +12-3.5-bookworm 12-3.5.2-bookworm 12-3.5 diff --git a/12-3.5/bullseye/Dockerfile b/12-3.5/bullseye/Dockerfile index f8499e238..6dec0bd93 100644 --- a/12-3.5/bullseye/Dockerfile +++ b/12-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:12-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/12-3.5/bullseye/tags b/12-3.5/bullseye/tags index bdc43016c..8dbaadade 100644 --- a/12-3.5/bullseye/tags +++ b/12-3.5/bullseye/tags @@ -1 +1 @@ -12-3.5-bullseye 12-3.5.1-bullseye +12-3.5-bullseye 12-3.5.2-bullseye diff --git a/13-3.3/alpine3.21/Dockerfile b/13-3.3/alpine3.21/Dockerfile index d91c64aef..7c54f9670 100644 --- a/13-3.3/alpine3.21/Dockerfile +++ b/13-3.3/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile index 73f33fb5d..bde1f3530 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/13-3.4/alpine3.21/Dockerfile b/13-3.4/alpine3.21/Dockerfile index df650a377..26afb952c 100644 --- a/13-3.4/alpine3.21/Dockerfile +++ b/13-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index bb63d8abb..4d6419b33 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index 16bd54762..43cc89b58 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5-alpine3.20 13-3.5.1-alpine3.20 +13-3.5-alpine3.20 13-3.5.2-alpine3.20 diff --git a/13-3.5/alpine3.21/Dockerfile b/13-3.5/alpine3.21/Dockerfile index 852131449..3c5ead4c2 100644 --- a/13-3.5/alpine3.21/Dockerfile +++ b/13-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.21/tags b/13-3.5/alpine3.21/tags index 0fd6c74b8..ae06b8c0b 100644 --- a/13-3.5/alpine3.21/tags +++ b/13-3.5/alpine3.21/tags @@ -1 +1 @@ -13-3.5-alpine3.21 13-3.5.1-alpine3.21 13-3.5-alpine +13-3.5-alpine3.21 13-3.5.2-alpine3.21 13-3.5-alpine diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile index 2af2aa46c..88e60ffdd 100644 --- a/13-3.5/bookworm/Dockerfile +++ b/13-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.5/bookworm/tags b/13-3.5/bookworm/tags index 71b145fa6..1f9c861af 100644 --- a/13-3.5/bookworm/tags +++ b/13-3.5/bookworm/tags @@ -1 +1 @@ -13-3.5-bookworm 13-3.5.1-bookworm 13-3.5 +13-3.5-bookworm 13-3.5.2-bookworm 13-3.5 diff --git a/13-3.5/bullseye/Dockerfile b/13-3.5/bullseye/Dockerfile index cf4010cd7..185859ce1 100644 --- a/13-3.5/bullseye/Dockerfile +++ b/13-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:13-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.5/bullseye/tags b/13-3.5/bullseye/tags index 19cb96033..e73b91587 100644 --- a/13-3.5/bullseye/tags +++ b/13-3.5/bullseye/tags @@ -1 +1 @@ -13-3.5-bullseye 13-3.5.1-bullseye +13-3.5-bullseye 13-3.5.2-bullseye diff --git a/14-3.3/alpine3.21/Dockerfile b/14-3.3/alpine3.21/Dockerfile index face26a3b..6b79d55d2 100644 --- a/14-3.3/alpine3.21/Dockerfile +++ b/14-3.3/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile index 4bb0daa6f..6a25334ab 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/14-3.4/alpine3.21/Dockerfile b/14-3.4/alpine3.21/Dockerfile index c3b2a74dc..569e89e46 100644 --- a/14-3.4/alpine3.21/Dockerfile +++ b/14-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index 3d9846410..8889df587 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index 2da8f9b08..9474156cb 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5-alpine3.20 14-3.5.1-alpine3.20 +14-3.5-alpine3.20 14-3.5.2-alpine3.20 diff --git a/14-3.5/alpine3.21/Dockerfile b/14-3.5/alpine3.21/Dockerfile index b2f36d1c3..acca86f48 100644 --- a/14-3.5/alpine3.21/Dockerfile +++ b/14-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.21/tags b/14-3.5/alpine3.21/tags index f68cec1ff..f111208a6 100644 --- a/14-3.5/alpine3.21/tags +++ b/14-3.5/alpine3.21/tags @@ -1 +1 @@ -14-3.5-alpine3.21 14-3.5.1-alpine3.21 14-3.5-alpine +14-3.5-alpine3.21 14-3.5.2-alpine3.21 14-3.5-alpine diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile index e17be52c4..978d21cc2 100644 --- a/14-3.5/bookworm/Dockerfile +++ b/14-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.5/bookworm/tags b/14-3.5/bookworm/tags index abf9f2e48..ee029247f 100644 --- a/14-3.5/bookworm/tags +++ b/14-3.5/bookworm/tags @@ -1 +1 @@ -14-3.5-bookworm 14-3.5.1-bookworm 14-3.5 +14-3.5-bookworm 14-3.5.2-bookworm 14-3.5 diff --git a/14-3.5/bullseye/Dockerfile b/14-3.5/bullseye/Dockerfile index 753171c82..c6675c09c 100644 --- a/14-3.5/bullseye/Dockerfile +++ b/14-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.5/bullseye/tags b/14-3.5/bullseye/tags index 155de3c0d..ef08ff440 100644 --- a/14-3.5/bullseye/tags +++ b/14-3.5/bullseye/tags @@ -1 +1 @@ -14-3.5-bullseye 14-3.5.1-bullseye +14-3.5-bullseye 14-3.5.2-bullseye diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 46b4663a7..1087526bd 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" # PLEASE DO NOT EDIT IT DIRECTLY. # # "Experimental"; solely for testing purposes. Anticipate frequent changes! diff --git a/15-3.3/alpine3.21/Dockerfile b/15-3.3/alpine3.21/Dockerfile index 33e21c473..cd64311c1 100644 --- a/15-3.3/alpine3.21/Dockerfile +++ b/15-3.3/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile index acf8d09ef..a624e43b0 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/15-3.4/alpine3.21/Dockerfile b/15-3.4/alpine3.21/Dockerfile index 259ee0d1d..28758e2cb 100644 --- a/15-3.4/alpine3.21/Dockerfile +++ b/15-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index e07909e99..c559bd71d 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index b6a27a735..ebe1d03d4 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5-alpine3.20 15-3.5.1-alpine3.20 +15-3.5-alpine3.20 15-3.5.2-alpine3.20 diff --git a/15-3.5/alpine3.21/Dockerfile b/15-3.5/alpine3.21/Dockerfile index 283fc2ca9..ffafea75e 100644 --- a/15-3.5/alpine3.21/Dockerfile +++ b/15-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.21/tags b/15-3.5/alpine3.21/tags index 8e6048ed8..cac8e7851 100644 --- a/15-3.5/alpine3.21/tags +++ b/15-3.5/alpine3.21/tags @@ -1 +1 @@ -15-3.5-alpine3.21 15-3.5.1-alpine3.21 15-3.5-alpine +15-3.5-alpine3.21 15-3.5.2-alpine3.21 15-3.5-alpine diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile index aaf727d16..2d6d790f1 100644 --- a/15-3.5/bookworm/Dockerfile +++ b/15-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.5/bookworm/tags b/15-3.5/bookworm/tags index 00dda9475..2d36ea95f 100644 --- a/15-3.5/bookworm/tags +++ b/15-3.5/bookworm/tags @@ -1 +1 @@ -15-3.5-bookworm 15-3.5.1-bookworm 15-3.5 +15-3.5-bookworm 15-3.5.2-bookworm 15-3.5 diff --git a/15-3.5/bullseye/Dockerfile b/15-3.5/bullseye/Dockerfile index 2f62defdd..ec9d57478 100644 --- a/15-3.5/bullseye/Dockerfile +++ b/15-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:15-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.5/bullseye/tags b/15-3.5/bullseye/tags index 816a4af0c..e52a90c4f 100644 --- a/15-3.5/bullseye/tags +++ b/15-3.5/bullseye/tags @@ -1 +1 @@ -15-3.5-bullseye 15-3.5.1-bullseye +15-3.5-bullseye 15-3.5.2-bullseye diff --git a/16-3.3/alpine3.21/Dockerfile b/16-3.3/alpine3.21/Dockerfile index 8ee69639e..886eeb4b5 100644 --- a/16-3.3/alpine3.21/Dockerfile +++ b/16-3.3/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile index da2cc7d77..6df0c52d6 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/16-3.4/alpine3.21/Dockerfile b/16-3.4/alpine3.21/Dockerfile index 8e960c52a..fcc8c09c4 100644 --- a/16-3.4/alpine3.21/Dockerfile +++ b/16-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index ebc1ac4fe..f94ba8f2f 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.bundle0.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.bundle0.template" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -23,8 +23,8 @@ ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.2.0 ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=60048b5b4b7ce2f7560c024d1af024db73b3bd5b ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.1 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd +ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.3 +ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=865e72b328050bc8d1bf8bd2f982edb7a4eb4e26 ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b359d26de186ea43f93c28c08cd1b8c6449c91bd +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=91700b509acb0a4511b5028b902d4b3ed0d04447 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-3.5-bundle0/bookworm/tags b/16-3.5-bundle0/bookworm/tags index 5f07c3e57..7777eca5c 100644 --- a/16-3.5-bundle0/bookworm/tags +++ b/16-3.5-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.5-bundle0-bookworm 16-3.5.1-bundle0-bookworm 16-3.5-bundle0 +16-3.5-bundle0-bookworm 16-3.5.2-bundle0-bookworm 16-3.5-bundle0 diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 21e3f9b5f..84d45b0de 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index a8f1b9f9a..cf3600865 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5-alpine3.20 16-3.5.1-alpine3.20 +16-3.5-alpine3.20 16-3.5.2-alpine3.20 diff --git a/16-3.5/alpine3.21/Dockerfile b/16-3.5/alpine3.21/Dockerfile index 13f6a0cc9..2263e11ea 100644 --- a/16-3.5/alpine3.21/Dockerfile +++ b/16-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.21/tags b/16-3.5/alpine3.21/tags index 6f7abd265..02088ad3f 100644 --- a/16-3.5/alpine3.21/tags +++ b/16-3.5/alpine3.21/tags @@ -1 +1 @@ -16-3.5-alpine3.21 16-3.5.1-alpine3.21 16-3.5-alpine +16-3.5-alpine3.21 16-3.5.2-alpine3.21 16-3.5-alpine diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile index a5d1e2e9f..943d6cf4f 100644 --- a/16-3.5/bookworm/Dockerfile +++ b/16-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.5/bookworm/tags b/16-3.5/bookworm/tags index 60de13892..9d0e1f155 100644 --- a/16-3.5/bookworm/tags +++ b/16-3.5/bookworm/tags @@ -1 +1 @@ -16-3.5-bookworm 16-3.5.1-bookworm 16-3.5 +16-3.5-bookworm 16-3.5.2-bookworm 16-3.5 diff --git a/16-3.5/bullseye/Dockerfile b/16-3.5/bullseye/Dockerfile index a0d149adb..04e085602 100644 --- a/16-3.5/bullseye/Dockerfile +++ b/16-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:16-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.5/bullseye/tags b/16-3.5/bullseye/tags index 2a8e87723..5a0e9d77e 100644 --- a/16-3.5/bullseye/tags +++ b/16-3.5/bullseye/tags @@ -1 +1 @@ -16-3.5-bullseye 16-3.5.1-bullseye +16-3.5-bullseye 16-3.5.2-bullseye diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 57973a8b1..36f6f8556 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" # PLEASE DO NOT EDIT IT DIRECTLY. # # "Experimental"; solely for testing purposes. Anticipate frequent changes! diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 35c2aa013..551edbe79 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" # PLEASE DO NOT EDIT IT DIRECTLY. # # "Experimental"; solely for testing purposes. Anticipate frequent changes! @@ -16,18 +16,18 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 +ARG PGIS1_GDAL_CHECKOUT_SHA1=9b7a7c8ffa7b7aff696974c432d4254a809b3efe ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index d648c80d1..06064e1ef 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-3.4/alpine3.21/Dockerfile b/17-3.4/alpine3.21/Dockerfile index 3a26e42db..91450f7a7 100644 --- a/17-3.4/alpine3.21/Dockerfile +++ b/17-3.4/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # diff --git a/17-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.20/Dockerfile index 36798eb4f..f40e1e5ee 100644 --- a/17-3.5/alpine3.20/Dockerfile +++ b/17-3.5/alpine3.20/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags index 94a85c1b3..9b7ce9830 100644 --- a/17-3.5/alpine3.20/tags +++ b/17-3.5/alpine3.20/tags @@ -1 +1 @@ -17-3.5-alpine3.20 17-3.5.1-alpine3.20 +17-3.5-alpine3.20 17-3.5.2-alpine3.20 diff --git a/17-3.5/alpine3.21/Dockerfile b/17-3.5/alpine3.21/Dockerfile index fe07105d4..f9f4d53dd 100644 --- a/17-3.5/alpine3.21/Dockerfile +++ b/17-3.5/alpine3.21/Dockerfile @@ -1,13 +1,13 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.alpine.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" # PLEASE DO NOT EDIT IT DIRECTLY. # ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.21/tags b/17-3.5/alpine3.21/tags index 41449ea03..e1f18e536 100644 --- a/17-3.5/alpine3.21/tags +++ b/17-3.5/alpine3.21/tags @@ -1 +1 @@ -17-3.5-alpine3.21 17-3.5.1-alpine3.21 17-3.5-alpine alpine +17-3.5-alpine3.21 17-3.5.2-alpine3.21 17-3.5-alpine alpine diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile index 60888decd..967ab9986 100644 --- a/17-3.5/bookworm/Dockerfile +++ b/17-3.5/bookworm/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:17-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/17-3.5/bookworm/tags b/17-3.5/bookworm/tags index 02191624a..0df0683d6 100644 --- a/17-3.5/bookworm/tags +++ b/17-3.5/bookworm/tags @@ -1 +1 @@ -17-3.5-bookworm 17-3.5.1-bookworm 17-3.5 latest +17-3.5-bookworm 17-3.5.2-bookworm 17-3.5 latest diff --git a/17-3.5/bullseye/Dockerfile b/17-3.5/bullseye/Dockerfile index be6095563..5491f2321 100644 --- a/17-3.5/bullseye/Dockerfile +++ b/17-3.5/bullseye/Dockerfile @@ -1,16 +1,16 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.debian.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # FROM postgres:17-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ + org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.1+dfsg-1.pgdg110+1 +ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 RUN set -eux \ && apt-get update \ diff --git a/17-3.5/bullseye/tags b/17-3.5/bullseye/tags index 10a092f3d..2e5ab6fb3 100644 --- a/17-3.5/bullseye/tags +++ b/17-3.5/bullseye/tags @@ -1 +1 @@ -17-3.5-bullseye 17-3.5.1-bullseye +17-3.5-bullseye 17-3.5.2-bullseye diff --git a/17-master/bookworm/Dockerfile b/17-master/bookworm/Dockerfile index 030daa588..4a35dc692 100644 --- a/17-master/bookworm/Dockerfile +++ b/17-master/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" # PLEASE DO NOT EDIT IT DIRECTLY. # # "Experimental"; solely for testing purposes. Anticipate frequent changes! diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index d7c15bc61..4dee00a6f 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -1,6 +1,6 @@ # -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# source: "Dockerfile.master.template" +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" # PLEASE DO NOT EDIT IT DIRECTLY. # # "Experimental"; solely for testing purposes. Anticipate frequent changes! @@ -16,18 +16,18 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.1 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.0 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.1 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=48ab069ef1482412fda915105b546f9866c76a79 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=35a44cc570cdf4dbd55611e4bd61da76e56bc221 +ARG PGIS1_GDAL_CHECKOUT_SHA1=9b7a7c8ffa7b7aff696974c432d4254a809b3efe ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 8c5d60a7a..2586d742f 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 10053e496..ae3b2d8ac 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-01-04) +## Versions (2025-01-31) We provide multi-platform image support for the following architectures: @@ -71,12 +71,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.1 | -| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.1 | -| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.1 | -| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.1 | -| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 | -| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.1 | +| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.2 | +| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.2 | +| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.2 | +| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.2 | +| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.2 | +| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.2 | ### 📘Debian - bullseye @@ -88,12 +88,12 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.1 | -| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.1 | -| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.1 | -| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.1 | -| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.1 | -| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.1 | +| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.2 | +| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.2 | +| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.2 | +| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.2 | +| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.2 | +| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.2 | @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.1, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.1, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) @@ -120,7 +120,7 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 | +| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.2 | @@ -135,21 +135,21 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.21), [`12-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.21), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.3.8 | | [`12-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.21), [`12-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.21), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.4.4 | -| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.1 | +| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.2 | | [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | | [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | -| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.1 | +| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.2 | | [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 | | [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 | -| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.1 | +| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.2 | | [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 | | [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 | -| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.1 | +| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.2 | | [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 | | [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 | -| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.1 | +| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.2 | | [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 | -| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.1 | +| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.2 | ### ⛰️Alpine 3.20 based @@ -162,16 +162,16 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 | -| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 | +| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.2 | | [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | -| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 | +| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.2 | | [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | -| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 | +| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.2 | | [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | -| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 | +| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.2 | | [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | -| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 | +| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.2 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.2 | diff --git a/Dockerfile.alpine.template b/templates/Dockerfile.alpine.template similarity index 100% rename from Dockerfile.alpine.template rename to templates/Dockerfile.alpine.template diff --git a/Dockerfile.bundle0.template b/templates/Dockerfile.bundle0.template similarity index 100% rename from Dockerfile.bundle0.template rename to templates/Dockerfile.bundle0.template diff --git a/Dockerfile.debian.template b/templates/Dockerfile.debian.template similarity index 100% rename from Dockerfile.debian.template rename to templates/Dockerfile.debian.template diff --git a/Dockerfile.master.template b/templates/Dockerfile.master.template similarity index 100% rename from Dockerfile.master.template rename to templates/Dockerfile.master.template diff --git a/initdb-bundle0.sh b/templates/initdb-bundle0.sh similarity index 100% rename from initdb-bundle0.sh rename to templates/initdb-bundle0.sh diff --git a/initdb-postgis.sh b/templates/initdb-postgis.sh similarity index 100% rename from initdb-postgis.sh rename to templates/initdb-postgis.sh diff --git a/update-postgis.sh b/templates/update-postgis.sh similarity index 100% rename from update-postgis.sh rename to templates/update-postgis.sh diff --git a/_migrate.sh b/tools/_migrate.sh similarity index 100% rename from _migrate.sh rename to tools/_migrate.sh diff --git a/apply-ci.sh b/tools/apply-ci.sh similarity index 100% rename from apply-ci.sh rename to tools/apply-ci.sh diff --git a/apply-manifest.sh b/tools/apply-manifest.sh similarity index 88% rename from apply-manifest.sh rename to tools/apply-manifest.sh index f2dda9475..fea0181b3 100755 --- a/apply-manifest.sh +++ b/tools/apply-manifest.sh @@ -5,20 +5,21 @@ source tools/environment_init.sh [ -f ./versions.json ] input_file="versions.json" -rm -f manifest.sh +rm -f ./tools/manifest.sh -cat <<'EOF' >manifest.sh +cat <<'EOF' > ./tools/manifest.sh #!/usr/bin/env bash set -Eeuo pipefail # Source environment variables and necessary configurations source tools/environment_init.sh +[ -f ./versions.json ] # # Updating the docker manifest for the postgis image. # This script uses the version.json metadata file as input to create the updated manifest. # manifest-tool doc : https://github.com/estesp/manifest-tool # -# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh" +# NOTE: THIS FILE IS GENERATED VIA "./tools/apply-manifest.sh" # PLEASE DO NOT EDIT IT DIRECTLY. # EOF @@ -74,11 +75,11 @@ for version in $versions; do echo "" echo "# ----- ${version}-${variant} -----" create_manifest "$tags" "$arch" - ) >>manifest.sh + ) >> ./tools/manifest.sh done done -echo "Done! a new ./manifest.sh has been created!" -chmod +x ./manifest.sh -head -n 50 <./manifest.sh +echo "Done! a new ./tools/manifest.sh has been created!" +chmod +x ./tools/manifest.sh +head -n 50 <./tools/manifest.sh diff --git a/apply-readme.sh b/tools/apply-readme.sh similarity index 100% rename from apply-readme.sh rename to tools/apply-readme.sh diff --git a/apply-templates.sh b/tools/apply-templates.sh similarity index 85% rename from apply-templates.sh rename to tools/apply-templates.sh index 857346b77..f8dbcfed9 100755 --- a/apply-templates.sh +++ b/tools/apply-templates.sh @@ -11,7 +11,6 @@ source tools/environment_init.sh # Check dependencies [ -f ./versions.json ] -cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" jqt='.jq-template.awk' if [ -n "${BASHBREW_SCRIPTS:-}" ]; then jqt="$BASHBREW_SCRIPTS/jq-template.awk" @@ -37,7 +36,7 @@ echo "versions = $versions" generated_warning() { cat <<-EOH # - # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" + # NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" # source: "$1" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -57,10 +56,10 @@ for version; do dir="$version/$variant" echo "processing $dir ..." - template="$(jq -r '.[env.version][env.variant].template' versions.json)" + template=./templates/"$(jq -r '.[env.version][env.variant].template' versions.json)" echo " template=$template" - initfile="$(jq -r '.[env.version][env.variant].initfile' versions.json)" + initfile=./templates/"$(jq -r '.[env.version][env.variant].initfile' versions.json)" echo " initfile=$initfile" tags="$(jq -r '.[env.version][env.variant].tags' versions.json)" @@ -68,7 +67,7 @@ for version; do cp -a "$initfile" "$dir/" if [ -z "$bundleType" ]; then - cp -a update-postgis.sh "$dir/" + cp -a ./templates/update-postgis.sh "$dir/" fi echo "$tags" >"$dir/tags" @@ -82,5 +81,5 @@ for version; do done echo " " -echo " apply-template : done" +echo " ./tools/apply-template : done" echo " " diff --git a/localtest.sh b/tools/localtest.sh similarity index 98% rename from localtest.sh rename to tools/localtest.sh index f478cff5e..d3beae313 100755 --- a/localtest.sh +++ b/tools/localtest.sh @@ -5,6 +5,7 @@ set -Eeuo pipefail export TEST=true # Source environment variables and necessary configurations source tools/environment_init.sh +[ -f ./versions.json ] # Check if the container with name "registry" is already running # https://docs.docker.com/registry/deploying/ diff --git a/manifest.sh b/tools/manifest.sh similarity index 84% rename from manifest.sh rename to tools/manifest.sh index f27c990a4..c318473d8 100755 --- a/manifest.sh +++ b/tools/manifest.sh @@ -2,13 +2,14 @@ set -Eeuo pipefail # Source environment variables and necessary configurations source tools/environment_init.sh +[ -f ./versions.json ] # # Updating the docker manifest for the postgis image. # This script uses the version.json metadata file as input to create the updated manifest. # manifest-tool doc : https://github.com/estesp/manifest-tool # -# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh" +# NOTE: THIS FILE IS GENERATED VIA "./tools/apply-manifest.sh" # PLEASE DO NOT EDIT IT DIRECTLY. # @@ -74,11 +75,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.20 \ --target ${dockername}:12-3.5-alpine3.20 || true -echo "manifest: ${dockername}:12-3.5.1-alpine3.20" +echo "manifest: ${dockername}:12-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.20 \ - --target ${dockername}:12-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:12-3.5.2-alpine3.20 \ + --target ${dockername}:12-3.5.2-alpine3.20 || true # ----- 12-3.5-alpine3.21 ----- @@ -88,11 +89,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.21 \ --target ${dockername}:12-3.5-alpine3.21 || true -echo "manifest: ${dockername}:12-3.5.1-alpine3.21" +echo "manifest: ${dockername}:12-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.1-alpine3.21 \ - --target ${dockername}:12-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:12-3.5.2-alpine3.21 \ + --target ${dockername}:12-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:12-3.5-alpine" manifest-tool push from-args \ @@ -108,11 +109,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-bookworm \ --target ${dockername}:12-3.5-bookworm || true -echo "manifest: ${dockername}:12-3.5.1-bookworm" +echo "manifest: ${dockername}:12-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.1-bookworm \ - --target ${dockername}:12-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:12-3.5.2-bookworm \ + --target ${dockername}:12-3.5.2-bookworm || true echo "manifest: ${dockername}:12-3.5" manifest-tool push from-args \ @@ -128,11 +129,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:12-3.5-bullseye \ --target ${dockername}:12-3.5-bullseye || true -echo "manifest: ${dockername}:12-3.5.1-bullseye" +echo "manifest: ${dockername}:12-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.1-bullseye \ - --target ${dockername}:12-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:12-3.5.2-bullseye \ + --target ${dockername}:12-3.5.2-bullseye || true # ----- 13-3.3-alpine3.21 ----- @@ -196,11 +197,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.20 \ --target ${dockername}:13-3.5-alpine3.20 || true -echo "manifest: ${dockername}:13-3.5.1-alpine3.20" +echo "manifest: ${dockername}:13-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.20 \ - --target ${dockername}:13-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.5.2-alpine3.20 \ + --target ${dockername}:13-3.5.2-alpine3.20 || true # ----- 13-3.5-alpine3.21 ----- @@ -210,11 +211,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.21 \ --target ${dockername}:13-3.5-alpine3.21 || true -echo "manifest: ${dockername}:13-3.5.1-alpine3.21" +echo "manifest: ${dockername}:13-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.1-alpine3.21 \ - --target ${dockername}:13-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:13-3.5.2-alpine3.21 \ + --target ${dockername}:13-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:13-3.5-alpine" manifest-tool push from-args \ @@ -230,11 +231,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-bookworm \ --target ${dockername}:13-3.5-bookworm || true -echo "manifest: ${dockername}:13-3.5.1-bookworm" +echo "manifest: ${dockername}:13-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.1-bookworm \ - --target ${dockername}:13-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.5.2-bookworm \ + --target ${dockername}:13-3.5.2-bookworm || true echo "manifest: ${dockername}:13-3.5" manifest-tool push from-args \ @@ -250,11 +251,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-bullseye \ --target ${dockername}:13-3.5-bullseye || true -echo "manifest: ${dockername}:13-3.5.1-bullseye" +echo "manifest: ${dockername}:13-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.1-bullseye \ - --target ${dockername}:13-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:13-3.5.2-bullseye \ + --target ${dockername}:13-3.5.2-bullseye || true # ----- 14-3.3-alpine3.21 ----- @@ -318,11 +319,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.20 \ --target ${dockername}:14-3.5-alpine3.20 || true -echo "manifest: ${dockername}:14-3.5.1-alpine3.20" +echo "manifest: ${dockername}:14-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.20 \ - --target ${dockername}:14-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.5.2-alpine3.20 \ + --target ${dockername}:14-3.5.2-alpine3.20 || true # ----- 14-3.5-alpine3.21 ----- @@ -332,11 +333,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.21 \ --target ${dockername}:14-3.5-alpine3.21 || true -echo "manifest: ${dockername}:14-3.5.1-alpine3.21" +echo "manifest: ${dockername}:14-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.1-alpine3.21 \ - --target ${dockername}:14-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:14-3.5.2-alpine3.21 \ + --target ${dockername}:14-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ @@ -352,11 +353,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-bookworm \ --target ${dockername}:14-3.5-bookworm || true -echo "manifest: ${dockername}:14-3.5.1-bookworm" +echo "manifest: ${dockername}:14-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.1-bookworm \ - --target ${dockername}:14-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.5.2-bookworm \ + --target ${dockername}:14-3.5.2-bookworm || true echo "manifest: ${dockername}:14-3.5" manifest-tool push from-args \ @@ -372,11 +373,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-bullseye \ --target ${dockername}:14-3.5-bullseye || true -echo "manifest: ${dockername}:14-3.5.1-bullseye" +echo "manifest: ${dockername}:14-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.1-bullseye \ - --target ${dockername}:14-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:14-3.5.2-bullseye \ + --target ${dockername}:14-3.5.2-bullseye || true # ----- 14-l3.1.9gcp-bookworm ----- @@ -454,11 +455,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.20 \ --target ${dockername}:15-3.5-alpine3.20 || true -echo "manifest: ${dockername}:15-3.5.1-alpine3.20" +echo "manifest: ${dockername}:15-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.20 \ - --target ${dockername}:15-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.5.2-alpine3.20 \ + --target ${dockername}:15-3.5.2-alpine3.20 || true # ----- 15-3.5-alpine3.21 ----- @@ -468,11 +469,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.21 \ --target ${dockername}:15-3.5-alpine3.21 || true -echo "manifest: ${dockername}:15-3.5.1-alpine3.21" +echo "manifest: ${dockername}:15-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.1-alpine3.21 \ - --target ${dockername}:15-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:15-3.5.2-alpine3.21 \ + --target ${dockername}:15-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ @@ -488,11 +489,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-bookworm \ --target ${dockername}:15-3.5-bookworm || true -echo "manifest: ${dockername}:15-3.5.1-bookworm" +echo "manifest: ${dockername}:15-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.1-bookworm \ - --target ${dockername}:15-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.5.2-bookworm \ + --target ${dockername}:15-3.5.2-bookworm || true echo "manifest: ${dockername}:15-3.5" manifest-tool push from-args \ @@ -508,11 +509,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-bullseye \ --target ${dockername}:15-3.5-bullseye || true -echo "manifest: ${dockername}:15-3.5.1-bullseye" +echo "manifest: ${dockername}:15-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.1-bullseye \ - --target ${dockername}:15-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:15-3.5.2-bullseye \ + --target ${dockername}:15-3.5.2-bullseye || true # ----- 16-3.3-alpine3.21 ----- @@ -576,11 +577,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.20 \ --target ${dockername}:16-3.5-alpine3.20 || true -echo "manifest: ${dockername}:16-3.5.1-alpine3.20" +echo "manifest: ${dockername}:16-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.20 \ - --target ${dockername}:16-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.5.2-alpine3.20 \ + --target ${dockername}:16-3.5.2-alpine3.20 || true # ----- 16-3.5-alpine3.21 ----- @@ -590,11 +591,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.21 \ --target ${dockername}:16-3.5-alpine3.21 || true -echo "manifest: ${dockername}:16-3.5.1-alpine3.21" +echo "manifest: ${dockername}:16-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-alpine3.21 \ - --target ${dockername}:16-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:16-3.5.2-alpine3.21 \ + --target ${dockername}:16-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ @@ -610,11 +611,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bookworm \ --target ${dockername}:16-3.5-bookworm || true -echo "manifest: ${dockername}:16-3.5.1-bookworm" +echo "manifest: ${dockername}:16-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-bookworm \ - --target ${dockername}:16-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.2-bookworm \ + --target ${dockername}:16-3.5.2-bookworm || true echo "manifest: ${dockername}:16-3.5" manifest-tool push from-args \ @@ -630,11 +631,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bullseye \ --target ${dockername}:16-3.5-bullseye || true -echo "manifest: ${dockername}:16-3.5.1-bullseye" +echo "manifest: ${dockername}:16-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-bullseye \ - --target ${dockername}:16-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:16-3.5.2-bullseye \ + --target ${dockername}:16-3.5.2-bullseye || true # ----- 16-3.5-bundle0-bookworm ----- @@ -644,11 +645,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bundle0-bookworm \ --target ${dockername}:16-3.5-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.5.1-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.5.2-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.1-bundle0-bookworm \ - --target ${dockername}:16-3.5.1-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.2-bundle0-bookworm \ + --target ${dockername}:16-3.5.2-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.5-bundle0" manifest-tool push from-args \ @@ -678,11 +679,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -724,11 +725,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.20 \ --target ${dockername}:17-3.5-alpine3.20 || true -echo "manifest: ${dockername}:17-3.5.1-alpine3.20" +echo "manifest: ${dockername}:17-3.5.2-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.20 \ - --target ${dockername}:17-3.5.1-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.5.2-alpine3.20 \ + --target ${dockername}:17-3.5.2-alpine3.20 || true # ----- 17-3.5-alpine3.21 ----- @@ -738,11 +739,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.21 \ --target ${dockername}:17-3.5-alpine3.21 || true -echo "manifest: ${dockername}:17-3.5.1-alpine3.21" +echo "manifest: ${dockername}:17-3.5.2-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.1-alpine3.21 \ - --target ${dockername}:17-3.5.1-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:17-3.5.2-alpine3.21 \ + --target ${dockername}:17-3.5.2-alpine3.21 || true echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ @@ -764,11 +765,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-bookworm \ --target ${dockername}:17-3.5-bookworm || true -echo "manifest: ${dockername}:17-3.5.1-bookworm" +echo "manifest: ${dockername}:17-3.5.2-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.1-bookworm \ - --target ${dockername}:17-3.5.1-bookworm || true + --template ${dockername}-ARCHVARIANT:17-3.5.2-bookworm \ + --target ${dockername}:17-3.5.2-bookworm || true echo "manifest: ${dockername}:17-3.5" manifest-tool push from-args \ @@ -790,11 +791,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-bullseye \ --target ${dockername}:17-3.5-bullseye || true -echo "manifest: ${dockername}:17-3.5.1-bullseye" +echo "manifest: ${dockername}:17-3.5.2-bullseye" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.1-bullseye \ - --target ${dockername}:17-3.5.1-bullseye || true + --template ${dockername}-ARCHVARIANT:17-3.5.2-bullseye \ + --target ${dockername}:17-3.5.2-bullseye || true # ----- 17-master-bookworm ----- @@ -818,11 +819,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.sh b/tools/versions.sh similarity index 99% rename from versions.sh rename to tools/versions.sh index 59dae52a6..127d4a4e7 100755 --- a/versions.sh +++ b/tools/versions.sh @@ -4,6 +4,7 @@ set -Eeuo pipefail # Source environment variables and necessary configurations source tools/environment_init.sh +[ -f ./versions.json ] # This code derived from: # - URL: https://github.com/docker-library/postgres/blob/master/versions.sh @@ -377,7 +378,7 @@ for variant in ${postgis_versions}; do echo "postgisSrcSha1[$variant]=${postgisSrcSha1[$variant]}" done -cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +#cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" versions=("$@") if [ ${#versions[@]} -eq 0 ]; then versions=() @@ -410,7 +411,7 @@ for version in "${versions[@]}"; do IFS=- read -r postgresVersion postgisVersion bundleType <<<"$version" echo " " - echo "---- generate Dockerfile for $version ----" + echo "---- generate metadata for $version ----" echo "postgresVersion=$postgresVersion" echo "postgisVersion=$postgisVersion" echo "bundleType=$bundleType" diff --git a/update.sh b/update.sh index f13d70456..38c4a7e06 100755 --- a/update.sh +++ b/update.sh @@ -2,6 +2,7 @@ set -Eeuo pipefail # Source environment variables and necessary configurations source tools/environment_init.sh +[ -f ./versions.json ] # This code derived from: # - URL: https://github.com/docker-library/postgres/blob/master/versions.sh @@ -13,16 +14,16 @@ cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" echo " " # Generate versions.json metadata file -./versions.sh "$@" +./tools/versions.sh "$@" # apply version.json - generate Dockerfiles -./apply-templates.sh "$@" +./tools/apply-templates.sh "$@" # apply version.json - generate .github/workflows/main.yml and .circleci/config.yml -./apply-ci.sh "$@" +./tools/apply-ci.sh "$@" # apply version.json - generate manifest.sh -./apply-manifest.sh "$@" +./tools/apply-manifest.sh "$@" # apply version.json - generate README.md -./apply-readme.sh "$@" +./tools/apply-readme.sh "$@" diff --git a/versions.json b/versions.json index 8aa136fb3..2807749c3 100644 --- a/versions.json +++ b/versions.json @@ -47,7 +47,7 @@ }, "12-3.5": { "bullseye": { - "tags": "12-3.5-bullseye 12-3.5.1-bullseye", + "tags": "12-3.5-bullseye 12-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "12", @@ -56,10 +56,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "12-3.5-bookworm 12-3.5.1-bookworm 12-3.5", + "tags": "12-3.5-bookworm 12-3.5.2-bookworm 12-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "12", @@ -68,10 +68,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "12-3.5-alpine3.20 12-3.5.1-alpine3.20", + "tags": "12-3.5-alpine3.20 12-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -79,13 +79,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "12-3.5-alpine3.21 12-3.5.1-alpine3.21 12-3.5-alpine", + "tags": "12-3.5-alpine3.21 12-3.5.2-alpine3.21 12-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -93,10 +93,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "12", "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "13-3.3": { @@ -147,7 +147,7 @@ }, "13-3.5": { "bullseye": { - "tags": "13-3.5-bullseye 13-3.5.1-bullseye", + "tags": "13-3.5-bullseye 13-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "13", @@ -156,10 +156,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.5-bookworm 13-3.5.1-bookworm 13-3.5", + "tags": "13-3.5-bookworm 13-3.5.2-bookworm 13-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -168,10 +168,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "13-3.5-alpine3.20 13-3.5.1-alpine3.20", + "tags": "13-3.5-alpine3.20 13-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -179,13 +179,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "13-3.5-alpine3.21 13-3.5.1-alpine3.21 13-3.5-alpine", + "tags": "13-3.5-alpine3.21 13-3.5.2-alpine3.21 13-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -193,10 +193,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "14-3.3": { @@ -247,7 +247,7 @@ }, "14-3.5": { "bullseye": { - "tags": "14-3.5-bullseye 14-3.5.1-bullseye", + "tags": "14-3.5-bullseye 14-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "14", @@ -256,10 +256,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.5-bookworm 14-3.5.1-bookworm 14-3.5", + "tags": "14-3.5-bookworm 14-3.5.2-bookworm 14-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -268,10 +268,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "14-3.5-alpine3.20 14-3.5.1-alpine3.20", + "tags": "14-3.5-alpine3.20 14-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -279,13 +279,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "14-3.5-alpine3.21 14-3.5.1-alpine3.21 14-3.5-alpine", + "tags": "14-3.5-alpine3.21 14-3.5.2-alpine3.21 14-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -293,10 +293,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "15-3.3": { @@ -347,7 +347,7 @@ }, "15-3.5": { "bullseye": { - "tags": "15-3.5-bullseye 15-3.5.1-bullseye", + "tags": "15-3.5-bullseye 15-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "15", @@ -356,10 +356,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.5-bookworm 15-3.5.1-bookworm 15-3.5", + "tags": "15-3.5-bookworm 15-3.5.2-bookworm 15-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -368,10 +368,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "15-3.5-alpine3.20 15-3.5.1-alpine3.20", + "tags": "15-3.5-alpine3.20 15-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -379,13 +379,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "15-3.5-alpine3.21 15-3.5.1-alpine3.21 15-3.5-alpine", + "tags": "15-3.5-alpine3.21 15-3.5.2-alpine3.21 15-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -393,10 +393,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "16-3.3": { @@ -447,7 +447,7 @@ }, "16-3.5": { "bullseye": { - "tags": "16-3.5-bullseye 16-3.5.1-bullseye", + "tags": "16-3.5-bullseye 16-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "16", @@ -456,10 +456,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.5-bookworm 16-3.5.1-bookworm 16-3.5", + "tags": "16-3.5-bookworm 16-3.5.2-bookworm 16-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -468,10 +468,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "16-3.5-alpine3.20 16-3.5.1-alpine3.20", + "tags": "16-3.5-alpine3.20 16-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -479,13 +479,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "16-3.5-alpine3.21 16-3.5.1-alpine3.21 16-3.5-alpine", + "tags": "16-3.5-alpine3.21 16-3.5.2-alpine3.21 16-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -493,15 +493,15 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "16-3.5-bundle0": { "bookworm": { - "tags": "16-3.5-bundle0-bookworm 16-3.5.1-bundle0-bookworm 16-3.5-bundle0", + "tags": "16-3.5-bundle0-bookworm 16-3.5.2-bundle0-bookworm 16-3.5-bundle0", "postgis": "3.5", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -511,18 +511,18 @@ "initfile": "initdb-bundle0.sh", "MOBILITYDB_CHECKOUT": "tags/v1.2.0", "MOBILITYDB_CHECKOUT_SHA1": "60048b5b4b7ce2f7560c024d1af024db73b3bd5b", - "PGSQL_HTTP_CHECKOUT": "tags/v1.6.1", - "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.3", + "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.2", - "TIMESCALEDB_CHECKOUT_SHA1": "b359d26de186ea43f93c28c08cd1b8c6449c91bd", + "TIMESCALEDB_CHECKOUT": "tags/2.18.0", + "TIMESCALEDB_CHECKOUT_SHA1": "91700b509acb0a4511b5028b902d4b3ed0d04447", "DUCKDB_CHECKOUT": "tags/v1.1.3", "DUCKDB_CHECKOUT_SHA1": "19864453f7d0ed095256d848b46e7b8630989bac", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" } }, "16-master": { @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -561,13 +561,13 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.0", - "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", + "GDAL_CHECKOUT": "tags/v3.10.1", + "GDAL_CHECKOUT_SHA1": "9b7a7c8ffa7b7aff696974c432d4254a809b3efe", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -595,7 +595,7 @@ }, "17-3.5": { "bullseye": { - "tags": "17-3.5-bullseye 17-3.5.1-bullseye", + "tags": "17-3.5-bullseye 17-3.5.2-bullseye", "postgis": "3.5", "readme_group": "bullseye", "PG_MAJOR": "17", @@ -604,10 +604,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg110+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "17-3.5-bookworm 17-3.5.1-bookworm 17-3.5 latest", + "tags": "17-3.5-bookworm 17-3.5.2-bookworm 17-3.5 latest", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "17", @@ -616,10 +616,10 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.1+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.1-alpine3.20", + "tags": "17-3.5-alpine3.20 17-3.5.2-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -627,13 +627,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" }, "alpine3.21": { - "tags": "17-3.5-alpine3.21 17-3.5.1-alpine3.21 17-3.5-alpine alpine", + "tags": "17-3.5-alpine3.21 17-3.5.2-alpine3.21 17-3.5-alpine alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -641,10 +641,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.1", - "POSTGIS_SHA256": "b46a63a0563a46a670686a56464c1afb5db0b97ee62e87766edd1d2748492b09", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79" + "POSTGIS_VERSION": "3.5.2", + "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" } }, "17-master": { @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -683,13 +683,13 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.1", - "POSTGIS_CHECKOUT_SHA1": "48ab069ef1482412fda915105b546f9866c76a79", + "POSTGIS_CHECKOUT": "tags/3.5.2", + "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.0", - "GDAL_CHECKOUT_SHA1": "35a44cc570cdf4dbd55611e4bd61da76e56bc221", + "GDAL_CHECKOUT": "tags/v3.10.1", + "GDAL_CHECKOUT_SHA1": "9b7a7c8ffa7b7aff696974c432d4254a809b3efe", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", From b62cd803ead8102dabd6fddfd395dd219fb302df Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 22:36:17 +0100 Subject: [PATCH 141/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.2.0=20(#79)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index f94ba8f2f..ad311a935 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.1.3 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index ae3b2d8ac..447246383 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-01-31) +## Versions (2025-02-05) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 2807749c3..a10d99350 100644 --- a/versions.json +++ b/versions.json @@ -517,8 +517,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.18.0", "TIMESCALEDB_CHECKOUT_SHA1": "91700b509acb0a4511b5028b902d4b3ed0d04447", - "DUCKDB_CHECKOUT": "tags/v1.1.3", - "DUCKDB_CHECKOUT_SHA1": "19864453f7d0ed095256d848b46e7b8630989bac", + "DUCKDB_CHECKOUT": "tags/v1.2.0", + "DUCKDB_CHECKOUT_SHA1": "5f5512b827df6397afd31daedb4bbdee76520019", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From cc34779f669a7f3b6ebea8a4a1b82c44fc4570eb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 23:09:36 +0100 Subject: [PATCH 142/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.18.1=20(#80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index ad311a935..adad0593b 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=91700b509acb0a4511b5028b902d4b3ed0d04447 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=0660ebc3fcf4e6859159ba42aeced56333d02021 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 447246383..cf4fa0461 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-02-05) +## Versions (2025-02-10) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index a10d99350..5e7c18d1b 100644 --- a/versions.json +++ b/versions.json @@ -515,8 +515,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.18.0", - "TIMESCALEDB_CHECKOUT_SHA1": "91700b509acb0a4511b5028b902d4b3ed0d04447", + "TIMESCALEDB_CHECKOUT": "tags/2.18.1", + "TIMESCALEDB_CHECKOUT_SHA1": "0660ebc3fcf4e6859159ba42aeced56333d02021", "DUCKDB_CHECKOUT": "tags/v1.2.0", "DUCKDB_CHECKOUT_SHA1": "5f5512b827df6397afd31daedb4bbdee76520019", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 3e534ccd63d61a76328ec72187f34df8a7f07aae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 21:22:00 +0100 Subject: [PATCH 143/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GDAL:?= =?UTF-8?q?v3.10.2=20(#81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 12 ++++++------ versions.json | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 551edbe79..e66dd162b 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=9b7a7c8ffa7b7aff696974c432d4254a809b3efe +ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 06064e1ef..6dad20995 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 4dee00a6f..51915ba91 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab -ARG PGIS1_GDAL_CHECKOUT_SHA1=9b7a7c8ffa7b7aff696974c432d4254a809b3efe +ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 2586d742f..fe9d46441 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index cf4fa0461..1b3d7fc1b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-02-10) +## Versions (2025-02-14) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.1, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.1, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index c318473d8..34c2e7206 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -679,11 +679,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -819,11 +819,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 5e7c18d1b..d8dd98d41 100644 --- a/versions.json +++ b/versions.json @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -566,8 +566,8 @@ "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.1", - "GDAL_CHECKOUT_SHA1": "9b7a7c8ffa7b7aff696974c432d4254a809b3efe", + "GDAL_CHECKOUT": "tags/v3.10.2", + "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.1-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -688,8 +688,8 @@ "PROJ_CHECKOUT": "tags/9.5.1", "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.1", - "GDAL_CHECKOUT_SHA1": "9b7a7c8ffa7b7aff696974c432d4254a809b3efe", + "GDAL_CHECKOUT": "tags/v3.10.2", + "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", "GEOS_CHECKOUT": "tags/3.13.0", "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", From 3d96809886aebe17fc911154f7b0505732fdfce7 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 19 Feb 2025 20:00:18 +0000 Subject: [PATCH 144/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.18.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index adad0593b..e16f3a4a9 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=0660ebc3fcf4e6859159ba42aeced56333d02021 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=bb49cfc6d626782a214b6b6e343a0666d7c40773 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 1b3d7fc1b..41548af31 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-02-14) +## Versions (2025-02-19) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index d8dd98d41..c88ee1278 100644 --- a/versions.json +++ b/versions.json @@ -515,8 +515,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.18.1", - "TIMESCALEDB_CHECKOUT_SHA1": "0660ebc3fcf4e6859159ba42aeced56333d02021", + "TIMESCALEDB_CHECKOUT": "tags/2.18.2", + "TIMESCALEDB_CHECKOUT_SHA1": "bb49cfc6d626782a214b6b6e343a0666d7c40773", "DUCKDB_CHECKOUT": "tags/v1.2.0", "DUCKDB_CHECKOUT_SHA1": "5f5512b827df6397afd31daedb4bbdee76520019", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From f347815b52a47bf46255bd47fb35cfd83183fd04 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 3 Mar 2025 20:00:09 +0000 Subject: [PATCH 145/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GEOS:?= =?UTF-8?q?3.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 12 ++++++------ versions.json | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e66dd162b..44c0ef758 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 -ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab +ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 6dad20995..5e9d2fc0f 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 51915ba91..c30d9e35c 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -17,7 +17,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 @@ -26,7 +26,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 -ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab +ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index fe9d46441..1e3123e8e 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 41548af31..4bf244151 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-02-19) +## Versions (2025-03-03) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index 34c2e7206..43ff5e60a 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -679,11 +679,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -819,11 +819,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index c88ee1278..cb70bf834 100644 --- a/versions.json +++ b/versions.json @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -568,8 +568,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.2", "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", - "GEOS_CHECKOUT": "tags/3.13.0", - "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", + "GEOS_CHECKOUT": "tags/3.13.1", + "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", "CGAL_CHECKOUT": "tags/v6.0.1", @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.0-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -690,8 +690,8 @@ "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.2", "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", - "GEOS_CHECKOUT": "tags/3.13.0", - "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", + "GEOS_CHECKOUT": "tags/3.13.1", + "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", "CGAL_CHECKOUT": "tags/v6.0.1", From 73aef8f51f93a8ec38555f2102ea22b76ebd384b Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 5 Mar 2025 20:00:13 +0000 Subject: [PATCH 146/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index e16f3a4a9..6fd903e62 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 4bf244151..1a6d4cf4f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-03-03) +## Versions (2025-03-05) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index cb70bf834..b3fc6453b 100644 --- a/versions.json +++ b/versions.json @@ -517,8 +517,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.18.2", "TIMESCALEDB_CHECKOUT_SHA1": "bb49cfc6d626782a214b6b6e343a0666d7c40773", - "DUCKDB_CHECKOUT": "tags/v1.2.0", - "DUCKDB_CHECKOUT_SHA1": "5f5512b827df6397afd31daedb4bbdee76520019", + "DUCKDB_CHECKOUT": "tags/v1.2.1", + "DUCKDB_CHECKOUT_SHA1": "8e52ec43959ab363643d63cb78ee214577111da4", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From 7337bd53cdbafc384f89fa475c9863f2de748ad4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 15 Mar 2025 18:21:26 +0100 Subject: [PATCH 147/167] Remove PG12; upgrade to PROJ 9.6.0; etc --- .circleci/config.yml | 7 -- .github/workflows/main.yml | 7 -- 12-3.3/alpine3.21/Dockerfile | 140 -------------------------- 12-3.3/alpine3.21/initdb-postgis.sh | 25 ----- 12-3.3/alpine3.21/tags | 1 - 12-3.3/alpine3.21/update-postgis.sh | 28 ------ 12-3.4/alpine3.20/Dockerfile | 140 -------------------------- 12-3.4/alpine3.20/initdb-postgis.sh | 25 ----- 12-3.4/alpine3.20/tags | 1 - 12-3.4/alpine3.20/update-postgis.sh | 28 ------ 12-3.4/alpine3.21/Dockerfile | 140 -------------------------- 12-3.4/alpine3.21/initdb-postgis.sh | 25 ----- 12-3.4/alpine3.21/tags | 1 - 12-3.4/alpine3.21/update-postgis.sh | 28 ------ 12-3.5/alpine3.20/Dockerfile | 140 -------------------------- 12-3.5/alpine3.20/initdb-postgis.sh | 25 ----- 12-3.5/alpine3.20/tags | 1 - 12-3.5/alpine3.20/update-postgis.sh | 28 ------ 12-3.5/alpine3.21/Dockerfile | 140 -------------------------- 12-3.5/alpine3.21/initdb-postgis.sh | 25 ----- 12-3.5/alpine3.21/tags | 1 - 12-3.5/alpine3.21/update-postgis.sh | 28 ------ 12-3.5/bookworm/Dockerfile | 39 -------- 12-3.5/bookworm/initdb-postgis.sh | 25 ----- 12-3.5/bookworm/tags | 1 - 12-3.5/bookworm/update-postgis.sh | 28 ------ 12-3.5/bullseye/Dockerfile | 39 -------- 12-3.5/bullseye/initdb-postgis.sh | 25 ----- 12-3.5/bullseye/tags | 1 - 12-3.5/bullseye/update-postgis.sh | 28 ------ 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 +- 17-recent/bookworm/tags | 2 +- README.md | 15 +-- tools/install_manifest-tool.sh | 2 +- tools/manifest.sh | 146 +++------------------------- tools/versions.sh | 2 +- versions.json | 112 ++------------------- 39 files changed, 30 insertions(+), 1429 deletions(-) delete mode 100644 12-3.3/alpine3.21/Dockerfile delete mode 100644 12-3.3/alpine3.21/initdb-postgis.sh delete mode 100644 12-3.3/alpine3.21/tags delete mode 100755 12-3.3/alpine3.21/update-postgis.sh delete mode 100644 12-3.4/alpine3.20/Dockerfile delete mode 100644 12-3.4/alpine3.20/initdb-postgis.sh delete mode 100644 12-3.4/alpine3.20/tags delete mode 100755 12-3.4/alpine3.20/update-postgis.sh delete mode 100644 12-3.4/alpine3.21/Dockerfile delete mode 100644 12-3.4/alpine3.21/initdb-postgis.sh delete mode 100644 12-3.4/alpine3.21/tags delete mode 100755 12-3.4/alpine3.21/update-postgis.sh delete mode 100644 12-3.5/alpine3.20/Dockerfile delete mode 100644 12-3.5/alpine3.20/initdb-postgis.sh delete mode 100644 12-3.5/alpine3.20/tags delete mode 100755 12-3.5/alpine3.20/update-postgis.sh delete mode 100644 12-3.5/alpine3.21/Dockerfile delete mode 100644 12-3.5/alpine3.21/initdb-postgis.sh delete mode 100644 12-3.5/alpine3.21/tags delete mode 100755 12-3.5/alpine3.21/update-postgis.sh delete mode 100644 12-3.5/bookworm/Dockerfile delete mode 100644 12-3.5/bookworm/initdb-postgis.sh delete mode 100644 12-3.5/bookworm/tags delete mode 100755 12-3.5/bookworm/update-postgis.sh delete mode 100644 12-3.5/bullseye/Dockerfile delete mode 100644 12-3.5/bullseye/initdb-postgis.sh delete mode 100644 12-3.5/bullseye/tags delete mode 100755 12-3.5/bullseye/update-postgis.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c360d07d..ca20e0c5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,13 +126,6 @@ workflows: # hence they must be generated within the bundle JOB. # #circleci-targets-start - "12-3.3-alpine3.21", - "12-3.4-alpine3.20", - "12-3.4-alpine3.21", - "12-3.5-alpine3.20", - "12-3.5-alpine3.21", - "12-3.5-bookworm", - "12-3.5-bullseye", "13-3.3-alpine3.21", "13-3.4-alpine3.20", "13-3.4-alpine3.21", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 496d07db5..21a017e61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,13 +27,6 @@ jobs: # hence they must be generated within the bundle JOB. # #matrix-include-start - - { version: "12-3.3", variant: "alpine3.21" } - - { version: "12-3.4", variant: "alpine3.20" } - - { version: "12-3.4", variant: "alpine3.21" } - - { version: "12-3.5", variant: "alpine3.20" } - - { version: "12-3.5", variant: "alpine3.21" } - - { version: "12-3.5", variant: "bookworm" } - - { version: "12-3.5", variant: "bullseye" } - { version: "13-3.3", variant: "alpine3.21" } - { version: "13-3.4", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.21" } diff --git a/12-3.3/alpine3.21/Dockerfile b/12-3.3/alpine3.21/Dockerfile deleted file mode 100644 index 849f6203a..000000000 --- a/12-3.3/alpine3.21/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.3/alpine3.21/initdb-postgis.sh b/12-3.3/alpine3.21/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.3/alpine3.21/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.3/alpine3.21/tags b/12-3.3/alpine3.21/tags deleted file mode 100644 index 684b21ac3..000000000 --- a/12-3.3/alpine3.21/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.3-alpine3.21 12-3.3.8-alpine3.21 12-3.3-alpine diff --git a/12-3.3/alpine3.21/update-postgis.sh b/12-3.3/alpine3.21/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.3/alpine3.21/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile deleted file mode 100644 index b6c4801d5..000000000 --- a/12-3.4/alpine3.20/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/alpine3.20/initdb-postgis.sh b/12-3.4/alpine3.20/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.4/alpine3.20/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.4/alpine3.20/tags b/12-3.4/alpine3.20/tags deleted file mode 100644 index f8d47d4e1..000000000 --- a/12-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-alpine3.20 12-3.4.4-alpine3.20 diff --git a/12-3.4/alpine3.20/update-postgis.sh b/12-3.4/alpine3.20/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.4/alpine3.20/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.4/alpine3.21/Dockerfile b/12-3.4/alpine3.21/Dockerfile deleted file mode 100644 index 4ba566427..000000000 --- a/12-3.4/alpine3.21/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.4/alpine3.21/initdb-postgis.sh b/12-3.4/alpine3.21/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.4/alpine3.21/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.4/alpine3.21/tags b/12-3.4/alpine3.21/tags deleted file mode 100644 index 57ac90e0f..000000000 --- a/12-3.4/alpine3.21/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.4-alpine3.21 12-3.4.4-alpine3.21 12-3.4-alpine diff --git a/12-3.4/alpine3.21/update-postgis.sh b/12-3.4/alpine3.21/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.4/alpine3.21/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile deleted file mode 100644 index 2dccb79bd..000000000 --- a/12-3.5/alpine3.20/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.20 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.20" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/alpine3.20/initdb-postgis.sh b/12-3.5/alpine3.20/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.5/alpine3.20/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.5/alpine3.20/tags b/12-3.5/alpine3.20/tags deleted file mode 100644 index 2e2a99fa3..000000000 --- a/12-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.5-alpine3.20 12-3.5.2-alpine3.20 diff --git a/12-3.5/alpine3.20/update-postgis.sh b/12-3.5/alpine3.20/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.5/alpine3.20/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.5/alpine3.21/Dockerfile b/12-3.5/alpine3.21/Dockerfile deleted file mode 100644 index 4be7efd25..000000000 --- a/12-3.5/alpine3.21/Dockerfile +++ /dev/null @@ -1,140 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.alpine.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -ARG PGIS1_BASE_IMAGE=postgres:12-alpine3.21 -ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 - -FROM ${PGIS1_BASE_IMAGE} - -ARG PGIS1_POSTGIS_REPOSITORY -ARG PGIS1_POSTGIS_CHECKOUT -ARG PGIS1_POSTGIS_CHECKOUT_SHA1 - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -RUN set -eux \ - && apk add --no-cache --virtual .build-deps \ - \ - ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ - \ - # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains - # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. - # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 - $DOCKER_PG_LLVM_DEPS \ - \ - autoconf \ - automake \ - bison \ - cunit-dev \ - file \ - g++ \ - gcc \ - gettext-dev \ - git \ - json-c-dev \ - libtool \ - libxml2-dev \ - libxml2-utils \ - make \ - # Note: PCRE2 is not supported in older versions of PostGIS. - # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. - # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. - pcre-dev \ - perl \ - protobuf-c-dev \ - \ - # postgis - && cd /usr/src \ - && mkdir postgis \ - && cd postgis \ - && git init \ - && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled - && cd /usr/src/postgis \ - && gettextize \ - && ./autogen.sh \ - && ./configure \ - --enable-lto \ - && make -j$(nproc) \ - && make install \ - \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. - && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ - && projsync --system-directory --file us_noaa_eshpgn \ - && projsync --system-directory --file us_noaa_prvi \ - && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. - && mkdir /tempdb \ - && chown -R postgres:postgres /tempdb \ - && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ - && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ - \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ - && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ - && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ - && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ - \ - && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ - && rm -rf /tempdb \ - && rm -rf /tmp/logfile \ - && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps - && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ - # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files - # fix https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ -# clean - && cd / \ - && rm -rf \ - /usr/src/postgis \ - /usr/local/share/doc \ - /usr/local/share/man \ - && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. - && cat /_pgis_full_version.txt - -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/alpine3.21/initdb-postgis.sh b/12-3.5/alpine3.21/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.5/alpine3.21/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.5/alpine3.21/tags b/12-3.5/alpine3.21/tags deleted file mode 100644 index 7649a7687..000000000 --- a/12-3.5/alpine3.21/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.5-alpine3.21 12-3.5.2-alpine3.21 12-3.5-alpine diff --git a/12-3.5/alpine3.21/update-postgis.sh b/12-3.5/alpine3.21/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.5/alpine3.21/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.5/bookworm/Dockerfile b/12-3.5/bookworm/Dockerfile deleted file mode 100644 index 626ac8269..000000000 --- a/12-3.5/bookworm/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:12-bookworm - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 12 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/bookworm/initdb-postgis.sh b/12-3.5/bookworm/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.5/bookworm/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.5/bookworm/tags b/12-3.5/bookworm/tags deleted file mode 100644 index 4780a2300..000000000 --- a/12-3.5/bookworm/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.5-bookworm 12-3.5.2-bookworm 12-3.5 diff --git a/12-3.5/bookworm/update-postgis.sh b/12-3.5/bookworm/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.5/bookworm/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/12-3.5/bullseye/Dockerfile b/12-3.5/bullseye/Dockerfile deleted file mode 100644 index 6dec0bd93..000000000 --- a/12-3.5/bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" -# source: "./templates/Dockerfile.debian.template" -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM postgres:12-bullseye - -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" - -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 - -RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* - -# multiple LLVM existance is not allowed. -RUN set -eux \ - && dpkg -l | grep llvm \ - && llvm_count=$(dpkg -l | grep llvm | wc -l) \ - && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ - exit 1; \ - fi - -RUN mkdir -p /docker-entrypoint-initdb.d -COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh -COPY ./update-postgis.sh /usr/local/bin diff --git a/12-3.5/bullseye/initdb-postgis.sh b/12-3.5/bullseye/initdb-postgis.sh deleted file mode 100644 index 21f8c373d..000000000 --- a/12-3.5/bullseye/initdb-postgis.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2154 -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -# Create the 'template_postgis' template db -"${psql[@]}" <<-'EOSQL' -CREATE DATABASE template_postgis IS_TEMPLATE true; -EOSQL - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB"; do - echo "Loading PostGIS extensions into $DB" - "${psql[@]}" --dbname="$DB" <<-'EOSQL' - CREATE EXTENSION IF NOT EXISTS postgis; - CREATE EXTENSION IF NOT EXISTS postgis_topology; - -- Reconnect to update pg_setting.resetval - -- See https://github.com/postgis/docker-postgis/issues/288 - \c - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; -EOSQL -done diff --git a/12-3.5/bullseye/tags b/12-3.5/bullseye/tags deleted file mode 100644 index 8dbaadade..000000000 --- a/12-3.5/bullseye/tags +++ /dev/null @@ -1 +0,0 @@ -12-3.5-bullseye 12-3.5.2-bullseye diff --git a/12-3.5/bullseye/update-postgis.sh b/12-3.5/bullseye/update-postgis.sh deleted file mode 100755 index f98abd261..000000000 --- a/12-3.5/bullseye/update-postgis.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -# Perform all actions as $POSTGRES_USER -export PGUSER="$POSTGRES_USER" - -POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" - -# Load PostGIS into both template_database and $POSTGRES_DB -for DB in template_postgis "$POSTGRES_DB" "${@}"; do - echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" - psql --dbname="$DB" -c " - -- Upgrade PostGIS (includes raster) - CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; - - -- Upgrade Topology - CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; - - -- Install Tiger dependencies in case not already installed - CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; - -- Upgrade US Tiger Geocoder - CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; - ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; - " -done diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 44c0ef758..4d91ca4c3 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf -ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 +ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 5e9d2fc0f..57fe3712a 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index c30d9e35c..341112f83 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 -ARG PGIS1_PROJ_CHECKOUT=tags/9.5.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf -ARG PGIS1_PROJ_CHECKOUT_SHA1=41f79ccfe107d3951dac6826f289b55d17cc3b81 +ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 1e3123e8e..ed0cc3546 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 1a6d4cf4f..dd7335ed1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ **Important:** _Please note that this README document is larger than the 25,000 character limit set by Docker Hub. As a result, the version available on Docker Hub will be trimmed and not complete._ _For the complete and untrimmed version of the README, it is recommended to visit the project GitHub page:_ https://github.com/ImreSamu/docker-postgis/blob/master/README.md -The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS which is compatible with PostgreSQL versions 12, 13, 14, 15, 16 and 17. Additionally, an image version is provided which is built from the latest two versions of Postgres (16,17) with versions of PostGIS and its dependencies built from their respective master branches. +The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS which is compatible with PostgreSQL versions 13, 14, 15, 16 and 17. Additionally, an image version is provided which is built from the latest two versions of Postgres (16,17) with versions of PostGIS and its dependencies built from their respective master branches. This image ensures that the default database created by the parent `postgres` image will have the following extensions installed: @@ -30,7 +30,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 (2025-03-05) +## Versions (2025-03-15) We provide multi-platform image support for the following architectures: @@ -71,7 +71,6 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.2 | | [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.2 | | [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.2 | | [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.2 | @@ -88,7 +87,6 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.2 | | [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.2 | | [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.2 | | [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.2-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.2 | @@ -106,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.5.1, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) @@ -133,9 +131,6 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.21), [`12-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.21), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.3.8 | -| [`12-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.21), [`12-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.21), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.4.4 | -| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.2 | | [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | | [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | | [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.2 | @@ -161,8 +156,6 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 | -| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.2 | | [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | | [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.2 | | [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | diff --git a/tools/install_manifest-tool.sh b/tools/install_manifest-tool.sh index c3de5e5b6..2547d8521 100755 --- a/tools/install_manifest-tool.sh +++ b/tools/install_manifest-tool.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail # https://github.com/estesp/manifest-tool -version="2.1.8" +version="2.1.9" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then diff --git a/tools/manifest.sh b/tools/manifest.sh index 43ff5e60a..187e5e851 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -13,128 +13,6 @@ source tools/environment_init.sh # PLEASE DO NOT EDIT IT DIRECTLY. # -# ----- 12-3.3-alpine3.21 ----- - -echo "manifest: ${dockername}:12-3.3-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3-alpine3.21 \ - --target ${dockername}:12-3.3-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.3.8-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3.8-alpine3.21 \ - --target ${dockername}:12-3.3.8-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.3-alpine \ - --target ${dockername}:12-3.3-alpine || true - -# ----- 12-3.4-alpine3.20 ----- - -echo "manifest: ${dockername}:12-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.20 \ - --target ${dockername}:12-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:12-3.4.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.20 \ - --target ${dockername}:12-3.4.4-alpine3.20 || true - -# ----- 12-3.4-alpine3.21 ----- - -echo "manifest: ${dockername}:12-3.4-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine3.21 \ - --target ${dockername}:12-3.4-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.4.4-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4.4-alpine3.21 \ - --target ${dockername}:12-3.4.4-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.4-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.4-alpine \ - --target ${dockername}:12-3.4-alpine || true - -# ----- 12-3.5-alpine3.20 ----- - -echo "manifest: ${dockername}:12-3.5-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.20 \ - --target ${dockername}:12-3.5-alpine3.20 || true - -echo "manifest: ${dockername}:12-3.5.2-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.2-alpine3.20 \ - --target ${dockername}:12-3.5.2-alpine3.20 || true - -# ----- 12-3.5-alpine3.21 ----- - -echo "manifest: ${dockername}:12-3.5-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-alpine3.21 \ - --target ${dockername}:12-3.5-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.5.2-alpine3.21" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.2-alpine3.21 \ - --target ${dockername}:12-3.5.2-alpine3.21 || true - -echo "manifest: ${dockername}:12-3.5-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-alpine \ - --target ${dockername}:12-3.5-alpine || true - -# ----- 12-3.5-bookworm ----- - -echo "manifest: ${dockername}:12-3.5-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-bookworm \ - --target ${dockername}:12-3.5-bookworm || true - -echo "manifest: ${dockername}:12-3.5.2-bookworm" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.2-bookworm \ - --target ${dockername}:12-3.5.2-bookworm || true - -echo "manifest: ${dockername}:12-3.5" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5 \ - --target ${dockername}:12-3.5 || true - -# ----- 12-3.5-bullseye ----- - -echo "manifest: ${dockername}:12-3.5-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5-bullseye \ - --target ${dockername}:12-3.5-bullseye || true - -echo "manifest: ${dockername}:12-3.5.2-bullseye" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:12-3.5.2-bullseye \ - --target ${dockername}:12-3.5.2-bullseye || true - # ----- 13-3.3-alpine3.21 ----- echo "manifest: ${dockername}:13-3.3-alpine3.21" @@ -679,17 +557,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -819,17 +697,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ diff --git a/tools/versions.sh b/tools/versions.sh index 127d4a4e7..b8b780be9 100755 --- a/tools/versions.sh +++ b/tools/versions.sh @@ -26,7 +26,7 @@ alpine_latest="alpine3.21" postgis_latest="3.5" postgres_latest="17" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="12 13 14 15 16 17" +postgres_versions="13 14 15 16 17" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used diff --git a/versions.json b/versions.json index b3fc6453b..ca6e5eb63 100644 --- a/versions.json +++ b/versions.json @@ -1,104 +1,4 @@ { - "12-3.3": { - "alpine3.21": { - "tags": "12-3.3-alpine3.21 12-3.3.8-alpine3.21 12-3.3-alpine", - "readme_group": "alpine3.21", - "postgis": "3.3", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.3.8", - "POSTGIS_SHA256": "162d6eb3379eac80e4cd1068a6f36bc7fd1d9a32a68beca4386e7da88770ca70", - "POSTGIS_CHECKOUT": "tags/3.3.8", - "POSTGIS_CHECKOUT_SHA1": "cfb70d6229096d2474d79d097768dd19ef04a840" - } - }, - "12-3.4": { - "alpine3.20": { - "tags": "12-3.4-alpine3.20 12-3.4.4-alpine3.20", - "readme_group": "alpine3.20", - "postgis": "3.4", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.4", - "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", - "POSTGIS_CHECKOUT": "tags/3.4.4", - "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" - }, - "alpine3.21": { - "tags": "12-3.4-alpine3.21 12-3.4.4-alpine3.21 12-3.4-alpine", - "readme_group": "alpine3.21", - "postgis": "3.4", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.4.4", - "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", - "POSTGIS_CHECKOUT": "tags/3.4.4", - "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" - } - }, - "12-3.5": { - "bullseye": { - "tags": "12-3.5-bullseye 12-3.5.2-bullseye", - "postgis": "3.5", - "readme_group": "bullseye", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" - }, - "bookworm": { - "tags": "12-3.5-bookworm 12-3.5.2-bookworm 12-3.5", - "postgis": "3.5", - "readme_group": "bookworm", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "arch": "amd64 arm64", - "template": "Dockerfile.debian.template", - "initfile": "initdb-postgis.sh", - "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" - }, - "alpine3.20": { - "tags": "12-3.5-alpine3.20 12-3.5.2-alpine3.20", - "readme_group": "alpine3.20", - "postgis": "3.5", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" - }, - "alpine3.21": { - "tags": "12-3.5-alpine3.21 12-3.5.2-alpine3.21 12-3.5-alpine", - "readme_group": "alpine3.21", - "postgis": "3.5", - "arch": "amd64 arm64", - "template": "Dockerfile.alpine.template", - "initfile": "initdb-postgis.sh", - "PG_MAJOR": "12", - "PG_DOCKER": "12", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" - } - }, "13-3.3": { "alpine3.21": { "tags": "13-3.3-alpine3.21 13-3.3.8-alpine3.21 13-3.3-alpine", @@ -553,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -563,8 +463,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.2", "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", - "PROJ_CHECKOUT": "tags/9.5.1", - "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", + "PROJ_CHECKOUT": "tags/9.6.0", + "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.2", "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", @@ -675,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.5.1-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -685,8 +585,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.2", "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", - "PROJ_CHECKOUT": "tags/9.5.1", - "PROJ_CHECKOUT_SHA1": "41f79ccfe107d3951dac6826f289b55d17cc3b81", + "PROJ_CHECKOUT": "tags/9.6.0", + "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.10.2", "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", From 48725617e81d3165c81ba200edbae7324e4ba783 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 18 Mar 2025 20:00:18 +0000 Subject: [PATCH 148/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.19.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 6fd903e62..e209c35b6 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.18.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=bb49cfc6d626782a214b6b6e343a0666d7c40773 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b15ef74acaaf8df5aa0dd0652a0dccddcdc974e6 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index dd7335ed1..281a43711 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-03-15) +## Versions (2025-03-18) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index ca6e5eb63..058e681de 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.18.2", - "TIMESCALEDB_CHECKOUT_SHA1": "bb49cfc6d626782a214b6b6e343a0666d7c40773", + "TIMESCALEDB_CHECKOUT": "tags/2.19.0", + "TIMESCALEDB_CHECKOUT_SHA1": "b15ef74acaaf8df5aa0dd0652a0dccddcdc974e6", "DUCKDB_CHECKOUT": "tags/v1.2.1", "DUCKDB_CHECKOUT_SHA1": "8e52ec43959ab363643d63cb78ee214577111da4", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 845327a8bfde546eb34fbf459a619740b6cb995c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 1 Apr 2025 20:00:31 +0000 Subject: [PATCH 149/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index e209c35b6..d9f8d9fde 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b15ef74acaaf8df5aa0dd0652a0dccddcdc974e6 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=9e75bacecf6cf81366f113edadf2dec82352e62c ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 281a43711..26379ea77 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-03-18) +## Versions (2025-04-01) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 058e681de..92a4d0bca 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.19.0", - "TIMESCALEDB_CHECKOUT_SHA1": "b15ef74acaaf8df5aa0dd0652a0dccddcdc974e6", + "TIMESCALEDB_CHECKOUT": "tags/2.19.1", + "TIMESCALEDB_CHECKOUT_SHA1": "9e75bacecf6cf81366f113edadf2dec82352e62c", "DUCKDB_CHECKOUT": "tags/v1.2.1", "DUCKDB_CHECKOUT_SHA1": "8e52ec43959ab363643d63cb78ee214577111da4", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 625ff68ac03b962aae3dcfbacf3c856afb1a946e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 7 Apr 2025 20:00:32 +0000 Subject: [PATCH 150/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GDAL:?= =?UTF-8?q?v3.10.3,TIMESCALEDB:2.19.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 12 ++++++------ versions.json | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index d9f8d9fde..19f12629d 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=9e75bacecf6cf81366f113edadf2dec82352e62c +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=d454524eb6ef63196e3d22bc8a2e3cdf0719cfaf ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 4d91ca4c3..af18d28d7 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f -ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf +ARG PGIS1_GDAL_CHECKOUT_SHA1=ed29baf16d20bccbe331d809e0bafd7afde03360 ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 57fe3712a..ad1fa6e1c 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 341112f83..68fe6cd43 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.2 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f -ARG PGIS1_GDAL_CHECKOUT_SHA1=e31053b64d9db2e0dc6f8eec0982908a2087eedf +ARG PGIS1_GDAL_CHECKOUT_SHA1=ed29baf16d20bccbe331d809e0bafd7afde03360 ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index ed0cc3546..a7f454ee2 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 26379ea77..9db549a7d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-04-01) +## Versions (2025-04-07) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.2, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index 187e5e851..a4309f47e 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -557,11 +557,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -697,11 +697,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 92a4d0bca..17dc38cae 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.19.1", - "TIMESCALEDB_CHECKOUT_SHA1": "9e75bacecf6cf81366f113edadf2dec82352e62c", + "TIMESCALEDB_CHECKOUT": "tags/2.19.2", + "TIMESCALEDB_CHECKOUT_SHA1": "d454524eb6ef63196e3d22bc8a2e3cdf0719cfaf", "DUCKDB_CHECKOUT": "tags/v1.2.1", "DUCKDB_CHECKOUT_SHA1": "8e52ec43959ab363643d63cb78ee214577111da4", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -466,8 +466,8 @@ "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.2", - "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", + "GDAL_CHECKOUT": "tags/v3.10.3", + "GDAL_CHECKOUT_SHA1": "ed29baf16d20bccbe331d809e0bafd7afde03360", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.2-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -588,8 +588,8 @@ "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.2", - "GDAL_CHECKOUT_SHA1": "e31053b64d9db2e0dc6f8eec0982908a2087eedf", + "GDAL_CHECKOUT": "tags/v3.10.3", + "GDAL_CHECKOUT_SHA1": "ed29baf16d20bccbe331d809e0bafd7afde03360", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", From f8e62c286ba8f892b8c9efbbbedfd323441df1a4 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 8 Apr 2025 20:00:15 +0000 Subject: [PATCH 151/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 19f12629d..3dd443237 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.1 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.2 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 9db549a7d..0d778748c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-04-07) +## Versions (2025-04-08) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 17dc38cae..8f062e1e7 100644 --- a/versions.json +++ b/versions.json @@ -417,8 +417,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.19.2", "TIMESCALEDB_CHECKOUT_SHA1": "d454524eb6ef63196e3d22bc8a2e3cdf0719cfaf", - "DUCKDB_CHECKOUT": "tags/v1.2.1", - "DUCKDB_CHECKOUT_SHA1": "8e52ec43959ab363643d63cb78ee214577111da4", + "DUCKDB_CHECKOUT": "tags/v1.2.2", + "DUCKDB_CHECKOUT_SHA1": "7c039464e452ddc3330e2691d3fa6d305521d09b", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From 1636ba01b29bf6df75d659992f77df2efa8954a9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Tue, 15 Apr 2025 20:00:08 +0000 Subject: [PATCH 152/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.19.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 3dd443237..2cb253f65 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=d454524eb6ef63196e3d22bc8a2e3cdf0719cfaf +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.3 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=95861e123bd439ed3c04dc5eeb86fef841bdf93b ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 0d778748c..1274ebc45 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-04-08) +## Versions (2025-04-15) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 8f062e1e7..291bd3764 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.19.2", - "TIMESCALEDB_CHECKOUT_SHA1": "d454524eb6ef63196e3d22bc8a2e3cdf0719cfaf", + "TIMESCALEDB_CHECKOUT": "tags/2.19.3", + "TIMESCALEDB_CHECKOUT_SHA1": "95861e123bd439ed3c04dc5eeb86fef841bdf93b", "DUCKDB_CHECKOUT": "tags/v1.2.2", "DUCKDB_CHECKOUT_SHA1": "7c039464e452ddc3330e2691d3fa6d305521d09b", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From c3b3633d8ed58db5360d0064c2912fe8bb9e258c Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 9 May 2025 20:00:08 +0000 Subject: [PATCH 153/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20GDAL:?= =?UTF-8?q?v3.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 24 ++++++++++++------------ versions.json | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index af18d28d7..44bce0259 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f -ARG PGIS1_GDAL_CHECKOUT_SHA1=ed29baf16d20bccbe331d809e0bafd7afde03360 +ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index ad1fa6e1c..e46c53c65 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 68fe6cd43..245990a79 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -18,7 +18,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.10.3 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -27,7 +27,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Otherwise, verify that the commit hash matches ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f -ARG PGIS1_GDAL_CHECKOUT_SHA1=ed29baf16d20bccbe331d809e0bafd7afde03360 +ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index a7f454ee2..155858b9a 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 1274ebc45..fabe0db15 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-04-15) +## Versions (2025-05-09) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.10.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index a4309f47e..908603c5a 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -557,17 +557,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -697,17 +697,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm || true echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 291bd3764..72b0dfec7 100644 --- a/versions.json +++ b/versions.json @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -466,8 +466,8 @@ "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.3", - "GDAL_CHECKOUT_SHA1": "ed29baf16d20bccbe331d809e0bafd7afde03360", + "GDAL_CHECKOUT": "tags/v3.11.0", + "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.10.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.10-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -588,8 +588,8 @@ "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", - "GDAL_CHECKOUT": "tags/v3.10.3", - "GDAL_CHECKOUT_SHA1": "ed29baf16d20bccbe331d809e0bafd7afde03360", + "GDAL_CHECKOUT": "tags/v3.11.0", + "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", "SFCGAL_CHECKOUT": "tags/v2.0.0", From 78fc5320dedfaf59c528e0f56d50b0cf3df5cb40 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 14 May 2025 20:00:02 +0000 Subject: [PATCH 154/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20SFCGA?= =?UTF-8?q?L:v2.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 24 ++++++++++++------------ versions.json | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 44bce0259..2a80806b3 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' @@ -29,7 +29,7 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index e46c53c65..94ca82bd7 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 245990a79..4f198857a 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -20,7 +20,7 @@ ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 -ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' @@ -29,7 +29,7 @@ ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 -ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 155858b9a..f80578fa9 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent diff --git a/README.md b/README.md index fabe0db15..99c22c526 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-09) +## Versions (2025-05-14) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index 908603c5a..34712f1d7 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -557,17 +557,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm \ + --target ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm || true echo "manifest: ${dockername}:16-recent" manifest-tool push from-args \ @@ -697,17 +697,17 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm \ + --target ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm || true echo "manifest: ${dockername}:17-recent" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 72b0dfec7..32d911fac 100644 --- a/versions.json +++ b/versions.json @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -470,8 +470,8 @@ "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", - "SFCGAL_CHECKOUT": "tags/v2.0.0", - "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", + "SFCGAL_CHECKOUT": "tags/v2.1.0", + "SFCGAL_CHECKOUT_SHA1": "60573cfb6b3fc01eceda563d275a226317ba01db", "CGAL_CHECKOUT": "tags/v6.0.1", "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -592,8 +592,8 @@ "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", "GEOS_CHECKOUT": "tags/3.13.1", "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", - "SFCGAL_CHECKOUT": "tags/v2.0.0", - "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", + "SFCGAL_CHECKOUT": "tags/v2.1.0", + "SFCGAL_CHECKOUT_SHA1": "60573cfb6b3fc01eceda563d275a226317ba01db", "CGAL_CHECKOUT": "tags/v6.0.1", "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" From 00974702a48ec3c7b121304fdabbacc1de2973dc Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 15 May 2025 20:00:28 +0000 Subject: [PATCH 155/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 2cb253f65..7a9cfd4dd 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.19.3 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=95861e123bd439ed3c04dc5eeb86fef841bdf93b +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.0 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=e70ab02556617a421928ad02bd790b2c809851e7 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 99c22c526..4eaf10383 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-14) +## Versions (2025-05-15) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 32d911fac..6b212ee1b 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.19.3", - "TIMESCALEDB_CHECKOUT_SHA1": "95861e123bd439ed3c04dc5eeb86fef841bdf93b", + "TIMESCALEDB_CHECKOUT": "tags/2.20.0", + "TIMESCALEDB_CHECKOUT_SHA1": "e70ab02556617a421928ad02bd790b2c809851e7", "DUCKDB_CHECKOUT": "tags/v1.2.2", "DUCKDB_CHECKOUT_SHA1": "7c039464e452ddc3330e2691d3fa6d305521d09b", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 99ab5b0db51b1e7accac7e77c4ed983087326f04 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 18 May 2025 04:52:26 +0000 Subject: [PATCH 156/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20POSTG?= =?UTF-8?q?IS:3.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 13-3.5/alpine3.20/Dockerfile | 4 +- 13-3.5/alpine3.20/tags | 2 +- 13-3.5/alpine3.21/Dockerfile | 4 +- 13-3.5/alpine3.21/tags | 2 +- 14-3.5/alpine3.20/Dockerfile | 4 +- 14-3.5/alpine3.20/tags | 2 +- 14-3.5/alpine3.21/Dockerfile | 4 +- 14-3.5/alpine3.21/tags | 2 +- 15-3.5/alpine3.20/Dockerfile | 4 +- 15-3.5/alpine3.20/tags | 2 +- 15-3.5/alpine3.21/Dockerfile | 4 +- 15-3.5/alpine3.21/tags | 2 +- 16-3.5/alpine3.20/Dockerfile | 4 +- 16-3.5/alpine3.20/tags | 2 +- 16-3.5/alpine3.21/Dockerfile | 4 +- 16-3.5/alpine3.21/tags | 2 +- 16-recent/bookworm/Dockerfile | 4 +- 16-recent/bookworm/tags | 2 +- 17-3.5/alpine3.20/Dockerfile | 4 +- 17-3.5/alpine3.20/tags | 2 +- 17-3.5/alpine3.21/Dockerfile | 4 +- 17-3.5/alpine3.21/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 +- 17-recent/bookworm/tags | 2 +- README.md | 26 ++++---- tools/manifest.sh | 72 +++++++++++----------- versions.json | 112 +++++++++++++++++----------------- 27 files changed, 141 insertions(+), 141 deletions(-) diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 4d6419b33..2ad2be518 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags index 43cc89b58..99c47a483 100644 --- a/13-3.5/alpine3.20/tags +++ b/13-3.5/alpine3.20/tags @@ -1 +1 @@ -13-3.5-alpine3.20 13-3.5.2-alpine3.20 +13-3.5-alpine3.20 13-3.5.3-alpine3.20 diff --git a/13-3.5/alpine3.21/Dockerfile b/13-3.5/alpine3.21/Dockerfile index 3c5ead4c2..4cf0e5b29 100644 --- a/13-3.5/alpine3.21/Dockerfile +++ b/13-3.5/alpine3.21/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/13-3.5/alpine3.21/tags b/13-3.5/alpine3.21/tags index ae06b8c0b..7fb0441c0 100644 --- a/13-3.5/alpine3.21/tags +++ b/13-3.5/alpine3.21/tags @@ -1 +1 @@ -13-3.5-alpine3.21 13-3.5.2-alpine3.21 13-3.5-alpine +13-3.5-alpine3.21 13-3.5.3-alpine3.21 13-3.5-alpine diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index 8889df587..d5218439e 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags index 9474156cb..7b14d9b6a 100644 --- a/14-3.5/alpine3.20/tags +++ b/14-3.5/alpine3.20/tags @@ -1 +1 @@ -14-3.5-alpine3.20 14-3.5.2-alpine3.20 +14-3.5-alpine3.20 14-3.5.3-alpine3.20 diff --git a/14-3.5/alpine3.21/Dockerfile b/14-3.5/alpine3.21/Dockerfile index acca86f48..f7d4b7917 100644 --- a/14-3.5/alpine3.21/Dockerfile +++ b/14-3.5/alpine3.21/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/14-3.5/alpine3.21/tags b/14-3.5/alpine3.21/tags index f111208a6..c1c3a5a7d 100644 --- a/14-3.5/alpine3.21/tags +++ b/14-3.5/alpine3.21/tags @@ -1 +1 @@ -14-3.5-alpine3.21 14-3.5.2-alpine3.21 14-3.5-alpine +14-3.5-alpine3.21 14-3.5.3-alpine3.21 14-3.5-alpine diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index c559bd71d..86fd33f19 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags index ebe1d03d4..46f976478 100644 --- a/15-3.5/alpine3.20/tags +++ b/15-3.5/alpine3.20/tags @@ -1 +1 @@ -15-3.5-alpine3.20 15-3.5.2-alpine3.20 +15-3.5-alpine3.20 15-3.5.3-alpine3.20 diff --git a/15-3.5/alpine3.21/Dockerfile b/15-3.5/alpine3.21/Dockerfile index ffafea75e..a7dd3e2d7 100644 --- a/15-3.5/alpine3.21/Dockerfile +++ b/15-3.5/alpine3.21/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/15-3.5/alpine3.21/tags b/15-3.5/alpine3.21/tags index cac8e7851..e4964f6ad 100644 --- a/15-3.5/alpine3.21/tags +++ b/15-3.5/alpine3.21/tags @@ -1 +1 @@ -15-3.5-alpine3.21 15-3.5.2-alpine3.21 15-3.5-alpine +15-3.5-alpine3.21 15-3.5.3-alpine3.21 15-3.5-alpine diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 84d45b0de..35e793f39 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags index cf3600865..601c5ac61 100644 --- a/16-3.5/alpine3.20/tags +++ b/16-3.5/alpine3.20/tags @@ -1 +1 @@ -16-3.5-alpine3.20 16-3.5.2-alpine3.20 +16-3.5-alpine3.20 16-3.5.3-alpine3.20 diff --git a/16-3.5/alpine3.21/Dockerfile b/16-3.5/alpine3.21/Dockerfile index 2263e11ea..de507d676 100644 --- a/16-3.5/alpine3.21/Dockerfile +++ b/16-3.5/alpine3.21/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/16-3.5/alpine3.21/tags b/16-3.5/alpine3.21/tags index 02088ad3f..349e56390 100644 --- a/16-3.5/alpine3.21/tags +++ b/16-3.5/alpine3.21/tags @@ -1 +1 @@ -16-3.5-alpine3.21 16-3.5.2-alpine3.21 16-3.5-alpine +16-3.5-alpine3.21 16-3.5.3-alpine3.21 16-3.5-alpine diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 2a80806b3..32e194dc6 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 94ca82bd7..b9f9f7304 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent diff --git a/17-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.20/Dockerfile index f40e1e5ee..252db8a3e 100644 --- a/17-3.5/alpine3.20/Dockerfile +++ b/17-3.5/alpine3.20/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags index 9b7ce9830..ecaea8e65 100644 --- a/17-3.5/alpine3.20/tags +++ b/17-3.5/alpine3.20/tags @@ -1 +1 @@ -17-3.5-alpine3.20 17-3.5.2-alpine3.20 +17-3.5-alpine3.20 17-3.5.3-alpine3.20 diff --git a/17-3.5/alpine3.21/Dockerfile b/17-3.5/alpine3.21/Dockerfile index f9f4d53dd..73dec5c1f 100644 --- a/17-3.5/alpine3.21/Dockerfile +++ b/17-3.5/alpine3.21/Dockerfile @@ -6,8 +6,8 @@ ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.21 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 FROM ${PGIS1_BASE_IMAGE} diff --git a/17-3.5/alpine3.21/tags b/17-3.5/alpine3.21/tags index e1f18e536..56ccb17fd 100644 --- a/17-3.5/alpine3.21/tags +++ b/17-3.5/alpine3.21/tags @@ -1 +1 @@ -17-3.5-alpine3.21 17-3.5.2-alpine3.21 17-3.5-alpine alpine +17-3.5-alpine3.21 17-3.5.3-alpine3.21 17-3.5-alpine alpine diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 4f198857a..7b9c5a1a3 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -16,7 +16,7 @@ ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git # Should valid git checkout ( SHA1, tags, branches ) -ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.2 +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 @@ -25,7 +25,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches -ARG PGIS1_POSTGIS_CHECKOUT_SHA1=dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index f80578fa9..a660fe423 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent diff --git a/README.md b/README.md index 4eaf10383..41b2f5943 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-15) +## Versions (2025-05-18) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.2, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | ### 🧪Debian Geo Bundle ( experimental ) @@ -133,18 +133,18 @@ Please note that the included package list is subject to change as we continue t | ---- | :-: | :-: | :-: | :-: | :-: | | [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | | [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | -| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.2 | +| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.3 | | [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 | | [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 | -| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.2 | +| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.3 | | [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 | | [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 | -| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.2 | +| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.3 | | [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 | | [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 | -| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.2 | +| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.3 | | [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 | -| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.2-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.2 | +| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.3 | ### ⛰️Alpine 3.20 based @@ -157,14 +157,14 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | -| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.2 | +| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.3 | | [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | -| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.2 | +| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.3 | | [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | -| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.2 | +| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.3 | | [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | -| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.2 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.2-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.2 | +| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.3 | +| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.3 | diff --git a/tools/manifest.sh b/tools/manifest.sh index 34712f1d7..3543d00ef 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -75,11 +75,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.20 \ --target ${dockername}:13-3.5-alpine3.20 || true -echo "manifest: ${dockername}:13-3.5.2-alpine3.20" +echo "manifest: ${dockername}:13-3.5.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.2-alpine3.20 \ - --target ${dockername}:13-3.5.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.5.3-alpine3.20 \ + --target ${dockername}:13-3.5.3-alpine3.20 || true # ----- 13-3.5-alpine3.21 ----- @@ -89,11 +89,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.21 \ --target ${dockername}:13-3.5-alpine3.21 || true -echo "manifest: ${dockername}:13-3.5.2-alpine3.21" +echo "manifest: ${dockername}:13-3.5.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.2-alpine3.21 \ - --target ${dockername}:13-3.5.2-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:13-3.5.3-alpine3.21 \ + --target ${dockername}:13-3.5.3-alpine3.21 || true echo "manifest: ${dockername}:13-3.5-alpine" manifest-tool push from-args \ @@ -197,11 +197,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.20 \ --target ${dockername}:14-3.5-alpine3.20 || true -echo "manifest: ${dockername}:14-3.5.2-alpine3.20" +echo "manifest: ${dockername}:14-3.5.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.2-alpine3.20 \ - --target ${dockername}:14-3.5.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.5.3-alpine3.20 \ + --target ${dockername}:14-3.5.3-alpine3.20 || true # ----- 14-3.5-alpine3.21 ----- @@ -211,11 +211,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.21 \ --target ${dockername}:14-3.5-alpine3.21 || true -echo "manifest: ${dockername}:14-3.5.2-alpine3.21" +echo "manifest: ${dockername}:14-3.5.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.2-alpine3.21 \ - --target ${dockername}:14-3.5.2-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:14-3.5.3-alpine3.21 \ + --target ${dockername}:14-3.5.3-alpine3.21 || true echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ @@ -333,11 +333,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.20 \ --target ${dockername}:15-3.5-alpine3.20 || true -echo "manifest: ${dockername}:15-3.5.2-alpine3.20" +echo "manifest: ${dockername}:15-3.5.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.2-alpine3.20 \ - --target ${dockername}:15-3.5.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.5.3-alpine3.20 \ + --target ${dockername}:15-3.5.3-alpine3.20 || true # ----- 15-3.5-alpine3.21 ----- @@ -347,11 +347,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.21 \ --target ${dockername}:15-3.5-alpine3.21 || true -echo "manifest: ${dockername}:15-3.5.2-alpine3.21" +echo "manifest: ${dockername}:15-3.5.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.2-alpine3.21 \ - --target ${dockername}:15-3.5.2-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:15-3.5.3-alpine3.21 \ + --target ${dockername}:15-3.5.3-alpine3.21 || true echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ @@ -455,11 +455,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.20 \ --target ${dockername}:16-3.5-alpine3.20 || true -echo "manifest: ${dockername}:16-3.5.2-alpine3.20" +echo "manifest: ${dockername}:16-3.5.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.2-alpine3.20 \ - --target ${dockername}:16-3.5.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.5.3-alpine3.20 \ + --target ${dockername}:16-3.5.3-alpine3.20 || true # ----- 16-3.5-alpine3.21 ----- @@ -469,11 +469,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.21 \ --target ${dockername}:16-3.5-alpine3.21 || true -echo "manifest: ${dockername}:16-3.5.2-alpine3.21" +echo "manifest: ${dockername}:16-3.5.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.2-alpine3.21 \ - --target ${dockername}:16-3.5.2-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:16-3.5.3-alpine3.21 \ + --target ${dockername}:16-3.5.3-alpine3.21 || true echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ @@ -557,11 +557,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ @@ -603,11 +603,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.20 \ --target ${dockername}:17-3.5-alpine3.20 || true -echo "manifest: ${dockername}:17-3.5.2-alpine3.20" +echo "manifest: ${dockername}:17-3.5.3-alpine3.20" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.2-alpine3.20 \ - --target ${dockername}:17-3.5.2-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:17-3.5.3-alpine3.20 \ + --target ${dockername}:17-3.5.3-alpine3.20 || true # ----- 17-3.5-alpine3.21 ----- @@ -617,11 +617,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.21 \ --target ${dockername}:17-3.5-alpine3.21 || true -echo "manifest: ${dockername}:17-3.5.2-alpine3.21" +echo "manifest: ${dockername}:17-3.5.3-alpine3.21" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.2-alpine3.21 \ - --target ${dockername}:17-3.5.2-alpine3.21 || true + --template ${dockername}-ARCHVARIANT:17-3.5.3-alpine3.21 \ + --target ${dockername}:17-3.5.3-alpine3.21 || true echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ @@ -697,11 +697,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 6b212ee1b..e10b3a617 100644 --- a/versions.json +++ b/versions.json @@ -71,7 +71,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "13-3.5-alpine3.20 13-3.5.2-alpine3.20", + "tags": "13-3.5-alpine3.20 13-3.5.3-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -79,13 +79,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, "alpine3.21": { - "tags": "13-3.5-alpine3.21 13-3.5.2-alpine3.21 13-3.5-alpine", + "tags": "13-3.5-alpine3.21 13-3.5.3-alpine3.21 13-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -93,10 +93,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "13", "PG_DOCKER": "13", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, "14-3.3": { @@ -171,7 +171,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "14-3.5-alpine3.20 14-3.5.2-alpine3.20", + "tags": "14-3.5-alpine3.20 14-3.5.3-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -179,13 +179,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, "alpine3.21": { - "tags": "14-3.5-alpine3.21 14-3.5.2-alpine3.21 14-3.5-alpine", + "tags": "14-3.5-alpine3.21 14-3.5.3-alpine3.21 14-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -193,10 +193,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "14", "PG_DOCKER": "14", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, "15-3.3": { @@ -271,7 +271,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "15-3.5-alpine3.20 15-3.5.2-alpine3.20", + "tags": "15-3.5-alpine3.20 15-3.5.3-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -279,13 +279,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, "alpine3.21": { - "tags": "15-3.5-alpine3.21 15-3.5.2-alpine3.21 15-3.5-alpine", + "tags": "15-3.5-alpine3.21 15-3.5.3-alpine3.21 15-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -293,10 +293,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "15", "PG_DOCKER": "15", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, "16-3.3": { @@ -371,7 +371,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "16-3.5-alpine3.20 16-3.5.2-alpine3.20", + "tags": "16-3.5-alpine3.20 16-3.5.3-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -379,13 +379,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, "alpine3.21": { - "tags": "16-3.5-alpine3.21 16-3.5.2-alpine3.21 16-3.5-alpine", + "tags": "16-3.5-alpine3.21 16-3.5.3-alpine3.21 16-3.5-alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -393,10 +393,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "16", "PG_DOCKER": "16", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, "16-3.5-bundle0": { @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -461,8 +461,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", @@ -519,7 +519,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" }, "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.2-alpine3.20", + "tags": "17-3.5-alpine3.20 17-3.5.3-alpine3.20", "readme_group": "alpine3.20", "postgis": "3.5", "arch": "amd64 arm64", @@ -527,13 +527,13 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, "alpine3.21": { - "tags": "17-3.5-alpine3.21 17-3.5.2-alpine3.21 17-3.5-alpine alpine", + "tags": "17-3.5-alpine3.21 17-3.5.3-alpine3.21 17-3.5-alpine alpine", "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", @@ -541,10 +541,10 @@ "initfile": "initdb-postgis.sh", "PG_MAJOR": "17", "PG_DOCKER": "17", - "POSTGIS_VERSION": "3.5.2", - "POSTGIS_SHA256": "71d8f5d06debec0bdd94525a5a1d42417ed2a1f65d0070a1a3e3e381b606ee35", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45" + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, "17-master": { @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.2-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -583,8 +583,8 @@ "arch": "amd64 arm64", "template": "Dockerfile.master.template", "initfile": "initdb-postgis.sh", - "POSTGIS_CHECKOUT": "tags/3.5.2", - "POSTGIS_CHECKOUT_SHA1": "dea6d0ac1cd0c9a98e9012ce2f61b676d1d7ae45", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", "PROJ_CHECKOUT": "tags/9.6.0", "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", "GDAL_BUILD": "with_extra", From 46d85b0ed75ce07a69ab6b82b6cd5dbf570213f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 May 2025 13:23:16 +0200 Subject: [PATCH 157/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.3.0,POSTGIS:3.5.3+dfsg-1~exp1.pgdg120+1=20(#96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 13-3.5/bookworm/Dockerfile | 4 ++-- 13-3.5/bookworm/tags | 2 +- 14-3.5/bookworm/Dockerfile | 4 ++-- 14-3.5/bookworm/tags | 2 +- 15-3.5/bookworm/Dockerfile | 4 ++-- 15-3.5/bookworm/tags | 2 +- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- 16-3.5-bundle0/bookworm/tags | 2 +- 16-3.5/bookworm/Dockerfile | 4 ++-- 16-3.5/bookworm/tags | 2 +- 17-3.5/bookworm/Dockerfile | 4 ++-- 17-3.5/bookworm/tags | 2 +- README.md | 14 ++++++------ tools/manifest.sh | 36 +++++++++++++++--------------- versions.json | 28 +++++++++++------------ 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile index 88e60ffdd..0cbe9843f 100644 --- a/13-3.5/bookworm/Dockerfile +++ b/13-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:13-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/13-3.5/bookworm/tags b/13-3.5/bookworm/tags index 1f9c861af..68bb74be7 100644 --- a/13-3.5/bookworm/tags +++ b/13-3.5/bookworm/tags @@ -1 +1 @@ -13-3.5-bookworm 13-3.5.2-bookworm 13-3.5 +13-3.5-bookworm 13-3.5.3-bookworm 13-3.5 diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile index 978d21cc2..57d72f918 100644 --- a/14-3.5/bookworm/Dockerfile +++ b/14-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:14-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/14-3.5/bookworm/tags b/14-3.5/bookworm/tags index ee029247f..6d9be9be5 100644 --- a/14-3.5/bookworm/tags +++ b/14-3.5/bookworm/tags @@ -1 +1 @@ -14-3.5-bookworm 14-3.5.2-bookworm 14-3.5 +14-3.5-bookworm 14-3.5.3-bookworm 14-3.5 diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile index 2d6d790f1..76bbbfa39 100644 --- a/15-3.5/bookworm/Dockerfile +++ b/15-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:15-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/15-3.5/bookworm/tags b/15-3.5/bookworm/tags index 2d36ea95f..78091337f 100644 --- a/15-3.5/bookworm/tags +++ b/15-3.5/bookworm/tags @@ -1 +1 @@ -15-3.5-bookworm 15-3.5.2-bookworm 15-3.5 +15-3.5-bookworm 15-3.5.3-bookworm 15-3.5 diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 7a9cfd4dd..60e3fc4f7 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.2.2 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.3.0 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/16-3.5-bundle0/bookworm/tags b/16-3.5-bundle0/bookworm/tags index 7777eca5c..7d7eb4495 100644 --- a/16-3.5-bundle0/bookworm/tags +++ b/16-3.5-bundle0/bookworm/tags @@ -1 +1 @@ -16-3.5-bundle0-bookworm 16-3.5.2-bundle0-bookworm 16-3.5-bundle0 +16-3.5-bundle0-bookworm 16-3.5.3-bundle0-bookworm 16-3.5-bundle0 diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile index 943d6cf4f..146682e6c 100644 --- a/16-3.5/bookworm/Dockerfile +++ b/16-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:16-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/16-3.5/bookworm/tags b/16-3.5/bookworm/tags index 9d0e1f155..08919e7b3 100644 --- a/16-3.5/bookworm/tags +++ b/16-3.5/bookworm/tags @@ -1 +1 @@ -16-3.5-bookworm 16-3.5.2-bookworm 16-3.5 +16-3.5-bookworm 16-3.5.3-bookworm 16-3.5 diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile index 967ab9986..b342e6255 100644 --- a/17-3.5/bookworm/Dockerfile +++ b/17-3.5/bookworm/Dockerfile @@ -6,11 +6,11 @@ FROM postgres:17-bookworm LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ + org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg120+1 +ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 RUN set -eux \ && apt-get update \ diff --git a/17-3.5/bookworm/tags b/17-3.5/bookworm/tags index 0df0683d6..f147f4a94 100644 --- a/17-3.5/bookworm/tags +++ b/17-3.5/bookworm/tags @@ -1 +1 @@ -17-3.5-bookworm 17-3.5.2-bookworm 17-3.5 latest +17-3.5-bookworm 17-3.5.3-bookworm 17-3.5 latest diff --git a/README.md b/README.md index 41b2f5943..499f827e3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-18) +## Versions (2025-05-26) We provide multi-platform image support for the following architectures: @@ -71,11 +71,11 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.2-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.2 | -| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.2-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.2 | -| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.2-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.2 | -| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.2 | -| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.2-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.2-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.2 | +| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.3 | +| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.3 | +| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.3 | +| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.3 | +| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.3 | ### 📘Debian - bullseye @@ -118,7 +118,7 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.2-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.2-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.2 | +| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.3 | diff --git a/tools/manifest.sh b/tools/manifest.sh index 3543d00ef..957381a3f 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -109,11 +109,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5-bookworm \ --target ${dockername}:13-3.5-bookworm || true -echo "manifest: ${dockername}:13-3.5.2-bookworm" +echo "manifest: ${dockername}:13-3.5.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.2-bookworm \ - --target ${dockername}:13-3.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:13-3.5.3-bookworm \ + --target ${dockername}:13-3.5.3-bookworm || true echo "manifest: ${dockername}:13-3.5" manifest-tool push from-args \ @@ -231,11 +231,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5-bookworm \ --target ${dockername}:14-3.5-bookworm || true -echo "manifest: ${dockername}:14-3.5.2-bookworm" +echo "manifest: ${dockername}:14-3.5.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.2-bookworm \ - --target ${dockername}:14-3.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:14-3.5.3-bookworm \ + --target ${dockername}:14-3.5.3-bookworm || true echo "manifest: ${dockername}:14-3.5" manifest-tool push from-args \ @@ -367,11 +367,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5-bookworm \ --target ${dockername}:15-3.5-bookworm || true -echo "manifest: ${dockername}:15-3.5.2-bookworm" +echo "manifest: ${dockername}:15-3.5.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.2-bookworm \ - --target ${dockername}:15-3.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:15-3.5.3-bookworm \ + --target ${dockername}:15-3.5.3-bookworm || true echo "manifest: ${dockername}:15-3.5" manifest-tool push from-args \ @@ -489,11 +489,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bookworm \ --target ${dockername}:16-3.5-bookworm || true -echo "manifest: ${dockername}:16-3.5.2-bookworm" +echo "manifest: ${dockername}:16-3.5.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.2-bookworm \ - --target ${dockername}:16-3.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.3-bookworm \ + --target ${dockername}:16-3.5.3-bookworm || true echo "manifest: ${dockername}:16-3.5" manifest-tool push from-args \ @@ -523,11 +523,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5-bundle0-bookworm \ --target ${dockername}:16-3.5-bundle0-bookworm || true -echo "manifest: ${dockername}:16-3.5.2-bundle0-bookworm" +echo "manifest: ${dockername}:16-3.5.3-bundle0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.2-bundle0-bookworm \ - --target ${dockername}:16-3.5.2-bundle0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-3.5.3-bundle0-bookworm \ + --target ${dockername}:16-3.5.3-bundle0-bookworm || true echo "manifest: ${dockername}:16-3.5-bundle0" manifest-tool push from-args \ @@ -643,11 +643,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5-bookworm \ --target ${dockername}:17-3.5-bookworm || true -echo "manifest: ${dockername}:17-3.5.2-bookworm" +echo "manifest: ${dockername}:17-3.5.3-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.2-bookworm \ - --target ${dockername}:17-3.5.2-bookworm || true + --template ${dockername}-ARCHVARIANT:17-3.5.3-bookworm \ + --target ${dockername}:17-3.5.3-bookworm || true echo "manifest: ${dockername}:17-3.5" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index e10b3a617..3815b951a 100644 --- a/versions.json +++ b/versions.json @@ -59,7 +59,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "13-3.5-bookworm 13-3.5.2-bookworm 13-3.5", + "tags": "13-3.5-bookworm 13-3.5.3-bookworm 13-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "13", @@ -68,7 +68,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, "alpine3.20": { "tags": "13-3.5-alpine3.20 13-3.5.3-alpine3.20", @@ -159,7 +159,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "14-3.5-bookworm 14-3.5.2-bookworm 14-3.5", + "tags": "14-3.5-bookworm 14-3.5.3-bookworm 14-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "14", @@ -168,7 +168,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, "alpine3.20": { "tags": "14-3.5-alpine3.20 14-3.5.3-alpine3.20", @@ -259,7 +259,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "15-3.5-bookworm 15-3.5.2-bookworm 15-3.5", + "tags": "15-3.5-bookworm 15-3.5.3-bookworm 15-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "15", @@ -268,7 +268,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, "alpine3.20": { "tags": "15-3.5-alpine3.20 15-3.5.3-alpine3.20", @@ -359,7 +359,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "16-3.5-bookworm 16-3.5.2-bookworm 16-3.5", + "tags": "16-3.5-bookworm 16-3.5.3-bookworm 16-3.5", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "16", @@ -368,7 +368,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, "alpine3.20": { "tags": "16-3.5-alpine3.20 16-3.5.3-alpine3.20", @@ -401,7 +401,7 @@ }, "16-3.5-bundle0": { "bookworm": { - "tags": "16-3.5-bundle0-bookworm 16-3.5.2-bundle0-bookworm 16-3.5-bundle0", + "tags": "16-3.5-bundle0-bookworm 16-3.5.3-bundle0-bookworm 16-3.5-bundle0", "postgis": "3.5", "readme_group": "bundle0", "PG_MAJOR": "16", @@ -417,12 +417,12 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.20.0", "TIMESCALEDB_CHECKOUT_SHA1": "e70ab02556617a421928ad02bd790b2c809851e7", - "DUCKDB_CHECKOUT": "tags/v1.2.2", - "DUCKDB_CHECKOUT_SHA1": "7c039464e452ddc3330e2691d3fa6d305521d09b", + "DUCKDB_CHECKOUT": "tags/v1.3.0", + "DUCKDB_CHECKOUT_SHA1": "71c5c07cdd295e9409c0505885033ae9eb6b5ddd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" } }, "16-master": { @@ -507,7 +507,7 @@ "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg110+1" }, "bookworm": { - "tags": "17-3.5-bookworm 17-3.5.2-bookworm 17-3.5 latest", + "tags": "17-3.5-bookworm 17-3.5.3-bookworm 17-3.5 latest", "postgis": "3.5", "readme_group": "bookworm", "PG_MAJOR": "17", @@ -516,7 +516,7 @@ "template": "Dockerfile.debian.template", "initfile": "initdb-postgis.sh", "POSTGIS_MAJOR": "3", - "POSTGIS_VERSION": "3.5.2+dfsg-1.pgdg120+1" + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, "alpine3.20": { "tags": "17-3.5-alpine3.20 17-3.5.3-alpine3.20", From cecdffdfbd33267eac91c06ac3d7572dd8b55f8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 May 2025 22:08:17 +0200 Subject: [PATCH 158/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.20.1=20(#97)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 60e3fc4f7..28e71f396 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=e70ab02556617a421928ad02bd790b2c809851e7 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4b72721692dfb0dc8726ccc5eb97b58c1a74a784 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index 499f827e3..448687ae6 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-26) +## Versions (2025-05-27) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 3815b951a..f3e05a022 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.20.0", - "TIMESCALEDB_CHECKOUT_SHA1": "e70ab02556617a421928ad02bd790b2c809851e7", + "TIMESCALEDB_CHECKOUT": "tags/2.20.1", + "TIMESCALEDB_CHECKOUT_SHA1": "4b72721692dfb0dc8726ccc5eb97b58c1a74a784", "DUCKDB_CHECKOUT": "tags/v1.3.0", "DUCKDB_CHECKOUT_SHA1": "71c5c07cdd295e9409c0505885033ae9eb6b5ddd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 34392c09c2f364afe3d25b575fabfbc18c182d9f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 22:03:51 +0200 Subject: [PATCH 159/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20PROJ:?= =?UTF-8?q?9.6.1,TIMESCALEDB:2.20.2=20(#98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 12 ++++++------ versions.json | 16 ++++++++-------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 28e71f396..c8032360d 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=4b72721692dfb0dc8726ccc5eb97b58c1a74a784 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b7c7cd02585388ac6b555097ef8831c1217cc402 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 32e194dc6..d54398c20 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b -ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=09c54c75e52662ae1a02aa2a40d51295013065e8 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index b9f9f7304..2e7e85f30 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 7b9c5a1a3..7bfc22737 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.6.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.1 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b -ARG PGIS1_PROJ_CHECKOUT_SHA1=cd190c47f33d7ea8bfc34b4cc217ea0db78959e4 +ARG PGIS1_PROJ_CHECKOUT_SHA1=09c54c75e52662ae1a02aa2a40d51295013065e8 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index a660fe423..e3a6e79b8 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent diff --git a/README.md b/README.md index 448687ae6..e10e02a50 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-05-27) +## Versions (2025-06-02) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.0, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.1, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.1, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index 957381a3f..b2f6ba964 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -557,11 +557,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ @@ -697,11 +697,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index f3e05a022..301a5d182 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.20.1", - "TIMESCALEDB_CHECKOUT_SHA1": "4b72721692dfb0dc8726ccc5eb97b58c1a74a784", + "TIMESCALEDB_CHECKOUT": "tags/2.20.2", + "TIMESCALEDB_CHECKOUT_SHA1": "b7c7cd02585388ac6b555097ef8831c1217cc402", "DUCKDB_CHECKOUT": "tags/v1.3.0", "DUCKDB_CHECKOUT_SHA1": "71c5c07cdd295e9409c0505885033ae9eb6b5ddd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -463,8 +463,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", - "PROJ_CHECKOUT": "tags/9.6.0", - "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", + "PROJ_CHECKOUT": "tags/9.6.1", + "PROJ_CHECKOUT_SHA1": "09c54c75e52662ae1a02aa2a40d51295013065e8", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.11.0", "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.0-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -585,8 +585,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", - "PROJ_CHECKOUT": "tags/9.6.0", - "PROJ_CHECKOUT_SHA1": "cd190c47f33d7ea8bfc34b4cc217ea0db78959e4", + "PROJ_CHECKOUT": "tags/9.6.1", + "PROJ_CHECKOUT_SHA1": "09c54c75e52662ae1a02aa2a40d51295013065e8", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.11.0", "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", From ee3099c26b0973c72813a5d1c6dbd2f817fc1e9e Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 5 Jun 2025 00:08:25 +0200 Subject: [PATCH 160/167] Update to alpine 3.22 (#99) And remove alpine 3.20 Signed-off-by: ImreSamu --- .circleci/config.yml | 18 +- .github/workflows/main.yml | 18 +- 13-3.3/alpine3.21/tags | 2 +- 13-3.4/alpine3.20/tags | 1 - 13-3.4/alpine3.21/tags | 2 +- 13-3.4/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.4/alpine3.22/tags | 1 + .../update-postgis.sh | 0 13-3.5/alpine3.20/tags | 1 - 13-3.5/alpine3.21/tags | 2 +- 13-3.5/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 13-3.5/alpine3.22/tags | 1 + .../update-postgis.sh | 0 14-3.3/alpine3.21/tags | 2 +- 14-3.4/alpine3.20/tags | 1 - 14-3.4/alpine3.21/tags | 2 +- 14-3.4/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.4/alpine3.22/tags | 1 + .../update-postgis.sh | 0 14-3.5/alpine3.20/tags | 1 - 14-3.5/alpine3.21/tags | 2 +- 14-3.5/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 14-3.5/alpine3.22/tags | 1 + .../update-postgis.sh | 0 15-3.3/alpine3.21/tags | 2 +- 15-3.4/alpine3.20/tags | 1 - 15-3.4/alpine3.21/tags | 2 +- 15-3.4/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.4/alpine3.22/tags | 1 + .../update-postgis.sh | 0 15-3.5/alpine3.20/tags | 1 - 15-3.5/alpine3.21/tags | 2 +- 15-3.5/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 15-3.5/alpine3.22/tags | 1 + .../update-postgis.sh | 0 16-3.3/alpine3.21/tags | 2 +- 16-3.4/alpine3.20/tags | 1 - 16-3.4/alpine3.21/tags | 2 +- 16-3.4/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.4/alpine3.22/tags | 1 + .../update-postgis.sh | 0 16-3.5/alpine3.20/tags | 1 - 16-3.5/alpine3.21/tags | 2 +- 16-3.5/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 16-3.5/alpine3.22/tags | 1 + .../update-postgis.sh | 0 17-3.4/alpine3.21/tags | 2 +- 17-3.5/alpine3.20/tags | 1 - 17-3.5/alpine3.21/tags | 2 +- 17-3.5/{alpine3.20 => alpine3.22}/Dockerfile | 4 +- .../initdb-postgis.sh | 0 17-3.5/alpine3.22/tags | 1 + .../update-postgis.sh | 0 README.md | 56 ++-- tools/manifest.sh | 258 ++++++++---------- tools/versions.sh | 8 +- versions.json | 118 ++++---- 65 files changed, 264 insertions(+), 294 deletions(-) delete mode 100644 13-3.4/alpine3.20/tags rename 13-3.4/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 13-3.4/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 13-3.4/alpine3.22/tags rename 13-3.4/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 13-3.5/alpine3.20/tags rename 13-3.5/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 13-3.5/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 13-3.5/alpine3.22/tags rename 13-3.5/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 14-3.4/alpine3.20/tags rename 14-3.4/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 14-3.4/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 14-3.4/alpine3.22/tags rename 14-3.4/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 14-3.5/alpine3.20/tags rename 14-3.5/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 14-3.5/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 14-3.5/alpine3.22/tags rename 14-3.5/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 15-3.4/alpine3.20/tags rename 15-3.4/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 15-3.4/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 15-3.4/alpine3.22/tags rename 15-3.4/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 15-3.5/alpine3.20/tags rename 15-3.5/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 15-3.5/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 15-3.5/alpine3.22/tags rename 15-3.5/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 16-3.4/alpine3.20/tags rename 16-3.4/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 16-3.4/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 16-3.4/alpine3.22/tags rename 16-3.4/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 16-3.5/alpine3.20/tags rename 16-3.5/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 16-3.5/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 16-3.5/alpine3.22/tags rename 16-3.5/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) delete mode 100644 17-3.5/alpine3.20/tags rename 17-3.5/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 17-3.5/{alpine3.20 => alpine3.22}/initdb-postgis.sh (100%) create mode 100644 17-3.5/alpine3.22/tags rename 17-3.5/{alpine3.20 => alpine3.22}/update-postgis.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca20e0c5c..a2e187d6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,40 +127,40 @@ workflows: # #circleci-targets-start "13-3.3-alpine3.21", - "13-3.4-alpine3.20", "13-3.4-alpine3.21", - "13-3.5-alpine3.20", + "13-3.4-alpine3.22", "13-3.5-alpine3.21", + "13-3.5-alpine3.22", "13-3.5-bookworm", "13-3.5-bullseye", "14-3.3-alpine3.21", - "14-3.4-alpine3.20", "14-3.4-alpine3.21", - "14-3.5-alpine3.20", + "14-3.4-alpine3.22", "14-3.5-alpine3.21", + "14-3.5-alpine3.22", "14-3.5-bookworm", "14-3.5-bullseye", "14-l3.1.9gcp-bookworm", "15-3.3-alpine3.21", - "15-3.4-alpine3.20", "15-3.4-alpine3.21", - "15-3.5-alpine3.20", + "15-3.4-alpine3.22", "15-3.5-alpine3.21", + "15-3.5-alpine3.22", "15-3.5-bookworm", "15-3.5-bullseye", "16-3.3-alpine3.21", - "16-3.4-alpine3.20", "16-3.4-alpine3.21", - "16-3.5-alpine3.20", + "16-3.4-alpine3.22", "16-3.5-alpine3.21", + "16-3.5-alpine3.22", # --skip-- "16-3.5-bookworm", --> generated with the related bundle job! "16-3.5-bullseye", "16-3.5-bundle0-bookworm", "16-master-bookworm", "16-recent-bookworm", "17-3.4-alpine3.21", - "17-3.5-alpine3.20", "17-3.5-alpine3.21", + "17-3.5-alpine3.22", "17-3.5-bookworm", "17-3.5-bullseye", "17-master-bookworm", diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21a017e61..0fbf66bf5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,40 +28,40 @@ jobs: # #matrix-include-start - { version: "13-3.3", variant: "alpine3.21" } - - { version: "13-3.4", variant: "alpine3.20" } - { version: "13-3.4", variant: "alpine3.21" } - - { version: "13-3.5", variant: "alpine3.20" } + - { version: "13-3.4", variant: "alpine3.22" } - { version: "13-3.5", variant: "alpine3.21" } + - { version: "13-3.5", variant: "alpine3.22" } - { version: "13-3.5", variant: "bookworm" } - { version: "13-3.5", variant: "bullseye" } - { version: "14-3.3", variant: "alpine3.21" } - - { version: "14-3.4", variant: "alpine3.20" } - { version: "14-3.4", variant: "alpine3.21" } - - { version: "14-3.5", variant: "alpine3.20" } + - { version: "14-3.4", variant: "alpine3.22" } - { version: "14-3.5", variant: "alpine3.21" } + - { version: "14-3.5", variant: "alpine3.22" } - { version: "14-3.5", variant: "bookworm" } - { version: "14-3.5", variant: "bullseye" } - { version: "14-l3.1.9gcp", variant: "bookworm" } - { version: "15-3.3", variant: "alpine3.21" } - - { version: "15-3.4", variant: "alpine3.20" } - { version: "15-3.4", variant: "alpine3.21" } - - { version: "15-3.5", variant: "alpine3.20" } + - { version: "15-3.4", variant: "alpine3.22" } - { version: "15-3.5", variant: "alpine3.21" } + - { version: "15-3.5", variant: "alpine3.22" } - { version: "15-3.5", variant: "bookworm" } - { version: "15-3.5", variant: "bullseye" } - { version: "16-3.3", variant: "alpine3.21" } - - { version: "16-3.4", variant: "alpine3.20" } - { version: "16-3.4", variant: "alpine3.21" } - - { version: "16-3.5", variant: "alpine3.20" } + - { version: "16-3.4", variant: "alpine3.22" } - { version: "16-3.5", variant: "alpine3.21" } + - { version: "16-3.5", variant: "alpine3.22" } # --skip-- - { version: "16-3.5", variant: "bookworm" } --> generated with the related bundle job! - { version: "16-3.5", variant: "bullseye" } - { version: "16-3.5-bundle0", variant: "bookworm" } - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17-3.4", variant: "alpine3.21" } - - { version: "17-3.5", variant: "alpine3.20" } - { version: "17-3.5", variant: "alpine3.21" } + - { version: "17-3.5", variant: "alpine3.22" } - { version: "17-3.5", variant: "bookworm" } - { version: "17-3.5", variant: "bullseye" } - { version: "17-master", variant: "bookworm" } diff --git a/13-3.3/alpine3.21/tags b/13-3.3/alpine3.21/tags index 4ca665425..e0c9d84cf 100644 --- a/13-3.3/alpine3.21/tags +++ b/13-3.3/alpine3.21/tags @@ -1 +1 @@ -13-3.3-alpine3.21 13-3.3.8-alpine3.21 13-3.3-alpine +13-3.3-alpine3.21 13-3.3.8-alpine3.21 diff --git a/13-3.4/alpine3.20/tags b/13-3.4/alpine3.20/tags deleted file mode 100644 index 92857045e..000000000 --- a/13-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.4-alpine3.20 13-3.4.4-alpine3.20 diff --git a/13-3.4/alpine3.21/tags b/13-3.4/alpine3.21/tags index d08dc5d6f..7e94d0d91 100644 --- a/13-3.4/alpine3.21/tags +++ b/13-3.4/alpine3.21/tags @@ -1 +1 @@ -13-3.4-alpine3.21 13-3.4.4-alpine3.21 13-3.4-alpine +13-3.4-alpine3.21 13-3.4.4-alpine3.21 diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.22/Dockerfile similarity index 99% rename from 13-3.4/alpine3.20/Dockerfile rename to 13-3.4/alpine3.22/Dockerfile index bde1f3530..324c7cb3a 100644 --- a/13-3.4/alpine3.20/Dockerfile +++ b/13-3.4/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.4/alpine3.20/initdb-postgis.sh b/13-3.4/alpine3.22/initdb-postgis.sh similarity index 100% rename from 13-3.4/alpine3.20/initdb-postgis.sh rename to 13-3.4/alpine3.22/initdb-postgis.sh diff --git a/13-3.4/alpine3.22/tags b/13-3.4/alpine3.22/tags new file mode 100644 index 000000000..007526bf5 --- /dev/null +++ b/13-3.4/alpine3.22/tags @@ -0,0 +1 @@ +13-3.4-alpine3.22 13-3.4.4-alpine3.22 13-3.4-alpine diff --git a/13-3.4/alpine3.20/update-postgis.sh b/13-3.4/alpine3.22/update-postgis.sh similarity index 100% rename from 13-3.4/alpine3.20/update-postgis.sh rename to 13-3.4/alpine3.22/update-postgis.sh diff --git a/13-3.5/alpine3.20/tags b/13-3.5/alpine3.20/tags deleted file mode 100644 index 99c47a483..000000000 --- a/13-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -13-3.5-alpine3.20 13-3.5.3-alpine3.20 diff --git a/13-3.5/alpine3.21/tags b/13-3.5/alpine3.21/tags index 7fb0441c0..feaaf4678 100644 --- a/13-3.5/alpine3.21/tags +++ b/13-3.5/alpine3.21/tags @@ -1 +1 @@ -13-3.5-alpine3.21 13-3.5.3-alpine3.21 13-3.5-alpine +13-3.5-alpine3.21 13-3.5.3-alpine3.21 diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.22/Dockerfile similarity index 99% rename from 13-3.5/alpine3.20/Dockerfile rename to 13-3.5/alpine3.22/Dockerfile index 2ad2be518..aa426ce84 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:13-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/13-3.5/alpine3.20/initdb-postgis.sh b/13-3.5/alpine3.22/initdb-postgis.sh similarity index 100% rename from 13-3.5/alpine3.20/initdb-postgis.sh rename to 13-3.5/alpine3.22/initdb-postgis.sh diff --git a/13-3.5/alpine3.22/tags b/13-3.5/alpine3.22/tags new file mode 100644 index 000000000..0aea81a6d --- /dev/null +++ b/13-3.5/alpine3.22/tags @@ -0,0 +1 @@ +13-3.5-alpine3.22 13-3.5.3-alpine3.22 13-3.5-alpine diff --git a/13-3.5/alpine3.20/update-postgis.sh b/13-3.5/alpine3.22/update-postgis.sh similarity index 100% rename from 13-3.5/alpine3.20/update-postgis.sh rename to 13-3.5/alpine3.22/update-postgis.sh diff --git a/14-3.3/alpine3.21/tags b/14-3.3/alpine3.21/tags index 33cbb15d8..ee59f5760 100644 --- a/14-3.3/alpine3.21/tags +++ b/14-3.3/alpine3.21/tags @@ -1 +1 @@ -14-3.3-alpine3.21 14-3.3.8-alpine3.21 14-3.3-alpine +14-3.3-alpine3.21 14-3.3.8-alpine3.21 diff --git a/14-3.4/alpine3.20/tags b/14-3.4/alpine3.20/tags deleted file mode 100644 index 41b430df7..000000000 --- a/14-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.4-alpine3.20 14-3.4.4-alpine3.20 diff --git a/14-3.4/alpine3.21/tags b/14-3.4/alpine3.21/tags index 00bf9f873..ae61d44a4 100644 --- a/14-3.4/alpine3.21/tags +++ b/14-3.4/alpine3.21/tags @@ -1 +1 @@ -14-3.4-alpine3.21 14-3.4.4-alpine3.21 14-3.4-alpine +14-3.4-alpine3.21 14-3.4.4-alpine3.21 diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.22/Dockerfile similarity index 99% rename from 14-3.4/alpine3.20/Dockerfile rename to 14-3.4/alpine3.22/Dockerfile index 6a25334ab..5786b107a 100644 --- a/14-3.4/alpine3.20/Dockerfile +++ b/14-3.4/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.4/alpine3.20/initdb-postgis.sh b/14-3.4/alpine3.22/initdb-postgis.sh similarity index 100% rename from 14-3.4/alpine3.20/initdb-postgis.sh rename to 14-3.4/alpine3.22/initdb-postgis.sh diff --git a/14-3.4/alpine3.22/tags b/14-3.4/alpine3.22/tags new file mode 100644 index 000000000..969e16bcd --- /dev/null +++ b/14-3.4/alpine3.22/tags @@ -0,0 +1 @@ +14-3.4-alpine3.22 14-3.4.4-alpine3.22 14-3.4-alpine diff --git a/14-3.4/alpine3.20/update-postgis.sh b/14-3.4/alpine3.22/update-postgis.sh similarity index 100% rename from 14-3.4/alpine3.20/update-postgis.sh rename to 14-3.4/alpine3.22/update-postgis.sh diff --git a/14-3.5/alpine3.20/tags b/14-3.5/alpine3.20/tags deleted file mode 100644 index 7b14d9b6a..000000000 --- a/14-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -14-3.5-alpine3.20 14-3.5.3-alpine3.20 diff --git a/14-3.5/alpine3.21/tags b/14-3.5/alpine3.21/tags index c1c3a5a7d..bba48bf67 100644 --- a/14-3.5/alpine3.21/tags +++ b/14-3.5/alpine3.21/tags @@ -1 +1 @@ -14-3.5-alpine3.21 14-3.5.3-alpine3.21 14-3.5-alpine +14-3.5-alpine3.21 14-3.5.3-alpine3.21 diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.22/Dockerfile similarity index 99% rename from 14-3.5/alpine3.20/Dockerfile rename to 14-3.5/alpine3.22/Dockerfile index d5218439e..a48dd3182 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:14-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/14-3.5/alpine3.20/initdb-postgis.sh b/14-3.5/alpine3.22/initdb-postgis.sh similarity index 100% rename from 14-3.5/alpine3.20/initdb-postgis.sh rename to 14-3.5/alpine3.22/initdb-postgis.sh diff --git a/14-3.5/alpine3.22/tags b/14-3.5/alpine3.22/tags new file mode 100644 index 000000000..c5f2885c6 --- /dev/null +++ b/14-3.5/alpine3.22/tags @@ -0,0 +1 @@ +14-3.5-alpine3.22 14-3.5.3-alpine3.22 14-3.5-alpine diff --git a/14-3.5/alpine3.20/update-postgis.sh b/14-3.5/alpine3.22/update-postgis.sh similarity index 100% rename from 14-3.5/alpine3.20/update-postgis.sh rename to 14-3.5/alpine3.22/update-postgis.sh diff --git a/15-3.3/alpine3.21/tags b/15-3.3/alpine3.21/tags index a4bdf9722..6f838a72c 100644 --- a/15-3.3/alpine3.21/tags +++ b/15-3.3/alpine3.21/tags @@ -1 +1 @@ -15-3.3-alpine3.21 15-3.3.8-alpine3.21 15-3.3-alpine +15-3.3-alpine3.21 15-3.3.8-alpine3.21 diff --git a/15-3.4/alpine3.20/tags b/15-3.4/alpine3.20/tags deleted file mode 100644 index 86d005dcb..000000000 --- a/15-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.4-alpine3.20 15-3.4.4-alpine3.20 diff --git a/15-3.4/alpine3.21/tags b/15-3.4/alpine3.21/tags index 668597e90..effe2085b 100644 --- a/15-3.4/alpine3.21/tags +++ b/15-3.4/alpine3.21/tags @@ -1 +1 @@ -15-3.4-alpine3.21 15-3.4.4-alpine3.21 15-3.4-alpine +15-3.4-alpine3.21 15-3.4.4-alpine3.21 diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.22/Dockerfile similarity index 99% rename from 15-3.4/alpine3.20/Dockerfile rename to 15-3.4/alpine3.22/Dockerfile index a624e43b0..9a49924be 100644 --- a/15-3.4/alpine3.20/Dockerfile +++ b/15-3.4/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.4/alpine3.20/initdb-postgis.sh b/15-3.4/alpine3.22/initdb-postgis.sh similarity index 100% rename from 15-3.4/alpine3.20/initdb-postgis.sh rename to 15-3.4/alpine3.22/initdb-postgis.sh diff --git a/15-3.4/alpine3.22/tags b/15-3.4/alpine3.22/tags new file mode 100644 index 000000000..384e3bae3 --- /dev/null +++ b/15-3.4/alpine3.22/tags @@ -0,0 +1 @@ +15-3.4-alpine3.22 15-3.4.4-alpine3.22 15-3.4-alpine diff --git a/15-3.4/alpine3.20/update-postgis.sh b/15-3.4/alpine3.22/update-postgis.sh similarity index 100% rename from 15-3.4/alpine3.20/update-postgis.sh rename to 15-3.4/alpine3.22/update-postgis.sh diff --git a/15-3.5/alpine3.20/tags b/15-3.5/alpine3.20/tags deleted file mode 100644 index 46f976478..000000000 --- a/15-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -15-3.5-alpine3.20 15-3.5.3-alpine3.20 diff --git a/15-3.5/alpine3.21/tags b/15-3.5/alpine3.21/tags index e4964f6ad..b3f5aa56a 100644 --- a/15-3.5/alpine3.21/tags +++ b/15-3.5/alpine3.21/tags @@ -1 +1 @@ -15-3.5-alpine3.21 15-3.5.3-alpine3.21 15-3.5-alpine +15-3.5-alpine3.21 15-3.5.3-alpine3.21 diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.22/Dockerfile similarity index 99% rename from 15-3.5/alpine3.20/Dockerfile rename to 15-3.5/alpine3.22/Dockerfile index 86fd33f19..9e4c8f0f9 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:15-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/15-3.5/alpine3.20/initdb-postgis.sh b/15-3.5/alpine3.22/initdb-postgis.sh similarity index 100% rename from 15-3.5/alpine3.20/initdb-postgis.sh rename to 15-3.5/alpine3.22/initdb-postgis.sh diff --git a/15-3.5/alpine3.22/tags b/15-3.5/alpine3.22/tags new file mode 100644 index 000000000..6c8c94009 --- /dev/null +++ b/15-3.5/alpine3.22/tags @@ -0,0 +1 @@ +15-3.5-alpine3.22 15-3.5.3-alpine3.22 15-3.5-alpine diff --git a/15-3.5/alpine3.20/update-postgis.sh b/15-3.5/alpine3.22/update-postgis.sh similarity index 100% rename from 15-3.5/alpine3.20/update-postgis.sh rename to 15-3.5/alpine3.22/update-postgis.sh diff --git a/16-3.3/alpine3.21/tags b/16-3.3/alpine3.21/tags index 66c6017c6..2c98c09a9 100644 --- a/16-3.3/alpine3.21/tags +++ b/16-3.3/alpine3.21/tags @@ -1 +1 @@ -16-3.3-alpine3.21 16-3.3.8-alpine3.21 16-3.3-alpine +16-3.3-alpine3.21 16-3.3.8-alpine3.21 diff --git a/16-3.4/alpine3.20/tags b/16-3.4/alpine3.20/tags deleted file mode 100644 index b7e7dcad1..000000000 --- a/16-3.4/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.4-alpine3.20 16-3.4.4-alpine3.20 diff --git a/16-3.4/alpine3.21/tags b/16-3.4/alpine3.21/tags index fd2dbec83..a47b0b923 100644 --- a/16-3.4/alpine3.21/tags +++ b/16-3.4/alpine3.21/tags @@ -1 +1 @@ -16-3.4-alpine3.21 16-3.4.4-alpine3.21 16-3.4-alpine +16-3.4-alpine3.21 16-3.4.4-alpine3.21 diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.22/Dockerfile similarity index 99% rename from 16-3.4/alpine3.20/Dockerfile rename to 16-3.4/alpine3.22/Dockerfile index 6df0c52d6..5b6b4654b 100644 --- a/16-3.4/alpine3.20/Dockerfile +++ b/16-3.4/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.4/alpine3.20/initdb-postgis.sh b/16-3.4/alpine3.22/initdb-postgis.sh similarity index 100% rename from 16-3.4/alpine3.20/initdb-postgis.sh rename to 16-3.4/alpine3.22/initdb-postgis.sh diff --git a/16-3.4/alpine3.22/tags b/16-3.4/alpine3.22/tags new file mode 100644 index 000000000..0a3e028dc --- /dev/null +++ b/16-3.4/alpine3.22/tags @@ -0,0 +1 @@ +16-3.4-alpine3.22 16-3.4.4-alpine3.22 16-3.4-alpine diff --git a/16-3.4/alpine3.20/update-postgis.sh b/16-3.4/alpine3.22/update-postgis.sh similarity index 100% rename from 16-3.4/alpine3.20/update-postgis.sh rename to 16-3.4/alpine3.22/update-postgis.sh diff --git a/16-3.5/alpine3.20/tags b/16-3.5/alpine3.20/tags deleted file mode 100644 index 601c5ac61..000000000 --- a/16-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -16-3.5-alpine3.20 16-3.5.3-alpine3.20 diff --git a/16-3.5/alpine3.21/tags b/16-3.5/alpine3.21/tags index 349e56390..0091e1098 100644 --- a/16-3.5/alpine3.21/tags +++ b/16-3.5/alpine3.21/tags @@ -1 +1 @@ -16-3.5-alpine3.21 16-3.5.3-alpine3.21 16-3.5-alpine +16-3.5-alpine3.21 16-3.5.3-alpine3.21 diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.22/Dockerfile similarity index 99% rename from 16-3.5/alpine3.20/Dockerfile rename to 16-3.5/alpine3.22/Dockerfile index 35e793f39..7359a6966 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:16-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/16-3.5/alpine3.20/initdb-postgis.sh b/16-3.5/alpine3.22/initdb-postgis.sh similarity index 100% rename from 16-3.5/alpine3.20/initdb-postgis.sh rename to 16-3.5/alpine3.22/initdb-postgis.sh diff --git a/16-3.5/alpine3.22/tags b/16-3.5/alpine3.22/tags new file mode 100644 index 000000000..c632febe0 --- /dev/null +++ b/16-3.5/alpine3.22/tags @@ -0,0 +1 @@ +16-3.5-alpine3.22 16-3.5.3-alpine3.22 16-3.5-alpine diff --git a/16-3.5/alpine3.20/update-postgis.sh b/16-3.5/alpine3.22/update-postgis.sh similarity index 100% rename from 16-3.5/alpine3.20/update-postgis.sh rename to 16-3.5/alpine3.22/update-postgis.sh diff --git a/17-3.4/alpine3.21/tags b/17-3.4/alpine3.21/tags index c21461ffd..646c3ccf4 100644 --- a/17-3.4/alpine3.21/tags +++ b/17-3.4/alpine3.21/tags @@ -1 +1 @@ -17-3.4-alpine3.21 17-3.4.4-alpine3.21 17-3.4-alpine +17-3.4-alpine3.21 17-3.4.4-alpine3.21 diff --git a/17-3.5/alpine3.20/tags b/17-3.5/alpine3.20/tags deleted file mode 100644 index ecaea8e65..000000000 --- a/17-3.5/alpine3.20/tags +++ /dev/null @@ -1 +0,0 @@ -17-3.5-alpine3.20 17-3.5.3-alpine3.20 diff --git a/17-3.5/alpine3.21/tags b/17-3.5/alpine3.21/tags index 56ccb17fd..f1667dd61 100644 --- a/17-3.5/alpine3.21/tags +++ b/17-3.5/alpine3.21/tags @@ -1 +1 @@ -17-3.5-alpine3.21 17-3.5.3-alpine3.21 17-3.5-alpine alpine +17-3.5-alpine3.21 17-3.5.3-alpine3.21 diff --git a/17-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.22/Dockerfile similarity index 99% rename from 17-3.5/alpine3.20/Dockerfile rename to 17-3.5/alpine3.22/Dockerfile index 252db8a3e..95caa37f0 100644 --- a/17-3.5/alpine3.20/Dockerfile +++ b/17-3.5/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.20 +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.22 ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 @@ -16,7 +16,7 @@ ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.20" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" RUN set -eux \ diff --git a/17-3.5/alpine3.20/initdb-postgis.sh b/17-3.5/alpine3.22/initdb-postgis.sh similarity index 100% rename from 17-3.5/alpine3.20/initdb-postgis.sh rename to 17-3.5/alpine3.22/initdb-postgis.sh diff --git a/17-3.5/alpine3.22/tags b/17-3.5/alpine3.22/tags new file mode 100644 index 000000000..73ede3e95 --- /dev/null +++ b/17-3.5/alpine3.22/tags @@ -0,0 +1 @@ +17-3.5-alpine3.22 17-3.5.3-alpine3.22 17-3.5-alpine alpine diff --git a/17-3.5/alpine3.20/update-postgis.sh b/17-3.5/alpine3.22/update-postgis.sh similarity index 100% rename from 17-3.5/alpine3.20/update-postgis.sh rename to 17-3.5/alpine3.22/update-postgis.sh diff --git a/README.md b/README.md index e10e02a50..5b1b52ccf 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-06-02) +## Versions (2025-06-04) We provide multi-platform image support for the following architectures: @@ -131,41 +131,41 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | -| [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | -| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.3 | -| [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 | -| [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 | -| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.3 | -| [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 | -| [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 | -| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.3 | -| [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 | -| [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 | -| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.3 | -| [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 | -| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.3 | +| [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 | +| [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 | +| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.3 | +| [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 | +| [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 | +| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.3 | +| [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 | +| [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 | +| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.3 | +| [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 | +| [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 | +| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.3 | +| [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 | +| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.21) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.3 | -### ⛰️Alpine 3.20 based +### ⛰️Alpine 3.22 based - The base operating system is [Alpine Linux](https://alpinelinux.org/). It is designed to be small, simple, and secure, and it's based on [musl libc](https://musl.libc.org/). -- In the Alpine 3.20 version, the package versions are: geos=3.12.1, gdal=3.9.0, proj=9.4.0, and sfcgal=1.5.1 +- In the Alpine 3.22 version, the package versions are: geos=3.13.1, gdal=3.10.2, proj=9.6.0, and sfcgal=2.0.0 - PostGIS is compiled from source, making it a bit more challenging to extend. - + | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 | -| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.3 | -| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 | -| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.3 | -| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 | -| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.3 | -| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 | -| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.3 | -| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.3-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.3 | - +| [`13-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.22), [`13-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.22), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 13 | 3.4.4 | +| [`13-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.22), [`13-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.3-alpine3.22), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 13 | 3.5.3 | +| [`14-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.22), [`14-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.22), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 14 | 3.4.4 | +| [`14-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.22), [`14-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.3-alpine3.22), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 14 | 3.5.3 | +| [`15-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.22), [`15-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.22), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 15 | 3.4.4 | +| [`15-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.22), [`15-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.22), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 15 | 3.5.3 | +| [`16-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.22), [`16-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.22), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 16 | 3.4.4 | +| [`16-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.22), [`16-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.22), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 16 | 3.5.3 | +| [`17-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.22), [`17-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.22), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 17 | 3.5.3 | + ### 🧪Locked ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index b2f6ba964..802977981 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -27,26 +27,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.3.8-alpine3.21 \ --target ${dockername}:13-3.3.8-alpine3.21 || true -echo "manifest: ${dockername}:13-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.3-alpine \ - --target ${dockername}:13-3.3-alpine || true - -# ----- 13-3.4-alpine3.20 ----- - -echo "manifest: ${dockername}:13-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.20 \ - --target ${dockername}:13-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:13-3.4.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.20 \ - --target ${dockername}:13-3.4.4-alpine3.20 || true - # ----- 13-3.4-alpine3.21 ----- echo "manifest: ${dockername}:13-3.4-alpine3.21" @@ -61,25 +41,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.21 \ --target ${dockername}:13-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:13-3.4-alpine" +# ----- 13-3.4-alpine3.22 ----- + +echo "manifest: ${dockername}:13-3.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ - --target ${dockername}:13-3.4-alpine || true - -# ----- 13-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:13-3.4-alpine3.22 \ + --target ${dockername}:13-3.4-alpine3.22 || true -echo "manifest: ${dockername}:13-3.5-alpine3.20" +echo "manifest: ${dockername}:13-3.4.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.20 \ - --target ${dockername}:13-3.5-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4.4-alpine3.22 \ + --target ${dockername}:13-3.4.4-alpine3.22 || true -echo "manifest: ${dockername}:13-3.5.3-alpine3.20" +echo "manifest: ${dockername}:13-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:13-3.5.3-alpine3.20 \ - --target ${dockername}:13-3.5.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:13-3.4-alpine \ + --target ${dockername}:13-3.4-alpine || true # ----- 13-3.5-alpine3.21 ----- @@ -95,6 +75,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:13-3.5.3-alpine3.21 \ --target ${dockername}:13-3.5.3-alpine3.21 || true +# ----- 13-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:13-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5-alpine3.22 \ + --target ${dockername}:13-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:13-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:13-3.5.3-alpine3.22 \ + --target ${dockername}:13-3.5.3-alpine3.22 || true + echo "manifest: ${dockername}:13-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -149,26 +143,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.3.8-alpine3.21 \ --target ${dockername}:14-3.3.8-alpine3.21 || true -echo "manifest: ${dockername}:14-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.3-alpine \ - --target ${dockername}:14-3.3-alpine || true - -# ----- 14-3.4-alpine3.20 ----- - -echo "manifest: ${dockername}:14-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.20 \ - --target ${dockername}:14-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:14-3.4.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.20 \ - --target ${dockername}:14-3.4.4-alpine3.20 || true - # ----- 14-3.4-alpine3.21 ----- echo "manifest: ${dockername}:14-3.4-alpine3.21" @@ -183,25 +157,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.21 \ --target ${dockername}:14-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:14-3.4-alpine" +# ----- 14-3.4-alpine3.22 ----- + +echo "manifest: ${dockername}:14-3.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ - --target ${dockername}:14-3.4-alpine || true - -# ----- 14-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:14-3.4-alpine3.22 \ + --target ${dockername}:14-3.4-alpine3.22 || true -echo "manifest: ${dockername}:14-3.5-alpine3.20" +echo "manifest: ${dockername}:14-3.4.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.20 \ - --target ${dockername}:14-3.5-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4.4-alpine3.22 \ + --target ${dockername}:14-3.4.4-alpine3.22 || true -echo "manifest: ${dockername}:14-3.5.3-alpine3.20" +echo "manifest: ${dockername}:14-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:14-3.5.3-alpine3.20 \ - --target ${dockername}:14-3.5.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:14-3.4-alpine \ + --target ${dockername}:14-3.4-alpine || true # ----- 14-3.5-alpine3.21 ----- @@ -217,6 +191,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:14-3.5.3-alpine3.21 \ --target ${dockername}:14-3.5.3-alpine3.21 || true +# ----- 14-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:14-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5-alpine3.22 \ + --target ${dockername}:14-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:14-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:14-3.5.3-alpine3.22 \ + --target ${dockername}:14-3.5.3-alpine3.22 || true + echo "manifest: ${dockername}:14-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -285,26 +273,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.3.8-alpine3.21 \ --target ${dockername}:15-3.3.8-alpine3.21 || true -echo "manifest: ${dockername}:15-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.3-alpine \ - --target ${dockername}:15-3.3-alpine || true - -# ----- 15-3.4-alpine3.20 ----- - -echo "manifest: ${dockername}:15-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.20 \ - --target ${dockername}:15-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:15-3.4.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.20 \ - --target ${dockername}:15-3.4.4-alpine3.20 || true - # ----- 15-3.4-alpine3.21 ----- echo "manifest: ${dockername}:15-3.4-alpine3.21" @@ -319,25 +287,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.21 \ --target ${dockername}:15-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:15-3.4-alpine" +# ----- 15-3.4-alpine3.22 ----- + +echo "manifest: ${dockername}:15-3.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ - --target ${dockername}:15-3.4-alpine || true - -# ----- 15-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:15-3.4-alpine3.22 \ + --target ${dockername}:15-3.4-alpine3.22 || true -echo "manifest: ${dockername}:15-3.5-alpine3.20" +echo "manifest: ${dockername}:15-3.4.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.20 \ - --target ${dockername}:15-3.5-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4.4-alpine3.22 \ + --target ${dockername}:15-3.4.4-alpine3.22 || true -echo "manifest: ${dockername}:15-3.5.3-alpine3.20" +echo "manifest: ${dockername}:15-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:15-3.5.3-alpine3.20 \ - --target ${dockername}:15-3.5.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:15-3.4-alpine \ + --target ${dockername}:15-3.4-alpine || true # ----- 15-3.5-alpine3.21 ----- @@ -353,6 +321,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:15-3.5.3-alpine3.21 \ --target ${dockername}:15-3.5.3-alpine3.21 || true +# ----- 15-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:15-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5-alpine3.22 \ + --target ${dockername}:15-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:15-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:15-3.5.3-alpine3.22 \ + --target ${dockername}:15-3.5.3-alpine3.22 || true + echo "manifest: ${dockername}:15-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -407,26 +389,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.3.8-alpine3.21 \ --target ${dockername}:16-3.3.8-alpine3.21 || true -echo "manifest: ${dockername}:16-3.3-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.3-alpine \ - --target ${dockername}:16-3.3-alpine || true - -# ----- 16-3.4-alpine3.20 ----- - -echo "manifest: ${dockername}:16-3.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.20 \ - --target ${dockername}:16-3.4-alpine3.20 || true - -echo "manifest: ${dockername}:16-3.4.4-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.20 \ - --target ${dockername}:16-3.4.4-alpine3.20 || true - # ----- 16-3.4-alpine3.21 ----- echo "manifest: ${dockername}:16-3.4-alpine3.21" @@ -441,25 +403,25 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.21 \ --target ${dockername}:16-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:16-3.4-alpine" +# ----- 16-3.4-alpine3.22 ----- + +echo "manifest: ${dockername}:16-3.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ - --target ${dockername}:16-3.4-alpine || true - -# ----- 16-3.5-alpine3.20 ----- + --template ${dockername}-ARCHVARIANT:16-3.4-alpine3.22 \ + --target ${dockername}:16-3.4-alpine3.22 || true -echo "manifest: ${dockername}:16-3.5-alpine3.20" +echo "manifest: ${dockername}:16-3.4.4-alpine3.22" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.20 \ - --target ${dockername}:16-3.5-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4.4-alpine3.22 \ + --target ${dockername}:16-3.4.4-alpine3.22 || true -echo "manifest: ${dockername}:16-3.5.3-alpine3.20" +echo "manifest: ${dockername}:16-3.4-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-3.5.3-alpine3.20 \ - --target ${dockername}:16-3.5.3-alpine3.20 || true + --template ${dockername}-ARCHVARIANT:16-3.4-alpine \ + --target ${dockername}:16-3.4-alpine || true # ----- 16-3.5-alpine3.21 ----- @@ -475,6 +437,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-3.5.3-alpine3.21 \ --target ${dockername}:16-3.5.3-alpine3.21 || true +# ----- 16-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:16-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5-alpine3.22 \ + --target ${dockername}:16-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:16-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:16-3.5.3-alpine3.22 \ + --target ${dockername}:16-3.5.3-alpine3.22 || true + echo "manifest: ${dockername}:16-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ @@ -589,26 +565,6 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.21 \ --target ${dockername}:17-3.4.4-alpine3.21 || true -echo "manifest: ${dockername}:17-3.4-alpine" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.4-alpine \ - --target ${dockername}:17-3.4-alpine || true - -# ----- 17-3.5-alpine3.20 ----- - -echo "manifest: ${dockername}:17-3.5-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.20 \ - --target ${dockername}:17-3.5-alpine3.20 || true - -echo "manifest: ${dockername}:17-3.5.3-alpine3.20" -manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-3.5.3-alpine3.20 \ - --target ${dockername}:17-3.5.3-alpine3.20 || true - # ----- 17-3.5-alpine3.21 ----- echo "manifest: ${dockername}:17-3.5-alpine3.21" @@ -623,6 +579,20 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5.3-alpine3.21 \ --target ${dockername}:17-3.5.3-alpine3.21 || true +# ----- 17-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:17-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-alpine3.22 \ + --target ${dockername}:17-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:17-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.3-alpine3.22 \ + --target ${dockername}:17-3.5.3-alpine3.22 || true + echo "manifest: ${dockername}:17-3.5-alpine" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ diff --git a/tools/versions.sh b/tools/versions.sh index b8b780be9..570f335e8 100755 --- a/tools/versions.sh +++ b/tools/versions.sh @@ -18,11 +18,11 @@ source tools/environment_init.sh api_preference="github" #api_preference="osgeo" -- not working yet -alpine_variants=" alpine3.20 alpine3.21 " +alpine_variants=" alpine3.21 alpine3.22 " debian_variants=" bullseye bookworm " debian_latest="bookworm" -alpine_latest="alpine3.21" +alpine_latest="alpine3.22" postgis_latest="3.5" postgres_latest="17" postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" @@ -59,8 +59,8 @@ declare -A postgisDebPkgNameVersionSuffixes=( declare -A boostVersion=( ["bullseye"]="1.74.0" ["bookworm"]="1.74.0" # 1.81.0 is not yet optimal. The current bookworm packages mixed use of 1.74.0 and 1.81.0 - ["alpine3.19"]="1.82.0" - ["alpine3.20"]="1.82.0" + ["alpine3.21"]="1.82.0" + ["alpine3.22"]="1.82.0" ) # function get_tag_hash() { diff --git a/versions.json b/versions.json index 301a5d182..1dd005774 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "13-3.3": { "alpine3.21": { - "tags": "13-3.3-alpine3.21 13-3.3.8-alpine3.21 13-3.3-alpine", + "tags": "13-3.3-alpine3.21 13-3.3.8-alpine3.21", "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", @@ -16,9 +16,9 @@ } }, "13-3.4": { - "alpine3.20": { - "tags": "13-3.4-alpine3.20 13-3.4.4-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "13-3.4-alpine3.21 13-3.4.4-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -30,9 +30,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.21": { - "tags": "13-3.4-alpine3.21 13-3.4.4-alpine3.21 13-3.4-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "13-3.4-alpine3.22 13-3.4.4-alpine3.22 13-3.4-alpine", + "readme_group": "alpine3.22", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -70,9 +70,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, - "alpine3.20": { - "tags": "13-3.5-alpine3.20 13-3.5.3-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "13-3.5-alpine3.21 13-3.5.3-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -84,9 +84,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, - "alpine3.21": { - "tags": "13-3.5-alpine3.21 13-3.5.3-alpine3.21 13-3.5-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "13-3.5-alpine3.22 13-3.5.3-alpine3.22 13-3.5-alpine", + "readme_group": "alpine3.22", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -101,7 +101,7 @@ }, "14-3.3": { "alpine3.21": { - "tags": "14-3.3-alpine3.21 14-3.3.8-alpine3.21 14-3.3-alpine", + "tags": "14-3.3-alpine3.21 14-3.3.8-alpine3.21", "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", @@ -116,9 +116,9 @@ } }, "14-3.4": { - "alpine3.20": { - "tags": "14-3.4-alpine3.20 14-3.4.4-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "14-3.4-alpine3.21 14-3.4.4-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -130,9 +130,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.21": { - "tags": "14-3.4-alpine3.21 14-3.4.4-alpine3.21 14-3.4-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "14-3.4-alpine3.22 14-3.4.4-alpine3.22 14-3.4-alpine", + "readme_group": "alpine3.22", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -170,9 +170,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, - "alpine3.20": { - "tags": "14-3.5-alpine3.20 14-3.5.3-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "14-3.5-alpine3.21 14-3.5.3-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -184,9 +184,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, - "alpine3.21": { - "tags": "14-3.5-alpine3.21 14-3.5.3-alpine3.21 14-3.5-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "14-3.5-alpine3.22 14-3.5.3-alpine3.22 14-3.5-alpine", + "readme_group": "alpine3.22", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -201,7 +201,7 @@ }, "15-3.3": { "alpine3.21": { - "tags": "15-3.3-alpine3.21 15-3.3.8-alpine3.21 15-3.3-alpine", + "tags": "15-3.3-alpine3.21 15-3.3.8-alpine3.21", "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", @@ -216,9 +216,9 @@ } }, "15-3.4": { - "alpine3.20": { - "tags": "15-3.4-alpine3.20 15-3.4.4-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "15-3.4-alpine3.21 15-3.4.4-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -230,9 +230,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.21": { - "tags": "15-3.4-alpine3.21 15-3.4.4-alpine3.21 15-3.4-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "15-3.4-alpine3.22 15-3.4.4-alpine3.22 15-3.4-alpine", + "readme_group": "alpine3.22", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -270,9 +270,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, - "alpine3.20": { - "tags": "15-3.5-alpine3.20 15-3.5.3-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "15-3.5-alpine3.21 15-3.5.3-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -284,9 +284,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, - "alpine3.21": { - "tags": "15-3.5-alpine3.21 15-3.5.3-alpine3.21 15-3.5-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "15-3.5-alpine3.22 15-3.5.3-alpine3.22 15-3.5-alpine", + "readme_group": "alpine3.22", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -301,7 +301,7 @@ }, "16-3.3": { "alpine3.21": { - "tags": "16-3.3-alpine3.21 16-3.3.8-alpine3.21 16-3.3-alpine", + "tags": "16-3.3-alpine3.21 16-3.3.8-alpine3.21", "readme_group": "alpine3.21", "postgis": "3.3", "arch": "amd64 arm64", @@ -316,9 +316,9 @@ } }, "16-3.4": { - "alpine3.20": { - "tags": "16-3.4-alpine3.20 16-3.4.4-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "16-3.4-alpine3.21 16-3.4.4-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -330,9 +330,9 @@ "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" }, - "alpine3.21": { - "tags": "16-3.4-alpine3.21 16-3.4.4-alpine3.21 16-3.4-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "16-3.4-alpine3.22 16-3.4.4-alpine3.22 16-3.4-alpine", + "readme_group": "alpine3.22", "postgis": "3.4", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -370,9 +370,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, - "alpine3.20": { - "tags": "16-3.5-alpine3.20 16-3.5.3-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "16-3.5-alpine3.21 16-3.5.3-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -384,9 +384,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, - "alpine3.21": { - "tags": "16-3.5-alpine3.21 16-3.5.3-alpine3.21 16-3.5-alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "16-3.5-alpine3.22 16-3.5.3-alpine3.22 16-3.5-alpine", + "readme_group": "alpine3.22", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -479,7 +479,7 @@ }, "17-3.4": { "alpine3.21": { - "tags": "17-3.4-alpine3.21 17-3.4.4-alpine3.21 17-3.4-alpine", + "tags": "17-3.4-alpine3.21 17-3.4.4-alpine3.21", "readme_group": "alpine3.21", "postgis": "3.4", "arch": "amd64 arm64", @@ -518,9 +518,9 @@ "POSTGIS_MAJOR": "3", "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" }, - "alpine3.20": { - "tags": "17-3.5-alpine3.20 17-3.5.3-alpine3.20", - "readme_group": "alpine3.20", + "alpine3.21": { + "tags": "17-3.5-alpine3.21 17-3.5.3-alpine3.21", + "readme_group": "alpine3.21", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", @@ -532,9 +532,9 @@ "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" }, - "alpine3.21": { - "tags": "17-3.5-alpine3.21 17-3.5.3-alpine3.21 17-3.5-alpine alpine", - "readme_group": "alpine3.21", + "alpine3.22": { + "tags": "17-3.5-alpine3.22 17-3.5.3-alpine3.22 17-3.5-alpine alpine", + "readme_group": "alpine3.22", "postgis": "3.5", "arch": "amd64 arm64", "template": "Dockerfile.alpine.template", From dfe01a35642fe36d961a034a585168d8620ca88a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 22:34:05 +0200 Subject: [PATCH 161/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20PROJ:?= =?UTF-8?q?9.6.2=20(#100)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-recent/bookworm/Dockerfile | 4 ++-- 16-recent/bookworm/tags | 2 +- 17-recent/bookworm/Dockerfile | 4 ++-- 17-recent/bookworm/tags | 2 +- README.md | 6 +++--- tools/manifest.sh | 12 ++++++------ versions.json | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index d54398c20..4f28da9e3 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.6.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.2 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b -ARG PGIS1_PROJ_CHECKOUT_SHA1=09c54c75e52662ae1a02aa2a40d51295013065e8 +ARG PGIS1_PROJ_CHECKOUT_SHA1=7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 2e7e85f30..061fc06f8 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 7bfc22737..42a977a6c 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -19,7 +19,7 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 -ARG PGIS1_PROJ_CHECKOUT=tags/9.6.1 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.2 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 @@ -28,7 +28,7 @@ ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b -ARG PGIS1_PROJ_CHECKOUT_SHA1=09c54c75e52662ae1a02aa2a40d51295013065e8 +ARG PGIS1_PROJ_CHECKOUT_SHA1=7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index e3a6e79b8..2506da7a5 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent diff --git a/README.md b/README.md index 5b1b52ccf..bfd9f054b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-06-04) +## Versions (2025-06-06) We provide multi-platform image support for the following architectures: @@ -104,8 +104,8 @@ For those new to PostGIS, we recommend the following image versions: | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.1, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.1, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.2, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.2, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | ### 🧪Debian Geo Bundle ( experimental ) diff --git a/tools/manifest.sh b/tools/manifest.sh index 802977981..06639f203 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -533,11 +533,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ @@ -667,11 +667,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index 1dd005774..668b12c6d 100644 --- a/versions.json +++ b/versions.json @@ -453,7 +453,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -463,8 +463,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", - "PROJ_CHECKOUT": "tags/9.6.1", - "PROJ_CHECKOUT_SHA1": "09c54c75e52662ae1a02aa2a40d51295013065e8", + "PROJ_CHECKOUT": "tags/9.6.2", + "PROJ_CHECKOUT_SHA1": "7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.11.0", "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", @@ -575,7 +575,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.1-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -585,8 +585,8 @@ "initfile": "initdb-postgis.sh", "POSTGIS_CHECKOUT": "tags/3.5.3", "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", - "PROJ_CHECKOUT": "tags/9.6.1", - "PROJ_CHECKOUT_SHA1": "09c54c75e52662ae1a02aa2a40d51295013065e8", + "PROJ_CHECKOUT": "tags/9.6.2", + "PROJ_CHECKOUT_SHA1": "7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54", "GDAL_BUILD": "with_extra", "GDAL_CHECKOUT": "tags/v3.11.0", "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", From cc702ed986c8e4608701eee7a9f6bfdc1fab9981 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Jun 2025 22:18:48 +0200 Subject: [PATCH 162/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20TIMES?= =?UTF-8?q?CALEDB:2.20.3=20(#101)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 4 ++-- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index c8032360d..230dae2d4 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.2 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=b7c7cd02585388ac6b555097ef8831c1217cc402 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.3 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7b30533d4d9b6ce1353b8bac0ba6215be20f2633 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/README.md b/README.md index bfd9f054b..2cf795fbb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-06-06) +## Versions (2025-06-11) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 668b12c6d..c54ec9e33 100644 --- a/versions.json +++ b/versions.json @@ -415,8 +415,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.20.2", - "TIMESCALEDB_CHECKOUT_SHA1": "b7c7cd02585388ac6b555097ef8831c1217cc402", + "TIMESCALEDB_CHECKOUT": "tags/2.20.3", + "TIMESCALEDB_CHECKOUT_SHA1": "7b30533d4d9b6ce1353b8bac0ba6215be20f2633", "DUCKDB_CHECKOUT": "tags/v1.3.0", "DUCKDB_CHECKOUT_SHA1": "71c5c07cdd295e9409c0505885033ae9eb6b5ddd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", From 3a49ade278f7d4db24635da1d8d35ec4bf2d3f61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 22:47:43 +0200 Subject: [PATCH 163/167] =?UTF-8?q?=F0=9F=A4=96=20Bump=20versions:=20DUCKD?= =?UTF-8?q?B:v1.3.1=20(#102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ImreSamu --- 16-3.5-bundle0/bookworm/Dockerfile | 2 +- README.md | 2 +- versions.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 230dae2d4..f439feeba 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -39,7 +39,7 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 -ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.3.0 +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.3.1 FROM ${PGIS1_BASE_IMAGE} AS builder diff --git a/README.md b/README.md index 2cf795fbb..cbca2b81e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-06-11) +## Versions (2025-06-16) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index c54ec9e33..989fc7322 100644 --- a/versions.json +++ b/versions.json @@ -417,8 +417,8 @@ "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", "TIMESCALEDB_CHECKOUT": "tags/2.20.3", "TIMESCALEDB_CHECKOUT_SHA1": "7b30533d4d9b6ce1353b8bac0ba6215be20f2633", - "DUCKDB_CHECKOUT": "tags/v1.3.0", - "DUCKDB_CHECKOUT_SHA1": "71c5c07cdd295e9409c0505885033ae9eb6b5ddd", + "DUCKDB_CHECKOUT": "tags/v1.3.1", + "DUCKDB_CHECKOUT_SHA1": "2063dda3e6bd955c364ce8e61939c6248a907be6", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "54b4b0358a6c96dc80b2b836bba50937415753b6", "POSTGIS_MAJOR": "3", From c9a55cecd07a44533cfc65ef9439a8573cea65a9 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Mon, 30 Jun 2025 08:29:29 +0200 Subject: [PATCH 164/167] Refactoring (#103) Major Version Additions - PostgreSQL 18 Support: Added PostgreSQL 18beta1 with PostGIS 3.5 and 3.6 variants - PostGIS 3.6: New PostGIS 3.6.0alpha1 support for cutting-edge geospatial features - Bundle Images: Created extended 17-3.5-bundle0 variant with additional geospatial tools Infrastructure Improvements - Advanced Caching System: Implemented intelligent API caching reducing build times from 10 minutes to 21 seconds - Local Development Tools: Added comprehensive setup script for local testing environment - Multi-Architecture Support: Enhanced ARM64/AMD64 builds with improved manifest handling (experimental) - .github/workflows/test_manifest.yml Build System Enhancements - Template System Overhaul: Refined Dockerfile templates for better maintainability - CI/CD Pipeline: New GitHub Actions workflows for automated testing and manifest generation - Version Management: Improved automatic version detection with GitHub API rate limiting protection - Quality Assurance: Enhanced testing framework for bundle variants and PostGIS functionality Developer Experience - Makefile Improvements: Better target management and build process optimization - Cache Helper Tools: New utilities for managing build cache and API rate limits etc. --- .circleci/config.yml | 10 +- .dockerignore | 3 + .github/workflows/main.yml | 10 +- .github/workflows/test_manifest.yml | 484 ++++++++++++++ .github/workflows/update.yml | 2 +- .gitignore | 5 +- 13-3.3/alpine3.21/Dockerfile | 148 ++++- 13-3.4/alpine3.21/Dockerfile | 148 ++++- 13-3.4/alpine3.22/Dockerfile | 148 ++++- 13-3.5/alpine3.21/Dockerfile | 148 ++++- 13-3.5/alpine3.22/Dockerfile | 148 ++++- 13-3.5/bookworm/Dockerfile | 92 ++- 13-3.5/bullseye/Dockerfile | 92 ++- 14-3.3/alpine3.21/Dockerfile | 148 ++++- 14-3.4/alpine3.21/Dockerfile | 148 ++++- 14-3.4/alpine3.22/Dockerfile | 148 ++++- 14-3.5/alpine3.21/Dockerfile | 148 ++++- 14-3.5/alpine3.22/Dockerfile | 148 ++++- 14-3.5/bookworm/Dockerfile | 92 ++- 14-3.5/bullseye/Dockerfile | 92 ++- 14-l3.1.9gcp/bookworm/Dockerfile | 43 +- 15-3.3/alpine3.21/Dockerfile | 148 ++++- 15-3.4/alpine3.21/Dockerfile | 148 ++++- 15-3.4/alpine3.22/Dockerfile | 148 ++++- 15-3.5/alpine3.21/Dockerfile | 148 ++++- 15-3.5/alpine3.22/Dockerfile | 148 ++++- 15-3.5/bookworm/Dockerfile | 92 ++- 15-3.5/bullseye/Dockerfile | 92 ++- 16-3.3/alpine3.21/Dockerfile | 148 ++++- 16-3.4/alpine3.21/Dockerfile | 148 ++++- 16-3.4/alpine3.22/Dockerfile | 148 ++++- 16-3.5-bundle0/bookworm/Dockerfile | 231 +++---- 16-3.5/alpine3.21/Dockerfile | 148 ++++- 16-3.5/alpine3.22/Dockerfile | 148 ++++- 16-3.5/bookworm/Dockerfile | 92 ++- 16-3.5/bullseye/Dockerfile | 92 ++- 16-master/bookworm/Dockerfile | 52 +- 16-recent/bookworm/Dockerfile | 52 +- 17-3.4/alpine3.21/Dockerfile | 148 ++++- 17-3.4/alpine3.22/Dockerfile | 222 +++++++ 17-3.4/alpine3.22/initdb-postgis.sh | 25 + 17-3.4/alpine3.22/tags | 1 + 17-3.4/alpine3.22/update-postgis.sh | 28 + 17-3.5-bundle0/bookworm/Dockerfile | 364 ++++++++++ 17-3.5-bundle0/bookworm/initdb-bundle0.sh | 9 + 17-3.5-bundle0/bookworm/tags | 1 + 17-3.5/alpine3.21/Dockerfile | 148 ++++- 17-3.5/alpine3.22/Dockerfile | 148 ++++- 17-3.5/bookworm/Dockerfile | 92 ++- 17-3.5/bullseye/Dockerfile | 92 ++- 17-3.6/alpine3.22/Dockerfile | 222 +++++++ 17-3.6/alpine3.22/initdb-postgis.sh | 25 + 17-3.6/alpine3.22/tags | 1 + 17-3.6/alpine3.22/update-postgis.sh | 28 + 17-master/bookworm/Dockerfile | 52 +- 17-recent/bookworm/Dockerfile | 52 +- 18-3.5/alpine3.22/Dockerfile | 222 +++++++ 18-3.5/alpine3.22/initdb-postgis.sh | 25 + 18-3.5/alpine3.22/tags | 1 + 18-3.5/alpine3.22/update-postgis.sh | 28 + 18-3.5/bookworm/Dockerfile | 93 +++ 18-3.5/bookworm/initdb-postgis.sh | 25 + 18-3.5/bookworm/tags | 1 + 18-3.5/bookworm/update-postgis.sh | 28 + 18-3.6/alpine3.22/Dockerfile | 222 +++++++ 18-3.6/alpine3.22/initdb-postgis.sh | 25 + 18-3.6/alpine3.22/tags | 1 + 18-3.6/alpine3.22/update-postgis.sh | 28 + 18-master/bookworm/Dockerfile | 772 ++++++++++++++++++++++ 18-master/bookworm/initdb-postgis.sh | 25 + 18-master/bookworm/tags | 1 + 18-master/bookworm/update-postgis.sh | 28 + 18-recent/bookworm/Dockerfile | 772 ++++++++++++++++++++++ 18-recent/bookworm/initdb-postgis.sh | 25 + 18-recent/bookworm/tags | 1 + 18-recent/bookworm/update-postgis.sh | 28 + Makefile | 155 ++++- README.md | 32 +- templates/Dockerfile.alpine.template | 148 ++++- templates/Dockerfile.bundle0.template | 257 +++---- templates/Dockerfile.debian.template | 96 ++- templates/Dockerfile.master.template | 52 +- test/tests/postgis-bundle/run.sh | 57 +- tools/cache_helper.sh | 154 +++++ tools/environment_init.sh | 10 +- tools/install_dive.sh | 8 +- tools/install_manifest-tool.sh | 2 +- tools/install_shellcheck.sh | 2 +- tools/manifest.sh | 154 +++++ tools/setup_local_environment.sh | 118 ++++ tools/versions.sh | 226 +++++-- versions.json | 152 ++++- versions.schema.json | 10 +- 93 files changed, 8779 insertions(+), 1451 deletions(-) create mode 100644 .github/workflows/test_manifest.yml create mode 100644 17-3.4/alpine3.22/Dockerfile create mode 100644 17-3.4/alpine3.22/initdb-postgis.sh create mode 100644 17-3.4/alpine3.22/tags create mode 100755 17-3.4/alpine3.22/update-postgis.sh create mode 100644 17-3.5-bundle0/bookworm/Dockerfile create mode 100644 17-3.5-bundle0/bookworm/initdb-bundle0.sh create mode 100644 17-3.5-bundle0/bookworm/tags create mode 100644 17-3.6/alpine3.22/Dockerfile create mode 100644 17-3.6/alpine3.22/initdb-postgis.sh create mode 100644 17-3.6/alpine3.22/tags create mode 100755 17-3.6/alpine3.22/update-postgis.sh create mode 100644 18-3.5/alpine3.22/Dockerfile create mode 100644 18-3.5/alpine3.22/initdb-postgis.sh create mode 100644 18-3.5/alpine3.22/tags create mode 100755 18-3.5/alpine3.22/update-postgis.sh create mode 100644 18-3.5/bookworm/Dockerfile create mode 100644 18-3.5/bookworm/initdb-postgis.sh create mode 100644 18-3.5/bookworm/tags create mode 100755 18-3.5/bookworm/update-postgis.sh create mode 100644 18-3.6/alpine3.22/Dockerfile create mode 100644 18-3.6/alpine3.22/initdb-postgis.sh create mode 100644 18-3.6/alpine3.22/tags create mode 100755 18-3.6/alpine3.22/update-postgis.sh create mode 100644 18-master/bookworm/Dockerfile create mode 100644 18-master/bookworm/initdb-postgis.sh create mode 100644 18-master/bookworm/tags create mode 100755 18-master/bookworm/update-postgis.sh create mode 100644 18-recent/bookworm/Dockerfile create mode 100644 18-recent/bookworm/initdb-postgis.sh create mode 100644 18-recent/bookworm/tags create mode 100755 18-recent/bookworm/update-postgis.sh create mode 100755 tools/cache_helper.sh create mode 100755 tools/setup_local_environment.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index a2e187d6e..f464ba66d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,11 +159,19 @@ workflows: "16-master-bookworm", "16-recent-bookworm", "17-3.4-alpine3.21", + "17-3.4-alpine3.22", "17-3.5-alpine3.21", "17-3.5-alpine3.22", - "17-3.5-bookworm", +# --skip-- "17-3.5-bookworm", --> generated with the related bundle job! "17-3.5-bullseye", + "17-3.5-bundle0-bookworm", + "17-3.6-alpine3.22", "17-master-bookworm", "17-recent-bookworm", + "18-3.5-alpine3.22", + "18-3.5-bookworm", + "18-3.6-alpine3.22", + "18-master-bookworm", + "18-recent-bookworm", #circleci-targets-end ] diff --git a/.dockerignore b/.dockerignore index 6f46be0cc..7337eb52b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -19,3 +19,6 @@ apply-*.sh trivy_cache tmp/ + +venv-docker-postgis/ +tools/dive \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0fbf66bf5..524befde4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,12 +60,20 @@ jobs: - { version: "16-master", variant: "bookworm" } - { version: "16-recent", variant: "bookworm" } - { version: "17-3.4", variant: "alpine3.21" } + - { version: "17-3.4", variant: "alpine3.22" } - { version: "17-3.5", variant: "alpine3.21" } - { version: "17-3.5", variant: "alpine3.22" } - - { version: "17-3.5", variant: "bookworm" } +# --skip-- - { version: "17-3.5", variant: "bookworm" } --> generated with the related bundle job! - { version: "17-3.5", variant: "bullseye" } + - { version: "17-3.5-bundle0", variant: "bookworm" } + - { version: "17-3.6", variant: "alpine3.22" } - { version: "17-master", variant: "bookworm" } - { version: "17-recent", variant: "bookworm" } + - { version: "18-3.5", variant: "alpine3.22" } + - { version: "18-3.5", variant: "bookworm" } + - { version: "18-3.6", variant: "alpine3.22" } + - { version: "18-master", variant: "bookworm" } + - { version: "18-recent", variant: "bookworm" } #matrix-include-end name: "${{ matrix.version }}-${{ matrix.variant }} docker image" diff --git a/.github/workflows/test_manifest.yml b/.github/workflows/test_manifest.yml new file mode 100644 index 000000000..8afc57b9b --- /dev/null +++ b/.github/workflows/test_manifest.yml @@ -0,0 +1,484 @@ +name: Multi-Architecture Docker Manifest Test + +on: + workflow_dispatch: + inputs: + push_images: + description: 'Push images to registry' + required: false + default: true + type: boolean + additional_registries: + description: 'Additional registries (comma-separated, e.g., ghcr.io,quay.io)' + required: false + default: '' + type: string + push: + paths: + - '.github/workflows/test_manifest.yml' + - '18-3.5/bookworm/**' + - '18-3.6/alpine3.22/**' + pull_request: + paths: + - '.github/workflows/test_manifest.yml' + - '18-3.5/bookworm/**' + - '18-3.6/alpine3.22/**' + +defaults: + run: + shell: bash + +env: + DOCKER_BUILDKIT: '1' + REGISTRY: 'docker.io' + REPO_NAME: 'imresamu' + IMAGE_NAME: 'postgistest' + +jobs: + build-images: + strategy: + fail-fast: false + matrix: + include: + # 18-3.5/bookworm builds + - image_dir: "18-3.5/bookworm" + target: "linux/amd64" + runner: "ubuntu-22.04" + arch_variant: "amd64" + - image_dir: "18-3.5/bookworm" + target: "linux/arm64" + runner: "ubuntu-22.04-arm" + arch_variant: "arm64" +# - image_dir: "18-3.5/bookworm" +# target: "linux/arm/v6" +# runner: "ubuntu-22.04-arm" +# arch_variant: "armv6" +# - image_dir: "18-3.5/bookworm" +# target: "linux/arm/v7" +# runner: "ubuntu-22.04-arm" +# arch_variant: "armv7" + + # 18-3.6/alpine3.22 builds + - image_dir: "18-3.6/alpine3.22" + target: "linux/amd64" + runner: "ubuntu-22.04" + arch_variant: "amd64" + - image_dir: "18-3.6/alpine3.22" + target: "linux/arm64" + runner: "ubuntu-22.04-arm" + arch_variant: "arm64" +# - image_dir: "18-3.6/alpine3.22" +# target: "linux/arm/v6" +# runner: "ubuntu-22.04-arm" +# arch_variant: "armv6" +# - image_dir: "18-3.6/alpine3.22" +# target: "linux/arm/v7" +# runner: "ubuntu-22.04-arm" +# arch_variant: "armv7" + + # Future architecture support + # - target: "linux/mips64le" + # runner: "ubuntu-22.04" + # arch_variant: "mips64le" + # - target: "linux/ppc64le" + # runner: "ubuntu-22.04" + # arch_variant: "ppc64le" + # - target: "linux/s390x" + # runner: "ubuntu-22.04" + # arch_variant: "s390x" + # - target: "linux/386" + # runner: "ubuntu-22.04" + # arch_variant: "386" + + name: "Build ${{ matrix.image_dir }} for ${{ matrix.arch_variant }}" + runs-on: ${{ matrix.runner }} + continue-on-error: false + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Set up QEMU for cross-platform builds + uses: docker/setup-qemu-action@v3 + with: + platforms: all + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + install: true + driver-opts: network=host + + - name: Install build dependencies + run: | + set -x + pip3 install --upgrade pip lastversion check-jsonschema + tools/install_manifest-tool.sh + tools/environment_init.sh + + - name: Check Docker Hub credentials + if: ${{ inputs.push_images }} + run: | + set -x + [[ -n "${{ secrets.DOCKERHUB_USERNAME }}" ]] || { echo "DOCKERHUB_USERNAME missing"; exit 1; } + [[ -n "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" ]] || { echo "DOCKERHUB_ACCESS_TOKEN missing"; exit 1; } + + - name: Login to Docker Hub + uses: docker/login-action@v3 + if: ${{ inputs.push_images && (github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch') }} + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: Login to additional registries + if: ${{ inputs.push_images && inputs.additional_registries != '' }} + run: | + set -x + IFS=',' read -ra REGISTRIES <<< "${{ inputs.additional_registries }}" + for registry in "${REGISTRIES[@]}"; do + registry=$(echo "$registry" | xargs) + case "$registry" in + "ghcr.io") + echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin + ;; + "quay.io") + if [[ -n "${{ secrets.QUAY_USERNAME }}" && -n "${{ secrets.QUAY_TOKEN }}" ]]; then + echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u "${{ secrets.QUAY_USERNAME }}" --password-stdin + else + echo "Quay.io credentials not configured, skipping" + fi + ;; + *) + echo "Registry $registry not supported, skipping" + ;; + esac + done + + - name: Read tags from directory + id: read-tags + run: | + set -x + TAGS_FILE="${{ matrix.image_dir }}/tags" + [[ -f "$TAGS_FILE" ]] || { echo "Tags file not found: $TAGS_FILE"; exit 1; } + cat "$TAGS_FILE" + TAGS=$(cat "$TAGS_FILE" | tr ' ' '\n' | sed '/^$/d' | jq -R . | jq -s . | jq -c .) + echo "tags<> $GITHUB_OUTPUT + echo "$TAGS" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + + - name: Generate Docker build tags + id: generate-tags + run: | + set -x + TAGS_JSON='${{ steps.read-tags.outputs.tags }}' + DOCKER_TAGS="" + ALL_REGISTRIES="${{ env.REGISTRY }}" + + if [[ -n "${{ inputs.additional_registries }}" ]]; then + IFS=',' read -ra ADDITIONAL <<< "${{ inputs.additional_registries }}" + for reg in "${ADDITIONAL[@]}"; do + reg=$(echo "$reg" | xargs) + ALL_REGISTRIES="$ALL_REGISTRIES,$reg" + done + fi + + IFS=',' read -ra REGISTRIES <<< "$ALL_REGISTRIES" + for registry in "${REGISTRIES[@]}"; do + registry=$(echo "$registry" | xargs) + for tag in $(echo "$TAGS_JSON" | jq -r '.[]'); do + case "$registry" in + "ghcr.io") + FULL_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${{ matrix.arch_variant }}:${tag}" + ;; + "quay.io") + FULL_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${{ matrix.arch_variant }}:${tag}" + ;; + *) + FULL_TAG="$registry/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}-${{ matrix.arch_variant }}:${tag}" + ;; + esac + + [[ -z "$DOCKER_TAGS" ]] && DOCKER_TAGS="$FULL_TAG" || DOCKER_TAGS="$DOCKER_TAGS,$FULL_TAG" + done + done + + echo "docker_tags=$DOCKER_TAGS" >> $GITHUB_OUTPUT + echo "Generated tags:" + echo "$DOCKER_TAGS" | tr ',' '\n' + + - name: Build Docker image + uses: docker/build-push-action@v6 + with: + context: ${{ matrix.image_dir }} + file: ${{ matrix.image_dir }}/Dockerfile + platforms: ${{ matrix.target }} + push: false + load: true + tags: ${{ steps.generate-tags.outputs.docker_tags }} + cache-from: type=gha + cache-to: type=gha,mode=max + provenance: false + sbom: false + build-args: | + BUILDKIT_INLINE_CACHE=1 + + + - name: List docker images + run: docker images + + - name: Test built image with official test suite + run: | + set -x + FIRST_TAG=$(echo '${{ steps.read-tags.outputs.tags }}' | jq -r '.[0]') + TEST_IMAGE="${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}-${{ matrix.arch_variant }}:${FIRST_TAG}" + + # Set platform for non-native architectures + case "${{ matrix.target }}" in + "linux/arm/v6"|"linux/arm/v7") + export DOCKER_DEFAULT_PLATFORM="${{ matrix.target }}" + echo "Testing with DOCKER_DEFAULT_PLATFORM=${{ matrix.target }}" + ;; + *) + echo "Testing natively for ${{ matrix.target }}" + ;; + esac + + git clone --depth 1 https://github.com/docker-library/official-images.git + + [[ -f "./official-images/test/run.sh" ]] || { echo "./official-images/test/run.sh not found"; exit 1; } + [[ -f "./test/postgis-config.sh" ]] || { echo "./test/postgis-config.sh not found"; exit 1; } + [[ -f "./official-images/test/config.sh" ]] || { echo "./official-images/test/config.sh not found"; exit 1; } + + ./official-images/test/run.sh -c ./official-images/test/config.sh -c test/postgis-config.sh "$TEST_IMAGE" + + - name: Push Docker image + if: ${{ inputs.push_images && (github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch') }} + run: | + set -x + # Reuse tags from generate-tags step + echo '${{ steps.generate-tags.outputs.docker_tags }}' | tr ',' '\n' | while read -r tag; do + docker push "$tag" + done + + create-manifests: + name: "Create Multi-Arch Manifests" + needs: build-images + runs-on: ubuntu-22.04 + if: ${{ inputs.push_images && (github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch') }} + + strategy: + matrix: + image_dir: + - "18-3.5/bookworm" + - "18-3.6/alpine3.22" + + steps: + - name: Checkout source + uses: actions/checkout@v4 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: Login to additional registries + if: ${{ inputs.additional_registries != '' }} + run: | + set -x + IFS=',' read -ra REGISTRIES <<< "${{ inputs.additional_registries }}" + for registry in "${REGISTRIES[@]}"; do + registry=$(echo "$registry" | xargs) + case "$registry" in + "ghcr.io") + echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin + ;; + "quay.io") + if [[ -n "${{ secrets.QUAY_USERNAME }}" && -n "${{ secrets.QUAY_TOKEN }}" ]]; then + echo "${{ secrets.QUAY_TOKEN }}" | docker login quay.io -u "${{ secrets.QUAY_USERNAME }}" --password-stdin + else + echo "Quay.io credentials not configured, skipping" + fi + ;; + esac + done + + - name: Read original tags + id: read-original-tags + run: | + set -x + TAGS_FILE="${{ matrix.image_dir }}/tags" + [[ -f "$TAGS_FILE" ]] || { echo "Tags file not found"; exit 1; } + cat "$TAGS_FILE" + TAGS=$(cat "$TAGS_FILE" | tr ' ' '\n' | sed '/^$/d' | jq -R . | jq -s . | jq -c .) + echo "tags<> $GITHUB_OUTPUT + echo "$TAGS" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + + - name: Create and push multi-architecture manifests + run: | + set -x + TAGS_JSON='${{ steps.read-original-tags.outputs.tags }}' + ARCHITECTURES=("amd64" "arm64") + #### not used "armv6" "armv7" ### + + ALL_REGISTRIES="${{ env.REGISTRY }}" + [[ -n "${{ inputs.additional_registries }}" ]] && ALL_REGISTRIES="$ALL_REGISTRIES,${{ inputs.additional_registries }}" + + IFS=',' read -ra REGISTRIES <<< "$ALL_REGISTRIES" + + for registry in "${REGISTRIES[@]}"; do + registry=$(echo "$registry" | xargs) + for tag in $(echo "$TAGS_JSON" | jq -r '.[]'); do + case "$registry" in + "ghcr.io") + MANIFEST_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${tag}" + ;; + "quay.io") + MANIFEST_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${tag}" + ;; + *) + MANIFEST_TAG="$registry/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${tag}" + ;; + esac + + docker manifest rm "$MANIFEST_TAG" 2>/dev/null || true + + MANIFEST_CMD="docker manifest create --amend $MANIFEST_TAG" + for arch in "${ARCHITECTURES[@]}"; do + case "$registry" in + "ghcr.io") + ARCH_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + "quay.io") + ARCH_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + *) + ARCH_TAG="$registry/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + esac + MANIFEST_CMD="$MANIFEST_CMD $ARCH_TAG" + done + eval "$MANIFEST_CMD" + + for arch in "${ARCHITECTURES[@]}"; do + case "$registry" in + "ghcr.io") + ARCH_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + "quay.io") + ARCH_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + *) + ARCH_TAG="$registry/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}-${arch}:${tag}" + ;; + esac + case "$arch" in + "amd64") + docker manifest annotate "$MANIFEST_TAG" "$ARCH_TAG" --os linux --arch amd64 + ;; + "arm64") + docker manifest annotate "$MANIFEST_TAG" "$ARCH_TAG" --os linux --arch arm64 + ;; + "armv6") + docker manifest annotate "$MANIFEST_TAG" "$ARCH_TAG" --os linux --arch arm --variant v6 + ;; + "armv7") + docker manifest annotate "$MANIFEST_TAG" "$ARCH_TAG" --os linux --arch arm --variant v7 + ;; + esac + done + + docker manifest push "$MANIFEST_TAG" + docker manifest inspect "$MANIFEST_TAG" | jq '.manifests[] | {platform: .platform, digest: .digest}' + done + done + + - name: Test multi-architecture manifests + run: | + set -x + FIRST_TAG=$(echo '${{ steps.read-original-tags.outputs.tags }}' | jq -r '.[0]') + + ALL_REGISTRIES="${{ env.REGISTRY }}" + [[ -n "${{ inputs.additional_registries }}" ]] && ALL_REGISTRIES="$ALL_REGISTRIES,${{ inputs.additional_registries }}" + + IFS=',' read -ra REGISTRIES <<< "$ALL_REGISTRIES" + + for registry in "${REGISTRIES[@]}"; do + registry=$(echo "$registry" | xargs) + + case "$registry" in + "ghcr.io") + MANIFEST_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${FIRST_TAG}" + ;; + "quay.io") + MANIFEST_TAG="$registry/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${FIRST_TAG}" + ;; + *) + MANIFEST_TAG="$registry/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${FIRST_TAG}" + ;; + esac + + MANIFEST_INFO=$(docker manifest inspect "$MANIFEST_TAG") + EXPECTED_ARCHS=4 + ACTUAL_ARCHS=$(echo "$MANIFEST_INFO" | jq '.manifests | length') + + if [[ "$ACTUAL_ARCHS" -eq "$EXPECTED_ARCHS" ]]; then + echo "$registry manifest OK: $ACTUAL_ARCHS/$EXPECTED_ARCHS architectures" + else + echo "$registry manifest ERROR: $ACTUAL_ARCHS/$EXPECTED_ARCHS architectures" + exit 1 + fi + done + + summary: + name: "Build Summary" + needs: [build-images, create-manifests] + runs-on: ubuntu-22.04 + if: always() + + steps: + - name: Generate summary + run: | + cat >> $GITHUB_STEP_SUMMARY << 'EOF' + ## Multi-Architecture Docker Build Summary + + ### Build Results + EOF + + if [[ "${{ needs.build-images.result }}" == "success" ]]; then + echo "- Individual Architecture Builds: SUCCESS" >> $GITHUB_STEP_SUMMARY + else + echo "- Individual Architecture Builds: FAILED" >> $GITHUB_STEP_SUMMARY + fi + + if [[ "${{ needs.create-manifests.result }}" == "success" ]]; then + echo "- Multi-Architecture Manifests: SUCCESS" >> $GITHUB_STEP_SUMMARY + elif [[ "${{ needs.create-manifests.result }}" == "skipped" ]]; then + echo "- Multi-Architecture Manifests: SKIPPED" >> $GITHUB_STEP_SUMMARY + else + echo "- Multi-Architecture Manifests: FAILED" >> $GITHUB_STEP_SUMMARY + fi + + cat >> $GITHUB_STEP_SUMMARY << 'EOF' + + ### Architecture Support & Testing + - linux/amd64: ubuntu-22.04 (native testing) + - linux/arm64: ubuntu-22.04-arm (native testing) + + ### Images Built + - 18-3.5/bookworm: PostgreSQL 18beta1 + PostGIS 3.5 (Debian) + - 18-3.6/alpine3.22: PostgreSQL 18beta1 + PostGIS 3.6.0alpha1 (Alpine) + + ### Registry Configuration + EOF + + echo "- Primary Registry: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}" >> $GITHUB_STEP_SUMMARY + + if [[ -n "${{ inputs.additional_registries }}" ]]; then + echo "- Additional Registries: ${{ inputs.additional_registries }}" >> $GITHUB_STEP_SUMMARY + else + echo "- Additional Registries: None" >> $GITHUB_STEP_SUMMARY + fi + + echo "- Push Images: ${{ inputs.push_images && 'Enabled' || 'Disabled' }}" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 9c1e1626c..2a333b4bf 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -66,7 +66,7 @@ jobs: - name: Create Pull Request if: env.versions_changed == 'true' && steps.check_prs.outputs.create_pr == 'true' id: create-pr - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: committer: GitHub author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> diff --git a/.gitignore b/.gitignore index 8d160c2d7..70e8c3c68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ _* .vscode/ trivy_cache -tmp/ \ No newline at end of file +tmp/ +_cache/ +venv-docker-postgis/ +tools/dive \ No newline at end of file diff --git a/13-3.3/alpine3.21/Dockerfile b/13-3.3/alpine3.21/Dockerfile index 7c54f9670..018bfa79c 100644 --- a/13-3.3/alpine3.21/Dockerfile +++ b/13-3.3/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.3.8" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.3.8" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/13-3.4/alpine3.21/Dockerfile b/13-3.4/alpine3.21/Dockerfile index 26afb952c..117b3c7a3 100644 --- a/13-3.4/alpine3.21/Dockerfile +++ b/13-3.4/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/13-3.4/alpine3.22/Dockerfile b/13-3.4/alpine3.22/Dockerfile index 324c7cb3a..e4b5b93c9 100644 --- a/13-3.4/alpine3.22/Dockerfile +++ b/13-3.4/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/13-3.5/alpine3.21/Dockerfile b/13-3.5/alpine3.21/Dockerfile index 4cf0e5b29..926e950f8 100644 --- a/13-3.5/alpine3.21/Dockerfile +++ b/13-3.5/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/13-3.5/alpine3.22/Dockerfile b/13-3.5/alpine3.22/Dockerfile index aa426ce84..e7b0b301b 100644 --- a/13-3.5/alpine3.22/Dockerfile +++ b/13-3.5/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile index 0cbe9843f..a1405ee02 100644 --- a/13-3.5/bookworm/Dockerfile +++ b/13-3.5/bookworm/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:13-bookworm +ARG PGIS1_BASE_IMAGE=postgres:13-bookworm +ARG PGIS1_POSTGRES_MAJOR=13 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 13 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/13-3.5/bullseye/Dockerfile b/13-3.5/bullseye/Dockerfile index 185859ce1..518f11058 100644 --- a/13-3.5/bullseye/Dockerfile +++ b/13-3.5/bullseye/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:13-bullseye +ARG PGIS1_BASE_IMAGE=postgres:13-bullseye +ARG PGIS1_POSTGRES_MAJOR=13 +ARG PGIS1_POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/14-3.3/alpine3.21/Dockerfile b/14-3.3/alpine3.21/Dockerfile index 6b79d55d2..9d435b65e 100644 --- a/14-3.3/alpine3.21/Dockerfile +++ b/14-3.3/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.3.8" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.3.8" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/14-3.4/alpine3.21/Dockerfile b/14-3.4/alpine3.21/Dockerfile index 569e89e46..562526676 100644 --- a/14-3.4/alpine3.21/Dockerfile +++ b/14-3.4/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/14-3.4/alpine3.22/Dockerfile b/14-3.4/alpine3.22/Dockerfile index 5786b107a..b051253ef 100644 --- a/14-3.4/alpine3.22/Dockerfile +++ b/14-3.4/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/14-3.5/alpine3.21/Dockerfile b/14-3.5/alpine3.21/Dockerfile index f7d4b7917..ae5a74512 100644 --- a/14-3.5/alpine3.21/Dockerfile +++ b/14-3.5/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/14-3.5/alpine3.22/Dockerfile b/14-3.5/alpine3.22/Dockerfile index a48dd3182..22983afa9 100644 --- a/14-3.5/alpine3.22/Dockerfile +++ b/14-3.5/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile index 57d72f918..3bdd2c63c 100644 --- a/14-3.5/bookworm/Dockerfile +++ b/14-3.5/bookworm/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:14-bookworm +ARG PGIS1_BASE_IMAGE=postgres:14-bookworm +ARG PGIS1_POSTGRES_MAJOR=14 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 14 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/14-3.5/bullseye/Dockerfile b/14-3.5/bullseye/Dockerfile index c6675c09c..574b0977e 100644 --- a/14-3.5/bullseye/Dockerfile +++ b/14-3.5/bullseye/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:14-bullseye +ARG PGIS1_BASE_IMAGE=postgres:14-bullseye +ARG PGIS1_POSTGRES_MAJOR=14 +ARG PGIS1_POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 1087526bd..b788011ef 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -8,6 +8,10 @@ ARG PGIS1_BASE_IMAGE=postgres:14-bookworm +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -43,10 +47,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=minimal" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -378,9 +391,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - 14-l3.1.9gcp spatial database extension with PostgreSQL 14 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="14-l3.1.9gcp" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 14-l3.1.9gcp spatial database extension with PostgreSQL 14 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="14-l3.1.9gcp" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -391,7 +421,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -573,6 +606,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/15-3.3/alpine3.21/Dockerfile b/15-3.3/alpine3.21/Dockerfile index cd64311c1..a557898d8 100644 --- a/15-3.3/alpine3.21/Dockerfile +++ b/15-3.3/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.3.8" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.3.8" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/15-3.4/alpine3.21/Dockerfile b/15-3.4/alpine3.21/Dockerfile index 28758e2cb..bc3efd664 100644 --- a/15-3.4/alpine3.21/Dockerfile +++ b/15-3.4/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/15-3.4/alpine3.22/Dockerfile b/15-3.4/alpine3.22/Dockerfile index 9a49924be..b0d46e954 100644 --- a/15-3.4/alpine3.22/Dockerfile +++ b/15-3.4/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/15-3.5/alpine3.21/Dockerfile b/15-3.5/alpine3.21/Dockerfile index a7dd3e2d7..21769f1cf 100644 --- a/15-3.5/alpine3.21/Dockerfile +++ b/15-3.5/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/15-3.5/alpine3.22/Dockerfile b/15-3.5/alpine3.22/Dockerfile index 9e4c8f0f9..400075e38 100644 --- a/15-3.5/alpine3.22/Dockerfile +++ b/15-3.5/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile index 76bbbfa39..7fc958aed 100644 --- a/15-3.5/bookworm/Dockerfile +++ b/15-3.5/bookworm/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:15-bookworm +ARG PGIS1_BASE_IMAGE=postgres:15-bookworm +ARG PGIS1_POSTGRES_MAJOR=15 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 15 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/15-3.5/bullseye/Dockerfile b/15-3.5/bullseye/Dockerfile index ec9d57478..f38055051 100644 --- a/15-3.5/bullseye/Dockerfile +++ b/15-3.5/bullseye/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:15-bullseye +ARG PGIS1_BASE_IMAGE=postgres:15-bullseye +ARG PGIS1_POSTGRES_MAJOR=15 +ARG PGIS1_POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/16-3.3/alpine3.21/Dockerfile b/16-3.3/alpine3.21/Dockerfile index 886eeb4b5..ba979dc61 100644 --- a/16-3.3/alpine3.21/Dockerfile +++ b/16-3.3/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.3.8 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=cfb70d6229096d2474d79d097768dd19ef04a840 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.3.8" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.3.8" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/16-3.4/alpine3.21/Dockerfile b/16-3.4/alpine3.21/Dockerfile index fcc8c09c4..b8b6b993a 100644 --- a/16-3.4/alpine3.21/Dockerfile +++ b/16-3.4/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/16-3.4/alpine3.22/Dockerfile b/16-3.4/alpine3.22/Dockerfile index 5b6b4654b..d6b9e62aa 100644 --- a/16-3.4/alpine3.22/Dockerfile +++ b/16-3.4/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index f439feeba..dd41470c9 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -4,7 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # - # Experimental Geo Bundle package. # This is a work in progress and not yet ready for production. # Some packages will be removed from this bundle and others will be added. @@ -18,32 +17,25 @@ ARG IMAGE_NAME=postgis-amd64 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm -ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT=tags/v1.2.0 -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1=60048b5b4b7ce2f7560c024d1af024db73b3bd5b - -ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT=tags/v1.6.3 -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1=865e72b328050bc8d1bf8bd2f982edb7a4eb4e26 - ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 -ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.20.3 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=7b30533d4d9b6ce1353b8bac0ba6215be20f2633 - ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=54b4b0358a6c96dc80b2b836bba50937415753b6 ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.3.1 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} AS builder ARG PGIS1_DUCKDB_CHECKOUT +ARG PGIS1_OPTIMIZATION_FLAGS RUN set -eux \ && apt-get update \ @@ -63,36 +55,20 @@ RUN set -eux \ postgresql-server-dev-$PG_MAJOR \ unzip \ wget \ - # MobilityDB - libgeos++-dev \ - libgsl-dev \ - libjson-c-dev \ - libproj-dev \ - # TimescaleDB - libkrb5-dev \ - # pgsql-http - libcurl4-gnutls-dev \ - # hydra (columnar) - liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw sqlite3 \ - # plv8 - ninja-build \ - pkg-config \ # bytemagic libmagic-dev \ # pgsoudium \ libsodium-dev \ + # pg_curl + libcurl4-gnutls-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -FROM builder as builder-http-gzip - -ARG PGIS1_PGSQL_HTTP_REPOSITORY -ARG PGIS1_PGSQL_HTTP_CHECKOUT -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-gzip ARG PGIS1_PGSQL_GZIP_REPOSITORY ARG PGIS1_PGSQL_GZIP_CHECKOUT @@ -111,79 +87,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -RUN set -eux \ - && mkdir -p /pgsql-http \ - && cd pgsql-http \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_http_last_commit.txt \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-timescaledb - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY -ARG PGIS1_TIMESCALEDB_REPOSITORY -ARG PGIS1_TIMESCALEDB_CHECKOUT -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 - -# Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -eux \ - && mkdir -p /timescaledb \ - && cd timescaledb \ - && git init \ - && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_timescaledb_last_commit.txt \ - && ./bootstrap \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - \ - -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ - -DREGRESS_CHECKS=OFF \ - -DSEND_TELEMETRY_DEFAULT=NO \ - -DTAP_CHECKS=OFF \ - -DWARNINGS_AS_ERRORS=OFF \ - -DENABLE_DEBUG_UTILS=OFF \ - && cd build \ - && make -j$(nproc) \ - && make install - -FROM builder as builder-mobilitydb - -ARG PGIS1_MOBILITYDB_REPOSITORY -ARG PGIS1_MOBILITYDB_CHECKOUT -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 - -# Install MobilityDB -RUN set -eux \ - && mkdir -p /MobilityDB \ - && cd MobilityDB \ - && git init \ - && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_MobilityDB_last_commit.txt \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - .. \ - && make -j$(nproc) \ - && make install - FROM builder as builder-pgxn @@ -192,8 +95,6 @@ RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis - -#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap @@ -203,9 +104,19 @@ RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks +# RUN pgxn install --verbose sqlite_fdw -RUN USE_PGXS=1 pgxn install sqlite_fdw +# pg_duckdb +RUN set -eux \ + && curl -sfL https://install.pgx.sh -o /tmp/pgx-install.sh \ + && chmod +x /tmp/pgx-install.sh \ + && /tmp/pgx-install.sh \ + && rm /tmp/pgx-install.sh +RUN pgxman install pg_duckdb +#RUN pgxman install hydra_columnar +#RUN pgxman install pgvectorscale +#RUN pgxman install pg_quack FROM builder as builder-other @@ -213,20 +124,6 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 - -# Add hydradatabase -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ - && cd hydra/columnar \ - && git checkout main \ - && export COLUMNAR_O3=1 \ - && ./configure \ - && make -j$(nproc) \ - && make install - -# # # pg_quack is not available for PG16 -# # - https://github.com/hydradatabase/pg_quack/issues/3 -# # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ @@ -253,9 +150,40 @@ RUN set -eux \ FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - 16-3.5-bookworm " \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_TIMESCALEDB_TELEMETRY + +# Export build environment for child images (enterprise-grade package version locking) +RUN set -eux \ + # Ensure docker-postgis-env.sh exists (create empty if missing) + && touch /usr/local/share/docker-postgis-env.sh \ + # Export bundle-specific build versions for child images + && echo "# Bundle0 Extension Versions" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_OPTIMIZATION_FLAGS='${PGIS1_OPTIMIZATION_FLAGS}'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PG_HINT_PLAN_CHECKOUT='tags/REL16_1_6_1'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_DUCKDB_CHECKOUT='tags/v1.3.1'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PGSQL_GZIP_CHECKOUT='tags/v1.0.0'" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + # Source the environment after populating it + && . /usr/local/share/docker-postgis-env.sh + +# Only override opencontainers labels for bundle-specific info +# org.postgis.base.* labels are inherited from base image and should NOT be overridden +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS Bundle - 16-3.5-bookworm with MobilityDB, TimescaleDB, DuckDB and 40+ extensions" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3+dfsg-1~exp1.pgdg120+1-bundle0" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # Bundle-specific additional extensions (base PostGIS extensions inherited from org.postgis.base.extensions) + org.postgis.bundle0.additional.extensions="timescaledb,mobilitydb,pgsql_http,pgsql_gzip,pgrouting,pgvector,h3,pointcloud,pgaudit,byteamagic,ddlx,dsef,json_accessors,lostgis,permuteseq,pg_curl,pg_roaringbitmap,pg_rowalesce,pg_uuidv7,pg_xenophile,pg_xxhash,pgsodium,pgsql_tweaks,sqlite_fdw,age,decoderbufs,asn1oid,extra_window_functions,first_last_agg,hll,hypopg,icu_ext,jsquery,numeral,ogr_fdw,partman,periods,pg_fact_loader,pg_failover_slots,pg_stat_kcache,pg_wait_sampling,pgl_ddl_deploy,pglogical,pgmp,pgpcre,pgq3,pgsphere,pgtap,pldebugger,plpgsql_check,prefix,prioritize,q3c,repack,rum,show_plans,squeeze" \ + org.postgis.bundle0.permanently.excluded="parray_gin,pg_quack" \ + org.postgis.bundle0.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.bundle0.timescaledb.telemetry="${PGIS1_TIMESCALEDB_TELEMETRY}" \ + org.postgis.bundle0.duckdb.version="tags/v1.3.1" # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization @@ -304,18 +232,24 @@ RUN set -eux \ pspg \ vip-manager \ \ - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-decoderbufs \ + # add any exceptions for PG17 or PPG16 here + # PostgreSQL 16 and earlier packages \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-auto-failover \ + postgresql-$PG_MAJOR-credcheck \ postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-http \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-mobilitydb \ postgresql-$PG_MAJOR-numeral \ postgresql-$PG_MAJOR-ogr-fdw \ postgresql-$PG_MAJOR-partman \ @@ -345,8 +279,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ - # add MobilityDb missing dependency from libgsl-dev - libgsl27 \ + postgresql-$PG_MAJOR-timescaledb \ # MeCab based tokenizer for pgdg-pgroonga groonga-tokenizer-mecab \ # bytemagic @@ -361,40 +294,42 @@ RUN set -eux \ ARG PGIS1_DUCKDB_CHECKOUT ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} RUN arch=$(uname -m) \ - && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') \ + && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed -E 's|^.*/||; s|^tags/||; s|^v||') \ && echo "DUCKDB_VERSION=${DUCKDB_VERSION}" \ && echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" \ && case "$arch" in \ x86_64) \ duck_binary="duckdb_cli-linux-amd64.zip" ;; \ aarch64) \ - duck_binary="duckdb_cli-linux-aarch64.zip" ;; \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ *) \ echo "Unsupported architecture: $arch"; exit 1 ;; \ esac \ - && wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && wget https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/$duck_binary \ && unzip $duck_binary -d /usr/local/bin \ && rm $duck_binary \ && duckdb --version -# install extensions -# https://duckdb.org/docs/extensions/overview.html -ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" +# install duckdb extensions +ENV DUCKDB_EXTENSIONS="excel fts httpfs inet postgres_scanner spatial sqlite_scanner tpcds tpch" RUN for e in ${DUCKDB_EXTENSIONS} ; do \ echo "Installing $e ..."; \ - duckdb -c "INSTALL $e;"; \ - echo "LOAD $e;" >> $HOME/.duckdbrc; \ - done + if duckdb -c "INSTALL $e;" 2>&1 | tee /tmp/duckdb-install-$e.log; then \ + echo "Successfully installed $e"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + else \ + echo "Failed to install $e, check /tmp/duckdb-install-$e.log"; \ + fi; \ + done \ + # Add core extensions to .duckdbrc (these are built-in) + && echo "LOAD autocomplete;" >> $HOME/.duckdbrc \ + && echo "LOAD icu;" >> $HOME/.duckdbrc \ + && echo "LOAD json;" >> $HOME/.duckdbrc \ + && echo "LOAD parquet;" >> $HOME/.duckdbrc # Install from stages -COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib @@ -423,7 +358,7 @@ RUN set -eux \ RUN set -eux \ && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'postgis-3,pg_stat_statements,timescaledb'" >> /usr/share/postgresql/postgresql.conf.sample ; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample diff --git a/16-3.5/alpine3.21/Dockerfile b/16-3.5/alpine3.21/Dockerfile index de507d676..a0f6c54b7 100644 --- a/16-3.5/alpine3.21/Dockerfile +++ b/16-3.5/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/16-3.5/alpine3.22/Dockerfile b/16-3.5/alpine3.22/Dockerfile index 7359a6966..cfcd8c723 100644 --- a/16-3.5/alpine3.22/Dockerfile +++ b/16-3.5/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile index 146682e6c..d5f2f7034 100644 --- a/16-3.5/bookworm/Dockerfile +++ b/16-3.5/bookworm/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:16-bookworm +ARG PGIS1_BASE_IMAGE=postgres:16-bookworm +ARG PGIS1_POSTGRES_MAJOR=16 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 16 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/16-3.5/bullseye/Dockerfile b/16-3.5/bullseye/Dockerfile index 04e085602..93c74d17a 100644 --- a/16-3.5/bullseye/Dockerfile +++ b/16-3.5/bullseye/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:16-bullseye +ARG PGIS1_BASE_IMAGE=postgres:16-bullseye +ARG PGIS1_POSTGRES_MAJOR=16 +ARG PGIS1_POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 36f6f8556..8eac66b78 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -8,6 +8,10 @@ ARG PGIS1_BASE_IMAGE=postgres:16-bookworm +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -43,10 +47,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -292,12 +305,14 @@ RUN set -eux \ # add backports \ && apt-get update \ && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ @@ -437,9 +452,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - 16-master spatial database extension with PostgreSQL 16 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="16-master" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 16-master spatial database extension with PostgreSQL 16 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="16-master" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -450,7 +482,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -487,7 +522,8 @@ RUN set -eux \ # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Load the PGIS1_ARROW version variables @@ -669,6 +705,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 4f28da9e3..c8611d3dc 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -8,6 +8,10 @@ ARG PGIS1_BASE_IMAGE=postgres:16-bookworm +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -43,10 +47,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -292,12 +305,14 @@ RUN set -eux \ # add backports \ && apt-get update \ && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ @@ -437,9 +452,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - 16-recent spatial database extension with PostgreSQL 16 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="16-recent" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 16-recent spatial database extension with PostgreSQL 16 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="16-recent" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -450,7 +482,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -487,7 +522,8 @@ RUN set -eux \ # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Load the PGIS1_ARROW version variables @@ -669,6 +705,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/17-3.4/alpine3.21/Dockerfile b/17-3.4/alpine3.21/Dockerfile index 91450f7a7..12603292a 100644 --- a/17-3.4/alpine3.21/Dockerfile +++ b/17-3.4/alpine3.21/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.21" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.21" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/17-3.4/alpine3.22/Dockerfile b/17-3.4/alpine3.22/Dockerfile new file mode 100644 index 000000000..e155a8b32 --- /dev/null +++ b/17-3.4/alpine3.22/Dockerfile @@ -0,0 +1,222 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.22 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.4 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d + +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.4.4" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.4.4" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + + +RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apk add --no-cache --virtual .build-deps \ + ca-certificates \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + # build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ + && make -j$(nproc) \ + && make install \ + \ + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ + # This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ + # add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + # clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/17-3.4/alpine3.22/initdb-postgis.sh b/17-3.4/alpine3.22/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17-3.4/alpine3.22/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17-3.4/alpine3.22/tags b/17-3.4/alpine3.22/tags new file mode 100644 index 000000000..355da8042 --- /dev/null +++ b/17-3.4/alpine3.22/tags @@ -0,0 +1 @@ +17-3.4-alpine3.22 17-3.4.4-alpine3.22 17-3.4-alpine diff --git a/17-3.4/alpine3.22/update-postgis.sh b/17-3.4/alpine3.22/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17-3.4/alpine3.22/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17-3.5-bundle0/bookworm/Dockerfile b/17-3.5-bundle0/bookworm/Dockerfile new file mode 100644 index 000000000..0e8f34704 --- /dev/null +++ b/17-3.5-bundle0/bookworm/Dockerfile @@ -0,0 +1,364 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.bundle0.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# Experimental Geo Bundle package. +# This is a work in progress and not yet ready for production. +# Some packages will be removed from this bundle and others will be added. +# The goal is to have a bundle that includes all the most popular extensions with PostGIS + +# set the base image , make build-* is overwriting with the actual value ! + +ARG REGISTRY=docker.io +ARG REPO_NAME=imresamu +ARG IMAGE_NAME=postgis-amd64 + +ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm + +ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git +ARG PGIS1_PGSQL_GZIP_CHECKOUT=tags/v1.0.0 +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 + +ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git +ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL17_1_7_0 +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1=85e07af6ca4675a26fa2281370c37371b883b2a9 + +ARG PGIS1_DUCKDB_CHECKOUT=tags/v1.3.1 + +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} AS builder + +ARG PGIS1_DUCKDB_CHECKOUT +ARG PGIS1_OPTIMIZATION_FLAGS + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + curl \ + flex \ + g++ \ + git \ + make \ + pgxnclient \ + postgresql-server-dev-$PG_MAJOR \ + unzip \ + wget \ + # pgsql-gzip + zlib1g-dev \ + # sqlite_fdw + sqlite3 \ + # bytemagic + libmagic-dev \ + # pgsoudium \ + libsodium-dev \ + # pg_curl + libcurl4-gnutls-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +FROM builder as builder-gzip + +ARG PGIS1_PGSQL_GZIP_REPOSITORY +ARG PGIS1_PGSQL_GZIP_CHECKOUT +ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1 + +RUN set -eux \ + && mkdir -p /pgsql-gzip \ + && cd pgsql-gzip \ + && git init \ + && git remote add origin ${PGIS1_PGSQL_GZIP_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PGSQL_GZIP_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_GZIP_CHECKOUT_SHA1" ]; then exit 1; fi \ + && git log -1 > /_pgsql_gzip_last_commit.txt \ + && make -j$(nproc) \ + && make install + + +FROM builder as builder-pgxn + +RUN pgxn install --verbose byteamagic +RUN pgxn install --verbose ddlx +RUN pgxn install --verbose dsef +RUN pgxn install --verbose json_accessors +RUN pgxn install --verbose lostgis +RUN pgxn install --verbose permuteseq +RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl +RUN pgxn install --verbose pg_roaringbitmap +RUN pgxn install --verbose pg_rowalesce +RUN pgxn install --verbose pg_uuidv7 +RUN pgxn install --verbose pg_xenophile +RUN pgxn install --verbose pg_xxhash +RUN pgxn install --verbose pgsodium +RUN pgxn install --verbose pgsql_tweaks +# RUN pgxn install --verbose sqlite_fdw + +# pgxman pg_duckdb is not available / not working for PG17 yet + +#RUN pgxman install hydra_columnar +#RUN pgxman install pgvectorscale +#RUN pgxman install pg_quack + +FROM builder as builder-other + +ARG PGIS1_PG_HINT_PLAN_REPOSITORY +ARG PGIS1_PG_HINT_PLAN_CHECKOUT +ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 + +# install pg_hint_plan +RUN set -eux \ + && mkdir pg_hint_plan \ + && cd pg_hint_plan \ + && git init \ + && git remote add origin ${PGIS1_PG_HINT_PLAN_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PG_HINT_PLAN_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1" ]; then exit 1; fi \ + && make -j$(nproc) \ + && make install + +RUN set -eux \ + && git clone --depth 1 https://github.com/NikolayS/postgres_dba.git \ + && cd postgres_dba \ + && rm -rf .git + +RUN set -eux \ + && git clone --depth 1 https://github.com/dr-jts/pg_svg.git \ + && cd pg_svg \ + && rm -rf .git + #install: psql < /pg_svg/pg-svg-lib.sql + +FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:17-3.5-bookworm + +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_TIMESCALEDB_TELEMETRY + +# Export build environment for child images (enterprise-grade package version locking) +RUN set -eux \ + # Ensure docker-postgis-env.sh exists (create empty if missing) + && touch /usr/local/share/docker-postgis-env.sh \ + # Export bundle-specific build versions for child images + && echo "# Bundle0 Extension Versions" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_OPTIMIZATION_FLAGS='${PGIS1_OPTIMIZATION_FLAGS}'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PG_HINT_PLAN_CHECKOUT='tags/REL17_1_7_0'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_DUCKDB_CHECKOUT='tags/v1.3.1'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PGSQL_GZIP_CHECKOUT='tags/v1.0.0'" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + # Source the environment after populating it + && . /usr/local/share/docker-postgis-env.sh + +# Only override opencontainers labels for bundle-specific info +# org.postgis.base.* labels are inherited from base image and should NOT be overridden +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS Bundle - 17-3.5-bookworm with MobilityDB, TimescaleDB, DuckDB and 40+ extensions" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3+dfsg-1~exp1.pgdg120+1-bundle0" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # Bundle-specific additional extensions (base PostGIS extensions inherited from org.postgis.base.extensions) + org.postgis.bundle0.additional.extensions="timescaledb,mobilitydb,pgsql_http,pgsql_gzip,pgrouting,pgvector,h3,pointcloud,pgaudit,byteamagic,ddlx,dsef,json_accessors,lostgis,permuteseq,pg_curl,pg_roaringbitmap,pg_rowalesce,pg_uuidv7,pg_xenophile,pg_xxhash,pgsodium,pgsql_tweaks,asn1oid,extra_window_functions,first_last_agg,hll,hypopg,icu_ext,jsquery,numeral,ogr_fdw,partman,periods,pg_fact_loader,pg_failover_slots,pg_stat_kcache,pg_wait_sampling,pgl_ddl_deploy,pglogical,pgmp,pgpcre,pgq3,pgsphere,pgtap,pldebugger,plpgsql_check,prefix,prioritize,q3c,repack,rum,show_plans,squeeze" \ + org.postgis.bundle0.excluded.pg17="sqlite_fdw,age,decoderbufs" \ + org.postgis.bundle0.permanently.excluded="parray_gin,pg_quack" \ + org.postgis.bundle0.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.bundle0.timescaledb.telemetry="${PGIS1_TIMESCALEDB_TELEMETRY}" \ + org.postgis.bundle0.duckdb.version="tags/v1.3.1" + +# install all utf8 locales; +# helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization +RUN set -eux \ + && sed -i -e 's/# \(.*\.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + \ + bzip2 \ + curl \ + jq \ + unzip \ + wget \ + \ + gdal-bin \ + proj-bin \ + sqlite3 \ + \ + pipx \ + python-is-python3 \ + python3 \ + python3-geoalchemy2 \ + python3-pglast \ + python3-pip \ + python3-psycopg2 \ + python3-setuptools \ + python3-sqlalchemy \ + \ + postgis \ + postgresql \ + postgresql-client-common \ + postgresql-common \ + postgresql-contrib \ + postgresql-plpython3-$PG_MAJOR \ + postgresql-postgis \ + postgresql-postgis-scripts \ + \ + pg-activity \ + pgbackrest \ + pgbadger \ + pgtap \ + pgtop \ + pspg \ + vip-manager \ + \ + # add any exceptions for PG17 or PPG16 here + # PostgreSQL 17 specific packages + \ + postgresql-$PG_MAJOR-age \ + postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-auto-failover \ + postgresql-$PG_MAJOR-credcheck \ + postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ + postgresql-$PG_MAJOR-extra-window-functions \ + postgresql-$PG_MAJOR-first-last-agg \ + postgresql-$PG_MAJOR-h3 \ + postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-http \ + postgresql-$PG_MAJOR-hypopg \ + postgresql-$PG_MAJOR-icu-ext \ + postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-mobilitydb \ + postgresql-$PG_MAJOR-numeral \ + postgresql-$PG_MAJOR-ogr-fdw \ + postgresql-$PG_MAJOR-partman \ + postgresql-$PG_MAJOR-periods \ + postgresql-$PG_MAJOR-pg-fact-loader \ + postgresql-$PG_MAJOR-pg-failover-slots \ + postgresql-$PG_MAJOR-pg-stat-kcache \ + postgresql-$PG_MAJOR-pg-wait-sampling \ + postgresql-$PG_MAJOR-pgaudit \ + postgresql-$PG_MAJOR-pgl-ddl-deploy \ + postgresql-$PG_MAJOR-pglogical \ + postgresql-$PG_MAJOR-pgmp \ + postgresql-$PG_MAJOR-pgpcre \ + postgresql-$PG_MAJOR-pgq3 \ + postgresql-$PG_MAJOR-pgrouting \ + postgresql-$PG_MAJOR-pgrouting-scripts \ + postgresql-$PG_MAJOR-pgsphere \ + postgresql-$PG_MAJOR-pgtap \ + postgresql-$PG_MAJOR-pgvector \ + postgresql-$PG_MAJOR-pldebugger \ + postgresql-$PG_MAJOR-plpgsql-check \ + postgresql-$PG_MAJOR-pointcloud \ + postgresql-$PG_MAJOR-prefix \ + postgresql-$PG_MAJOR-prioritize \ + postgresql-$PG_MAJOR-q3c \ + postgresql-$PG_MAJOR-repack \ + postgresql-$PG_MAJOR-rum \ + postgresql-$PG_MAJOR-show-plans \ + postgresql-$PG_MAJOR-squeeze \ + postgresql-$PG_MAJOR-timescaledb \ + # MeCab based tokenizer for pgdg-pgroonga + groonga-tokenizer-mecab \ + # bytemagic + libmagic1 libmagic-mgc \ + # pgsodium + libsodium23 \ + \ + && rm -Rf /root/.cache/pip \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +ARG PGIS1_DUCKDB_CHECKOUT +ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} +RUN arch=$(uname -m) \ + && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed -E 's|^.*/||; s|^tags/||; s|^v||') \ + && echo "DUCKDB_VERSION=${DUCKDB_VERSION}" \ + && echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" \ + && case "$arch" in \ + x86_64) \ + duck_binary="duckdb_cli-linux-amd64.zip" ;; \ + aarch64) \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ + *) \ + echo "Unsupported architecture: $arch"; exit 1 ;; \ + esac \ + && wget https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/$duck_binary \ + && unzip $duck_binary -d /usr/local/bin \ + && rm $duck_binary \ + && duckdb --version + +# install duckdb extensions +ENV DUCKDB_EXTENSIONS="excel fts httpfs inet postgres_scanner spatial sqlite_scanner tpcds tpch" +RUN for e in ${DUCKDB_EXTENSIONS} ; do \ + echo "Installing $e ..."; \ + if duckdb -c "INSTALL $e;" 2>&1 | tee /tmp/duckdb-install-$e.log; then \ + echo "Successfully installed $e"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + else \ + echo "Failed to install $e, check /tmp/duckdb-install-$e.log"; \ + fi; \ + done \ + # Add core extensions to .duckdbrc (these are built-in) + && echo "LOAD autocomplete;" >> $HOME/.duckdbrc \ + && echo "LOAD icu;" >> $HOME/.duckdbrc \ + && echo "LOAD json;" >> $HOME/.duckdbrc \ + && echo "LOAD parquet;" >> $HOME/.duckdbrc + +# Install from stages +COPY --from=builder-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-other /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib + +COPY --from=builder-other /postgres_dba /postgres_dba +COPY --from=builder-other /pg_svg /pg_svg + +# check any missing dependencies +RUN set -eux \ + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true + +# multiple LLVM existance is not optimal; so we give a warning. +# known problem: duplicated LLVM +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "WARNING: More than one llvm package or none at all found!"; \ + dpkg -l | grep llvm ; \ + fi + +# add MobilityDB requirements +RUN set -eux \ + && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ + # add MobilityDB and TimescaleDB requirements + echo "shared_preload_libraries = 'postgis-3,pg_stat_statements,timescaledb'" >> /usr/share/postgresql/postgresql.conf.sample ; \ + # MobilityDB recomendation + echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample + +# for postgres_dba Use ":dba" to see menu +RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc + +COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh diff --git a/17-3.5-bundle0/bookworm/initdb-bundle0.sh b/17-3.5-bundle0/bookworm/initdb-bundle0.sh new file mode 100644 index 000000000..5f2c5d116 --- /dev/null +++ b/17-3.5-bundle0/bookworm/initdb-bundle0.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# install pg-svg-lib +"${psql[@]}" /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/17-3.5/alpine3.22/Dockerfile b/17-3.5/alpine3.22/Dockerfile index 95caa37f0..85c5c75e0 100644 --- a/17-3.5/alpine3.22/Dockerfile +++ b/17-3.5/alpine3.22/Dockerfile @@ -9,25 +9,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -64,31 +112,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -106,35 +159,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile index b342e6255..b3e5b6d85 100644 --- a/17-3.5/bookworm/Dockerfile +++ b/17-3.5/bookworm/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:17-bookworm +ARG PGIS1_BASE_IMAGE=postgres:17-bookworm +ARG PGIS1_POSTGRES_MAJOR=17 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.3+dfsg-1~exp1.pgdg120+1 spatial database extension with PostgreSQL 17 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.3+dfsg-1~exp1.pgdg120+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/17-3.5/bullseye/Dockerfile b/17-3.5/bullseye/Dockerfile index 5491f2321..e5dda44da 100644 --- a/17-3.5/bullseye/Dockerfile +++ b/17-3.5/bullseye/Dockerfile @@ -3,36 +3,90 @@ # source: "./templates/Dockerfile.debian.template" # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:17-bullseye +ARG PGIS1_BASE_IMAGE=postgres:17-bullseye +ARG PGIS1_POSTGRES_MAJOR=17 +ARG PGIS1_POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1 +ARG PGIS1_POSTGIS_MAJOR=3 -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.5.2+dfsg-1.pgdg110+1 +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bullseye" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ - postgis \ - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/17-3.6/alpine3.22/Dockerfile b/17-3.6/alpine3.22/Dockerfile new file mode 100644 index 000000000..03e6ec1dc --- /dev/null +++ b/17-3.6/alpine3.22/Dockerfile @@ -0,0 +1,222 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:17-alpine3.22 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.6.0alpha1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=b32829d707ef65515df1224361b9f2d5889db348 + +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.6.0alpha1" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 17 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.6.0alpha1" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + + +RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apk add --no-cache --virtual .build-deps \ + ca-certificates \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + # build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ + && make -j$(nproc) \ + && make install \ + \ + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ + # This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ + # add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + # clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/17-3.6/alpine3.22/initdb-postgis.sh b/17-3.6/alpine3.22/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/17-3.6/alpine3.22/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/17-3.6/alpine3.22/tags b/17-3.6/alpine3.22/tags new file mode 100644 index 000000000..e98f9f8ce --- /dev/null +++ b/17-3.6/alpine3.22/tags @@ -0,0 +1 @@ +17-3.6.0alpha1-alpine3.22 17-3.6.0alpha1-alpine diff --git a/17-3.6/alpine3.22/update-postgis.sh b/17-3.6/alpine3.22/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/17-3.6/alpine3.22/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/17-master/bookworm/Dockerfile b/17-master/bookworm/Dockerfile index 4a35dc692..874955641 100644 --- a/17-master/bookworm/Dockerfile +++ b/17-master/bookworm/Dockerfile @@ -8,6 +8,10 @@ ARG PGIS1_BASE_IMAGE=postgres:17-bookworm +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -43,10 +47,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -292,12 +305,14 @@ RUN set -eux \ # add backports \ && apt-get update \ && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ @@ -437,9 +452,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - 17-master spatial database extension with PostgreSQL 17 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="17-master" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 17-master spatial database extension with PostgreSQL 17 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="17-master" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -450,7 +482,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -487,7 +522,8 @@ RUN set -eux \ # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Load the PGIS1_ARROW version variables @@ -669,6 +705,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 42a977a6c..84fcee059 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -8,6 +8,10 @@ ARG PGIS1_BASE_IMAGE=postgres:17-bookworm +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -43,10 +47,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -292,12 +305,14 @@ RUN set -eux \ # add backports \ && apt-get update \ && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ @@ -437,9 +452,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - 17-recent spatial database extension with PostgreSQL 17 bookworm" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="17-recent" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 17-recent spatial database extension with PostgreSQL 17 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="17-recent" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -450,7 +482,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -487,7 +522,8 @@ RUN set -eux \ # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ && apt-get update \ # Load the PGIS1_ARROW version variables @@ -669,6 +705,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/18-3.5/alpine3.22/Dockerfile b/18-3.5/alpine3.22/Dockerfile new file mode 100644 index 000000000..4b81af82e --- /dev/null +++ b/18-3.5/alpine3.22/Dockerfile @@ -0,0 +1,222 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:18beta1-alpine3.22 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 + +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 18 alpine3.22" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.5.3" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 18 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.5.3" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + + +RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apk add --no-cache --virtual .build-deps \ + ca-certificates \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + # build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ + && make -j$(nproc) \ + && make install \ + \ + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ + # This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ + # add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + # clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/18-3.5/alpine3.22/initdb-postgis.sh b/18-3.5/alpine3.22/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/18-3.5/alpine3.22/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/18-3.5/alpine3.22/tags b/18-3.5/alpine3.22/tags new file mode 100644 index 000000000..b03529025 --- /dev/null +++ b/18-3.5/alpine3.22/tags @@ -0,0 +1 @@ +18beta1-3.5-alpine3.22 18beta1-3.5.3-alpine3.22 18beta1-3.5-alpine diff --git a/18-3.5/alpine3.22/update-postgis.sh b/18-3.5/alpine3.22/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/18-3.5/alpine3.22/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/18-3.5/bookworm/Dockerfile b/18-3.5/bookworm/Dockerfile new file mode 100644 index 000000000..8b1a47438 --- /dev/null +++ b/18-3.5/bookworm/Dockerfile @@ -0,0 +1,93 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.debian.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +ARG PGIS1_BASE_IMAGE=postgres:18beta1-bookworm +ARG PGIS1_POSTGRES_MAJOR=18 +ARG PGIS1_POSTGIS_VERSION=3.5.3+dfsg-1~exp1.pgdg120+1 +ARG PGIS1_POSTGIS_MAJOR=3 + +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} + +RUN set -eux \ + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* + +# multiple LLVM existance is not allowed. +RUN set -eux \ + && dpkg -l | grep llvm \ + && llvm_count=$(dpkg -l | grep llvm | wc -l) \ + && if [ "$llvm_count" -ne 1 ]; then \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ + exit 1; \ + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin diff --git a/18-3.5/bookworm/initdb-postgis.sh b/18-3.5/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/18-3.5/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/18-3.5/bookworm/tags b/18-3.5/bookworm/tags new file mode 100644 index 000000000..69158bc12 --- /dev/null +++ b/18-3.5/bookworm/tags @@ -0,0 +1 @@ +18beta1-3.5-bookworm 18beta1-3.5.3-bookworm 18beta1-3.5 diff --git a/18-3.5/bookworm/update-postgis.sh b/18-3.5/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/18-3.5/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/18-3.6/alpine3.22/Dockerfile b/18-3.6/alpine3.22/Dockerfile new file mode 100644 index 000000000..4e6032450 --- /dev/null +++ b/18-3.6/alpine3.22/Dockerfile @@ -0,0 +1,222 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.alpine.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +ARG PGIS1_BASE_IMAGE=postgres:18beta1-alpine3.22 +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.6.0alpha1 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=b32829d707ef65515df1224361b9f2d5889db348 + +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 18 alpine3.22" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="3.6.0alpha1" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 18 alpine3.22" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="3.6.0alpha1" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + + +RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apk add --no-cache --virtual .build-deps \ + ca-certificates \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ + \ + # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains + # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. + # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 + $DOCKER_PG_LLVM_DEPS \ + \ + autoconf \ + automake \ + bison \ + cunit-dev \ + file \ + g++ \ + gcc \ + gettext-dev \ + git \ + json-c-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + # Note: PCRE2 is not supported in older versions of PostGIS. + # To ensure compatibility with PostGIS version 3.0, PCRE 1 is required. + # If PCRE2 support is needed, please submit an issue on the docker-postgis GitHub repository. + pcre-dev \ + perl \ + protobuf-c-dev \ + \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + # build PostGIS - with Link Time Optimization (LTO) enabled + && cd /usr/src/postgis \ + && gettextize \ + && ./autogen.sh \ + && ./configure \ + --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ + && make -j$(nproc) \ + && make install \ + \ + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. + && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn \ + # This section performs a regression check. + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ + # add .postgis-rundeps + && apk add --no-cache --virtual .postgis-rundeps \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ + # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking + # fix https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + # clean + && cd / \ + && rm -rf \ + /usr/src/postgis \ + /usr/local/share/doc \ + /usr/local/share/man \ + && apk del .build-deps \ + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + && cat /_pgis_full_version.txt + +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/18-3.6/alpine3.22/initdb-postgis.sh b/18-3.6/alpine3.22/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/18-3.6/alpine3.22/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/18-3.6/alpine3.22/tags b/18-3.6/alpine3.22/tags new file mode 100644 index 000000000..54c6f7cf4 --- /dev/null +++ b/18-3.6/alpine3.22/tags @@ -0,0 +1 @@ +18beta1-3.6.0alpha1-alpine3.22 18beta1-3.6.0alpha1-alpine diff --git a/18-3.6/alpine3.22/update-postgis.sh b/18-3.6/alpine3.22/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/18-3.6/alpine3.22/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/18-master/bookworm/Dockerfile b/18-master/bookworm/Dockerfile new file mode 100644 index 000000000..56a6fe614 --- /dev/null +++ b/18-master/bookworm/Dockerfile @@ -0,0 +1,772 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:18beta1-bookworm + +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=master +ARG PGIS1_GEOS_CHECKOUT=main +ARG PGIS1_GDAL_CHECKOUT=master +ARG PGIS1_PROJ_CHECKOUT=master +ARG PGIS1_SFCGAL_CHECKOUT=master +ARG PGIS1_CGAL_CHECKOUT=master + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GEOS_CHECKOUT_SHA1=nocheck +ARG PGIS1_GDAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_PROJ_CHECKOUT_SHA1=nocheck +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=nocheck +ARG PGIS1_CGAL_CHECKOUT_SHA1=nocheck + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS - 18-master spatial database extension with PostgreSQL 18 bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="18-master" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 18-master spatial database extension with PostgreSQL 18 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="18-master" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + # Update environment export with runtime packages + && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/18-master/bookworm/initdb-postgis.sh b/18-master/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/18-master/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/18-master/bookworm/tags b/18-master/bookworm/tags new file mode 100644 index 000000000..62a4c5766 --- /dev/null +++ b/18-master/bookworm/tags @@ -0,0 +1 @@ +18beta1-master-bookworm 18beta1-master diff --git a/18-master/bookworm/update-postgis.sh b/18-master/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/18-master/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/18-recent/bookworm/Dockerfile b/18-recent/bookworm/Dockerfile new file mode 100644 index 000000000..3337020d9 --- /dev/null +++ b/18-recent/bookworm/Dockerfile @@ -0,0 +1,772 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh" +# source: "./templates/Dockerfile.master.template" +# PLEASE DO NOT EDIT IT DIRECTLY. +# +# "Experimental"; solely for testing purposes. Anticipate frequent changes! +# This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05. + +ARG PGIS1_BASE_IMAGE=postgres:18beta1-bookworm + +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + +ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git +ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git +ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git +ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git +ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git +ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git + +# Should valid git checkout ( SHA1, tags, branches ) +ARG PGIS1_POSTGIS_CHECKOUT=tags/3.5.3 +ARG PGIS1_GEOS_CHECKOUT=tags/3.13.1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.11.0 +ARG PGIS1_PROJ_CHECKOUT=tags/9.6.2 +ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.1.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 + +# Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' +# Otherwise, verify that the commit hash matches +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=aab5f55897aa2e8eb5f17c3996b61268c5f1ec91 +ARG PGIS1_GEOS_CHECKOUT_SHA1=431568d6e311e0bbfb057b4ec3d44d0d3ba3335f +ARG PGIS1_GDAL_CHECKOUT_SHA1=447eb5238bb6ef2837e68bf2ec742c64007b680b +ARG PGIS1_PROJ_CHECKOUT_SHA1=7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=60573cfb6b3fc01eceda563d275a226317ba01db +ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de + +ARG PGIS1_BOOST_VERSION=1.74.0 +ARG PGIS1_CMAKE_BUILD_TYPE=Release + +ARG PGIS1_GDAL_BUILD=with_extra +# Full GDAL build ; with arrow, parquet and extra dependencies + +FROM ${PGIS1_BASE_IMAGE} as builder + +WORKDIR / + +ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +# apt-get install +RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD=with_extra" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + # build dependency + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libpq-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + make \ + pkg-config \ + protobuf-c-compiler \ + xsltproc \ + # gdal+ + liblz4-dev \ + liblzma-dev \ + libwebp-dev \ + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +ARG PGIS1_CMAKE_BUILD_TYPE +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} + +FROM builder as cgal-sfcgal-builder + +# cgal & sfcgal +ARG PGIS1_SFCGAL_REPOSITORY +ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} +ARG PGIS1_SFCGAL_CHECKOUT +ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 + +ARG PGIS1_CGAL_REPOSITORY +ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} +ARG PGIS1_CGAL_CHECKOUT +ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir cgal \ + && cd cgal \ + && git init \ + && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_CGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_CGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_CGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_CGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping CGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_CGAL_CHECKOUT_SHA1}" ]; then \ + echo "CGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_cgal_last_commit.txt \ + && cd /usr/src \ + && mkdir SFCGAL \ + && cd SFCGAL \ + && git init \ + && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_SFCGAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_SFCGAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_SFCGAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping SFCGAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_SFCGAL_CHECKOUT_SHA1}" ]; then \ + echo "SFCGAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_sfcgal_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. \ + -DCGAL_DIR=/usr/src/cgal \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DSFCGAL_BUILD_BENCH=OFF \ + -DSFCGAL_BUILD_EXAMPLES=OFF \ + -DSFCGAL_BUILD_TESTS=OFF \ + -DSFCGAL_WITH_OSG=OFF \ + && make -j$(nproc) \ + && make install \ + # clean + && rm -fr /usr/src/SFCGAL \ + && rm -fr /usr/src/cgal + + +FROM builder as proj-builder + +# proj +ARG PGIS1_PROJ_REPOSITORY +ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} +ARG PGIS1_PROJ_CHECKOUT +ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir PROJ \ + && cd PROJ \ + && git init \ + && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_PROJ_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_PROJ_CHECKOUT_SHA1 + && if [ -z "${PGIS1_PROJ_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_PROJ_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping PROJ SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_PROJ_CHECKOUT_SHA1}" ]; then \ + echo "PROJ SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_proj_last_commit.txt \ + # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 + && if [ -f "autogen.sh" ] ; then \ + set -eux \ + && echo "autotools version: 'autogen.sh' exists! Older version!" \ + && ./autogen.sh \ + && ./configure --disable-static \ + && make -j$(nproc) \ + && make install \ + ; \ + else \ + set -eux \ + && echo "cmake version: 'autogen.sh' does not exists! Newer version!" \ + && mkdir build \ + && cd build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + ; \ + fi \ + \ + && rm -fr /usr/src/PROJ + + +FROM builder as geos-builder + +# geos +ARG PGIS1_GEOS_REPOSITORY +ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} +ARG PGIS1_GEOS_CHECKOUT +ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + +RUN set -eux \ + && cd /usr/src \ + && mkdir geos \ + && cd geos \ + && git init \ + && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GEOS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GEOS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GEOS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GEOS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GEOS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GEOS_CHECKOUT_SHA1}" ]; then \ + echo "GEOS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_geos_last_commit.txt \ + && mkdir cmake-build \ + && cd cmake-build \ + && cmake .. -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/geos + + +FROM builder as stage0-builder + +COPY --from=cgal-sfcgal-builder /_pgis*.* / +COPY --from=cgal-sfcgal-builder /usr/local /usr/local + +COPY --from=proj-builder /_pgis*.* / +COPY --from=proj-builder /usr/local /usr/local + +COPY --from=geos-builder /_pgis*.* / +COPY --from=geos-builder /usr/local /usr/local +# gdal +ARG PGIS1_GDAL_REPOSITORY +ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} +ARG PGIS1_GDAL_CHECKOUT +ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 + + + +# Install Arrow C++ +# also check the "Build final image" section too, for the final installation +RUN set -eux \ + # add backports \ + && apt-get update \ + && apt install -y -V ca-certificates wget \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Automatically determine the latest PGIS1 Arrow version and SOVERSION + && apt-cache showpkg libarrow-dev \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ + && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ + && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ + && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ + && echo "Detected PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + # Backup the version variables - reusing in a later stage + && echo "PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" > /_pgis1_arrow_environment.env \ + && echo "PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" >> /_pgis1_arrow_environment.env \ + # Install Arrow C++ + && apt-get install -y --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + libarrow-dev=${PGIS1_ARROW_VERSION} \ + libparquet-dev=${PGIS1_ARROW_VERSION} \ + libarrow-acero-dev=${PGIS1_ARROW_VERSION} \ + libarrow-dataset-dev=${PGIS1_ARROW_VERSION} \ + \ + libblosc-dev \ + libcfitsio-dev \ + libfreexl-dev \ + libfyba-dev \ + libhdf5-dev \ + libheif-dev \ + libkml-dev \ + libnetcdf-dev \ + libopenjp2-7-dev \ + libpng-dev \ + libqhull-dev \ + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +## GDAL_build-end + +RUN set -eux \ + && ldconfig \ + && cd /usr/src \ + && mkdir gdal \ + && cd gdal \ + && git init \ + && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_GDAL_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_GDAL_CHECKOUT_SHA1 + && if [ -z "${PGIS1_GDAL_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_GDAL_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping GDAL SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_GDAL_CHECKOUT_SHA1}" ]; then \ + echo "GDAL SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_gdal_last_commit.txt \ + \ + # gdal project directory structure - has been changed ! + && if [ -d "gdal" ] ; then \ + echo "Directory 'gdal' dir exists -> older version!" ; \ + cd gdal ; \ + else \ + echo "Directory 'gdal' does not exists! Newer version! " ; \ + fi \ + \ + && if [ -f "./autogen.sh" ]; then \ + # Building with autoconf ( old/deprecated ) + set -eux \ + && ./autogen.sh \ + && ./configure --disable-static \ + ; \ + else \ + # Building with cmake + set -eux \ + && mkdir build \ + && cd build \ + # config based on: https://salsa.debian.org/debian-gis-team/gdal/-/blob/master/debian/rules + && cmake .. \ + -DCMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + -DBUILD_TESTING=OFF \ + -DBUILD_DOCS=OFF \ + \ + -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ + -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ + -DGDAL_USE_CURL=ON \ + -DGDAL_USE_DEFLATE=ON \ + -DGDAL_USE_EXPAT=ON \ + -DGDAL_USE_GEOS=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_LIBLZMA=ON \ + -DGDAL_USE_LIBXML2=ON \ + -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_POSTGRESQL=ON \ + -DGDAL_USE_SQLITE3=ON \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_ZSTD=ON \ + \ + -DGDAL_USE_ARROW=ON \ + -DGDAL_USE_ARROWDATASET=ON \ + -DGDAL_USE_BLOSC=ON \ + -DGDAL_USE_CFITSIO=ON \ + -DGDAL_USE_FREEXL=ON \ + -DGDAL_USE_FYBA=ON \ + -DGDAL_USE_HDF5=ON \ + -DGDAL_USE_HEIF=ON \ + -DGDAL_USE_LERC_INTERNAL=ON \ + -DGDAL_USE_LIBKML=ON \ + -DGDAL_USE_NETCDF=ON \ + -DGDAL_USE_OPENJPEG=ON \ + -DGDAL_USE_PARQUET=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ + -DGDAL_USE_SPATIALITE=ON \ + ; \ + fi \ + \ + && make -j$(nproc) \ + && make install \ + && cd / \ + && rm -fr /usr/src/gdal + +# Minimal command line test. +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + && pcre-config --version + +# ------------------------------------------- +# final stage +# ------------------------------------------- +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS - 18-recent spatial database extension with PostgreSQL 18 bookworm" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="18-recent" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - 18-recent spatial database extension with PostgreSQL 18 bookworm" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="18-recent" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" + +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE +ARG PGIS1_BOOST_VERSION + +ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ + PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE} \ + PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} + +RUN set -eux \ + # Update environment export with runtime packages + && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && apt-get install -y -V --no-install-recommends \ + \ + curl \ + libboost-atomic${PGIS1_BOOST_VERSION} \ + libboost-chrono${PGIS1_BOOST_VERSION} \ + libboost-date-time${PGIS1_BOOST_VERSION} \ + libboost-filesystem${PGIS1_BOOST_VERSION} \ + libboost-program-options${PGIS1_BOOST_VERSION} \ + libboost-serialization${PGIS1_BOOST_VERSION} \ + libboost-system${PGIS1_BOOST_VERSION} \ + libboost-test${PGIS1_BOOST_VERSION} \ + libboost-thread${PGIS1_BOOST_VERSION} \ + libboost-timer${PGIS1_BOOST_VERSION} \ + libcurl3-gnutls \ + libexpat1 \ + libgmp10 \ + libgmpxx4ldbl \ + libjson-c5 \ + libmpfr6 \ + libpcre3 \ + libprotobuf-c1 \ + libtiff6 \ + libxml2 \ + sqlite3 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=stage0-builder /_pgis*.* / +COPY --from=stage0-builder /usr/local /usr/local + +# Install Arrow + Parquet + other GDAL extra dependencies + +RUN set -eux \ + # Install Arrow + Parquet + && apt-get update \ + && apt-get install -y -V ca-certificates wget \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-bookworm.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ + && apt-get install -y -V ./apache-arrow-apt-source-latest-bookworm.deb \ + && apt-get update \ + # Load the PGIS1_ARROW version variables + && . /_pgis1_arrow_environment.env \ + # Use the PGIS1_ARROW_SOVERSION as needed + && echo "Using PGIS1_ARROW_SOVERSION=$PGIS1_ARROW_SOVERSION" \ + && apt-get install -y -V --no-install-recommends \ + libarrow${PGIS1_ARROW_SOVERSION} \ + libparquet${PGIS1_ARROW_SOVERSION} \ + libarrow-dataset${PGIS1_ARROW_SOVERSION} \ + \ + # Install GDAL extra dependencies + libblosc1 \ + libcrypto++8 \ + libfreexl1 \ + libfyba0 \ + libhdf5-103-1 \ + libheif1 \ + libkmlbase1 \ + libkmldom1 \ + libkmlengine1 \ + libnetcdf19 \ + libopenjp2-7 \ + libpng16-16 \ + libqhull-r8.0 \ + librasterlite2-1 \ + libspatialite7 \ + netcdf-bin \ + libcfitsio10 \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + + +ARG PGIS1_GDAL_CHECKOUT +ARG PGIS1_GDAL_REPOSITORY +ARG PGIS1_GEOS_CHECKOUT +ARG PGIS1_GEOS_REPOSITORY +ARG PGIS1_PROJ_CHECKOUT +ARG PGIS1_PROJ_REPOSITORY +ARG PGIS1_SFCGAL_CHECKOUT +ARG PGIS1_SFCGAL_REPOSITORY +ARG PGIS1_CGAL_REPOSITORY +ARG PGIS1_CGAL_CHECKOUT + +ARG PGIS1_POSTGIS_CHECKOUT +ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 + +ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ + PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ + PGIS1_GEOS_CHECKOUT=${PGIS1_GEOS_CHECKOUT} \ + PGIS1_GEOS_REPOSITORY=${PGIS1_GEOS_REPOSITORY} \ + PGIS1_PROJ_CHECKOUT=${PGIS1_PROJ_CHECKOUT} \ + PGIS1_PROJ_REPOSITORY=${PGIS1_PROJ_REPOSITORY} \ + PGIS1_CGAL_CHECKOUT=${PGIS1_CGAL_CHECKOUT} \ + PGIS1_CGAL_REPOSITORY=${PGIS1_CGAL_REPOSITORY} \ + PGIS1_SFCGAL_CHECKOUT=${PGIS1_SFCGAL_CHECKOUT} \ + PGIS1_SFCGAL_REPOSITORY=${PGIS1_SFCGAL_REPOSITORY} \ + PGIS1_POSTGIS_CHECKOUT=${PGIS1_POSTGIS_CHECKOUT} \ + PGIS1_POSTGIS_REPOSITORY=${PGIS1_POSTGIS_REPOSITORY} + +# Minimal command line test ( fail fast ) +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + \ + # Testing ogr2ogr PostgreSQL driver. + && ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \ + || echo "ogr2ogr missing PostgreSQL driver" && exit 1 + +# Specify GDAL_CONFIG and LD_LIBRARY_PATH for PostGIS build; +# The arm64 build is very senitive. +ENV GDAL_CONFIG /usr/local/bin/gdal-config +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + +# temporary workaround for : nitdb: invalid locale settings; check LANG and LC_* environment variables +# https://github.com/docker-library/postgres/issues/1112#issuecomment-1746076388 +RUN set -eux \ + && echo en_US.UTF-8 UTF-8 >> /etc/locale.gen && locale-gen + +RUN set -eux \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + ca-certificates \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcunit1-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && cd \ + # postgis + && cd /usr/src \ + && mkdir postgis \ + && cd postgis \ + && git init \ + && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ + && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ + && git checkout FETCH_HEAD \ + # Skip SHA1 check if PGIS1_POSTGIS_CHECKOUT_SHA1 is empty or 'nocheck' + # Otherwise, verify that the commit hash matches PGIS1_POSTGIS_CHECKOUT_SHA1 + && if [ -z "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ] \ + || [ "${PGIS1_POSTGIS_CHECKOUT_SHA1}" = "nocheck" ]; then \ + echo "Skipping POSTGIS SHA1 check"; \ + else \ + if [ "$(git rev-parse HEAD)" != "${PGIS1_POSTGIS_CHECKOUT_SHA1}" ]; then \ + echo "POSTGIS SHA1 problem! Stop!"; \ + exit 1; \ + fi; \ + fi \ + && git log -1 > /_pgis_last_commit.txt \ + && ldconfig \ + && ./autogen.sh \ +# configure options taken from: +# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie + && ./configure \ + --enable-lto \ + && make -j$(nproc) \ + && make install \ +# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 + && if command -v projsync >/dev/null 2>&1; then \ + projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ + && projsync --system-directory --file us_noaa_eshpgn \ + && projsync --system-directory --file us_noaa_prvi \ + && projsync --system-directory --file us_noaa_wmhpgn ; \ + fi \ +# regress check + && mkdir /tempdb \ + && chown -R postgres:postgres /tempdb \ + && su postgres -c 'pg_ctl -D /tempdb init' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ + && ldconfig \ + && cd regress \ + && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ + && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ + && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ + && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ + \ + && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ + && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ + && rm -rf /tmp/pgis_reg \ +# clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ + && cd / \ + && rm -rf /usr/src/postgis \ + && apt-get purge -y --autoremove \ + autoconf \ + automake \ + autotools-dev \ + bison \ + build-essential \ + cmake \ + docbook-xml \ + docbook5-xml \ + g++ \ + git \ + libboost-all-dev \ + libcurl4-gnutls-dev \ + libgmp-dev \ + libjson-c-dev \ + libmpfr-dev \ + libpcre3-dev \ + libprotobuf-c-dev \ + libsqlite3-dev \ + libtiff-dev \ + libtool \ + libxml2-dev \ + libxml2-utils \ + make \ + pkg-config \ + postgresql-server-dev-$PG_MAJOR \ + protobuf-c-compiler \ + xsltproc \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /docker-entrypoint-initdb.d +COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh +COPY ./update-postgis.sh /usr/local/bin + +# last final test +RUN set -eux \ + && ldconfig \ + && cs2cs \ + && ldd $(which gdalinfo) \ + && gdalinfo --version \ + && gdal-config --formats \ + && geos-config --version \ + && ogr2ogr --version \ + && proj \ + && sfcgal-config --version \ + # check any missing dependencies + && ldd /usr/lib/postgresql/$PG_MAJOR/lib/*.so | grep 'not found' && exit 1 || true \ + \ + # Is the "ca-certificates" package installed? (for accessing remote raster files) + # https://github.com/postgis/docker-postgis/issues/307 + && dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \ + \ + # list last commits. + && find /_pgis*_commit.txt -type f -print -exec cat {} \; \ + # list postgresql, postgis version + && cat _pgis_full_version.txt diff --git a/18-recent/bookworm/initdb-postgis.sh b/18-recent/bookworm/initdb-postgis.sh new file mode 100644 index 000000000..21f8c373d --- /dev/null +++ b/18-recent/bookworm/initdb-postgis.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# shellcheck disable=SC2154 +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +# Create the 'template_postgis' template db +"${psql[@]}" <<-'EOSQL' +CREATE DATABASE template_postgis IS_TEMPLATE true; +EOSQL + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB"; do + echo "Loading PostGIS extensions into $DB" + "${psql[@]}" --dbname="$DB" <<-'EOSQL' + CREATE EXTENSION IF NOT EXISTS postgis; + CREATE EXTENSION IF NOT EXISTS postgis_topology; + -- Reconnect to update pg_setting.resetval + -- See https://github.com/postgis/docker-postgis/issues/288 + \c + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; +EOSQL +done diff --git a/18-recent/bookworm/tags b/18-recent/bookworm/tags new file mode 100644 index 000000000..711dce662 --- /dev/null +++ b/18-recent/bookworm/tags @@ -0,0 +1 @@ +18beta1-recent-bookworm 18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 18beta1-recent diff --git a/18-recent/bookworm/update-postgis.sh b/18-recent/bookworm/update-postgis.sh new file mode 100755 index 000000000..f98abd261 --- /dev/null +++ b/18-recent/bookworm/update-postgis.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +# Perform all actions as $POSTGRES_USER +export PGUSER="$POSTGRES_USER" + +POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" + +# Load PostGIS into both template_database and $POSTGRES_DB +for DB in template_postgis "$POSTGRES_DB" "${@}"; do + echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" + psql --dbname="$DB" -c " + -- Upgrade PostGIS (includes raster) + CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; + + -- Upgrade Topology + CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; + + -- Install Tiger dependencies in case not already installed + CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; + -- Upgrade US Tiger Geocoder + CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; + ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; + " +done diff --git a/Makefile b/Makefile index 040f3b2da..76207116c 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,17 @@ endif IMAGE_VERSION_ID :="" ifeq ($(ENABLE_IMAGE_VERSION_ID),true) - # Note: Make sure to keep this synchronized with the corresponding section in ./tools/environment_init.sh - COMMIT_DATE=$(shell git log -1 --format=%cd --date=format:%Y%m%d) - COMMIT_HASH=$(shell git log -1 --pretty=format:%h) - BUILD_WEEK=$(shell date '+%Yw%V') - IMAGE_VERSION_ID=-ver$(COMMIT_DATE)-$(COMMIT_HASH)-$(BUILD_WEEK) +# Note: Make sure to keep this synchronized with the corresponding section in ./tools/environment_init.sh +ifeq ($(shell git rev-parse --git-dir 2>/dev/null),) +$(warning Warning: Not in a git repository. Using fallback values for IMAGE_VERSION_ID.) +COMMIT_DATE=00000000 +COMMIT_HASH=00000000 +else +COMMIT_DATE=$(shell git log -1 --format='%cd' --date=format:'%Y%m%d') +COMMIT_HASH=$(shell git log -1 --pretty=format:'%h') +endif +BUILD_WEEK=$(shell date '+%Yw%V') +IMAGE_VERSION_ID=-ver$(COMMIT_DATE)-$(COMMIT_HASH)-$(BUILD_WEEK) endif PUSH_FULL_IMAGENAME = ;$(DOCKER) image push $(REGISTRY)/$(REPO_NAME)/$(IMAGE_NAME): @@ -55,8 +61,8 @@ OFFIMG_REPO_URL ?=https://github.com/docker-library/official-images.git # the existence of Dockerfile at the depth of two directories # where the first directory names starting with a number. DOCKERFILE_DIRS := $(shell find . -mindepth 2 -maxdepth 2 -type d -exec test -e '{}/Dockerfile' \; -print | sed 's|./||' | awk '/^[0-9]/ {print}') -VERSIONS := $(sort $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | cut -d'/' -f1)) -VARIANTS := $(sort $(shell echo '$(DOCKERFILE_DIRS)' | tr ' ' '\n' | cut -d'/' -f2)) +VERSIONS := $(sort $(foreach dir,$(DOCKERFILE_DIRS),$(firstword $(subst /, ,$(dir))))) +VARIANTS := $(sort $(foreach dir,$(DOCKERFILE_DIRS),$(lastword $(subst /, ,$(dir))))) check_variant: ifeq ($(VARIANT),default) @@ -304,6 +310,138 @@ imageclean: imageclean_${REPO_NAME}_${IMAGE_NAME}: docker image ls | grep "^${REPO_NAME}/${IMAGE_NAME}" | awk '{print $$3}' | sort -u | xargs -rt docker rmi -f +# Add new PostgreSQL version support +# Usage: make add-postgres-version PG_VERSION=19 POSTGIS_VERSION=3.5 TYPE=master +# TYPE options: master (latest debian), postgis (all debian+alpine variants), bundle (latest debian) +add-postgres-version: + @if [ -z "$(PG_VERSION)" ]; then \ + echo "Error: PG_VERSION is required."; \ + echo "Usage: make add-postgres-version PG_VERSION=19 POSTGIS_VERSION=3.5 TYPE=master"; \ + echo " TYPE options: master (latest debian), postgis (all debian+alpine), bundle (latest debian)"; \ + exit 1; \ + fi + @if [ -z "$(POSTGIS_VERSION)" ]; then \ + echo "Error: POSTGIS_VERSION is required."; \ + echo "Usage: make add-postgres-version PG_VERSION=19 POSTGIS_VERSION=3.5 TYPE=master"; \ + echo " TYPE options: master (latest debian), postgis (all debian+alpine), bundle (latest debian)"; \ + exit 1; \ + fi + @if [ -z "$(TYPE)" ]; then \ + echo "Error: TYPE is required."; \ + echo "Usage: make add-postgres-version PG_VERSION=19 POSTGIS_VERSION=3.5 TYPE=master"; \ + echo " TYPE options: master (latest debian), postgis (all debian+alpine), bundle (latest debian)"; \ + exit 1; \ + fi + @echo "Adding PostgreSQL $(PG_VERSION) with PostGIS $(POSTGIS_VERSION) support ($(TYPE) type)..." + @echo "Step 1: Adding $(PG_VERSION) to tools/versions.sh postgres_versions" + @if ! grep -q " $(PG_VERSION)" tools/versions.sh; then \ + sed -i 's/postgres_versions="\([^"]*\)"/postgres_versions="\1 $(PG_VERSION)"/' tools/versions.sh; \ + echo " Added $(PG_VERSION) to postgres_versions"; \ + else \ + echo " $(PG_VERSION) already exists in postgres_versions"; \ + fi + @echo "Step 2: Creating directory structure based on type $(TYPE)" + @DEBIAN_VARIANTS=$$(grep '^debian_variants=' tools/versions.sh | cut -d'"' -f2 | xargs); \ + ALPINE_VARIANTS=$$(grep '^alpine_variants=' tools/versions.sh | cut -d'"' -f2 | xargs); \ + DEBIAN_LATEST=$$(grep '^debian_latest=' tools/versions.sh | cut -d'"' -f2); \ + if [ "$(TYPE)" = "master" ]; then \ + echo " Creating master variant ($$DEBIAN_LATEST only)"; \ + mkdir -p $(PG_VERSION)-master/$$DEBIAN_LATEST; \ + touch $(PG_VERSION)-master/$$DEBIAN_LATEST/Dockerfile; \ + elif [ "$(TYPE)" = "postgis" ]; then \ + echo " Creating PostGIS variant (all debian + alpine variants)"; \ + for variant in $$DEBIAN_VARIANTS $$ALPINE_VARIANTS; do \ + echo " Creating $(PG_VERSION)-$(POSTGIS_VERSION)/$$variant"; \ + mkdir -p $(PG_VERSION)-$(POSTGIS_VERSION)/$$variant; \ + touch $(PG_VERSION)-$(POSTGIS_VERSION)/$$variant/Dockerfile; \ + done; \ + elif [ "$(TYPE)" = "bundle" ]; then \ + echo " Creating bundle variant ($$DEBIAN_LATEST only)"; \ + mkdir -p $(PG_VERSION)-$(POSTGIS_VERSION)-bundle0/$$DEBIAN_LATEST; \ + touch $(PG_VERSION)-$(POSTGIS_VERSION)-bundle0/$$DEBIAN_LATEST/Dockerfile; \ + else \ + echo "Error: Invalid TYPE. Must be master, postgis, or bundle"; \ + exit 1; \ + fi + @echo "Step 3: Adding configuration to locked.yml" + @if [ "$(TYPE)" = "master" ]; then \ + echo "" >> locked.yml; \ + echo "'$(PG_VERSION)-master':" >> locked.yml; \ + echo " 'bookworm':" >> locked.yml; \ + echo " _comment: \"source: ./locked.yml - PostgreSQL $(PG_VERSION) master testing\"" >> locked.yml; \ + echo " tags: '$(PG_VERSION)-master-bookworm $(PG_VERSION)-master'" >> locked.yml; \ + echo " postgis: 'master'" >> locked.yml; \ + echo " readme_group: 'test'" >> locked.yml; \ + echo " PG_MAJOR: '$(PG_VERSION)'" >> locked.yml; \ + echo " PG_DOCKER: '$(PG_VERSION)beta1'" >> locked.yml; \ + echo " arch: 'amd64 arm64'" >> locked.yml; \ + echo " template: 'Dockerfile.master.template'" >> locked.yml; \ + echo " initfile: 'initdb-postgis.sh'" >> locked.yml; \ + echo " POSTGIS_CHECKOUT: 'master'" >> locked.yml; \ + echo " POSTGIS_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " CGAL_CHECKOUT: 'master'" >> locked.yml; \ + echo " CGAL_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " SFCGAL_CHECKOUT: 'master'" >> locked.yml; \ + echo " SFCGAL_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " PROJ_CHECKOUT: 'master'" >> locked.yml; \ + echo " PROJ_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " GDAL_BUILD: 'with_extra'" >> locked.yml; \ + echo " GDAL_CHECKOUT: 'master'" >> locked.yml; \ + echo " GDAL_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " GEOS_CHECKOUT: 'main'" >> locked.yml; \ + echo " GEOS_CHECKOUT_SHA1: 'nocheck'" >> locked.yml; \ + echo " BOOST_VERSION: '1.74.0'" >> locked.yml; \ + echo " Added $(PG_VERSION)-master configuration to locked.yml"; \ + else \ + echo " For PostGIS/bundle variants, configuration will be auto-generated by update.sh"; \ + fi + @echo "Step 4: Adding optional pg_hint_plan support to tools/versions.sh" + @if ! grep -q "get_latest_version_and_hash_optional.*REL$(PG_VERSION)" tools/versions.sh; then \ + sed -i '/get_latest_version_and_hash_optional.*REL18/a get_latest_version_and_hash_optional "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL$(PG_VERSION) ""' tools/versions.sh; \ + echo " Added REL$(PG_VERSION) pg_hint_plan support"; \ + else \ + echo " REL$(PG_VERSION) pg_hint_plan support already exists"; \ + fi + @echo "" + @echo "✅ Successfully created PostgreSQL $(PG_VERSION) directory structure!" + @echo "" + @echo "Next steps:" + @echo " 1. Run update script: ./update.sh" + @if [ "$(TYPE)" = "master" ]; then \ + echo " 2. Build the image: make build-$(PG_VERSION)-master-bookworm"; \ + echo " 3. Test the image: make test-$(PG_VERSION)-master-bookworm"; \ + echo " 4. Start container: make start-$(PG_VERSION)-master-bookworm"; \ + echo " 5. Connect to DB: make psql-$(PG_VERSION)-master-bookworm"; \ + elif [ "$(TYPE)" = "postgis" ]; then \ + echo " 2. Build all variants: make build-$(PG_VERSION)-$(POSTGIS_VERSION)"; \ + echo " 3. Test all variants: make test-$(PG_VERSION)-$(POSTGIS_VERSION)"; \ + elif [ "$(TYPE)" = "bundle" ]; then \ + echo " 2. Build the bundle: make build-$(PG_VERSION)-$(POSTGIS_VERSION)-bundle0-bookworm"; \ + echo " 3. Test the bundle: make test-$(PG_VERSION)-$(POSTGIS_VERSION)-bundle0-bookworm"; \ + fi + @echo "" + @echo "Created directories:" + @DEBIAN_VARIANTS=$$(grep '^debian_variants=' tools/versions.sh | cut -d'"' -f2 | xargs); \ + ALPINE_VARIANTS=$$(grep '^alpine_variants=' tools/versions.sh | cut -d'"' -f2 | xargs); \ + DEBIAN_LATEST=$$(grep '^debian_latest=' tools/versions.sh | cut -d'"' -f2); \ + if [ "$(TYPE)" = "master" ]; then \ + echo " - $(PG_VERSION)-master/$$DEBIAN_LATEST/"; \ + elif [ "$(TYPE)" = "postgis" ]; then \ + for variant in $$DEBIAN_VARIANTS $$ALPINE_VARIANTS; do \ + echo " - $(PG_VERSION)-$(POSTGIS_VERSION)/$$variant/"; \ + done; \ + elif [ "$(TYPE)" = "bundle" ]; then \ + echo " - $(PG_VERSION)-$(POSTGIS_VERSION)-bundle0/$$DEBIAN_LATEST/"; \ + fi + @echo "" + @echo "Modified files:" + @echo " - tools/versions.sh (postgres_versions and pg_hint_plan)" + @if [ "$(TYPE)" = "master" ]; then \ + echo " - locked.yml (added $(PG_VERSION)-master configuration)"; \ + fi + @echo "" + @echo "Note: versions.json will be auto-generated when you run ./update.sh" + # Help target help: check_variant @echo ' Available make targets:' @@ -337,6 +475,7 @@ help: check_variant @echo '# clean docker image and volume' @echo $(foreach dir,$(DOCKERFILE_DIRS),' clean-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') @echo ' ' + @echo 'add-postgres-version PG_VERSION=X PG_DOCKER_TAG=Y : Add new PostgreSQL version support' @echo 'all : Local run: "update" "build" "test" (without push)' @echo 'check_version: Check the architecture and version id' @echo 'check-gh-rate: Check the github ratelimit' @@ -353,7 +492,7 @@ help: check_variant @echo 'You can check the the command without executing: make -n ' @echo ' ' -.PHONY: help build all update test-prepare test push push-readme manifest \ +.PHONY: help build all update test-prepare test push push-readme manifest add-postgres-version \ check-gh-rate check_version dockerlist lint imageclean imageclean_${REPO_NAME}_${IMAGE_NAME} \ $(foreach version,$(VERSIONS),' build-$(version)') \ $(foreach dir,$(DOCKERFILE_DIRS),' build-$(word 1,$(subst /, ,$(dir)))-$(word 2,$(subst /, ,$(dir)))') \ diff --git a/README.md b/README.md index cbca2b81e..7c3e2ea36 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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 (2025-06-16) +## Versions (2025-06-30) We provide multi-platform image support for the following architectures: @@ -58,14 +58,14 @@ For those new to PostGIS, we recommend the following image versions: - `imresamu/postgis:17-3.5-bookworm`: This image includes a minimal setup of PostgreSQL with the PostGIS extension. ( debian bookworm based, easy to extend with debian packages ) - `imresamu/postgis:17-recent-bookworm`: (experimental) Latest postgis with the latest geos,proj,gdal,sfcgal. ( debian based, extending is complex ! ) -- `imresamu/postgis:16-3.4-bundle0-bookworm`: (experimental) This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. +- `imresamu/postgis:16-3.5-bundle0-bookworm`: (experimental) This image includes additional geospatial-related extras along with PostgreSQL and PostGIS. ### 🥇Debian - bookworm (recommended) - This Docker-PostGIS version has a cautious release cycle to guarantee high stability. - By "cautious", we mean it does not always have the latest versions of geos, proj, gdal, and sfcgal packages. - We use PostGIS, geos, proj, gdal, and sfcgal packages from the Debian repository. - - In the Debian Bullseye repository, the versions are: geos=3.11, gdal=3.6, proj=9.1, and sfcgal=1.4. + The versions are: geos=3.11, gdal=3.6, proj=9.1, and sfcgal=1.4. - This version is easy to extend and has matured over time. @@ -119,6 +119,7 @@ Please note that the included package list is subject to change as we continue t | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.3 | +| [`17-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bundle0-bookworm), [`17-3.5.3-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-bundle0-bookworm), [`17-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.3 | @@ -164,6 +165,7 @@ Please note that the included package list is subject to change as we continue t | [`15-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.22), [`15-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.3-alpine3.22), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 15 | 3.5.3 | | [`16-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.22), [`16-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.22), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 16 | 3.4.4 | | [`16-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.22), [`16-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.3-alpine3.22), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 16 | 3.5.3 | +| [`17-3.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.22), [`17-3.4.4-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.22), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 17 | 3.4.4 | | [`17-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.22), [`17-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.3-alpine3.22), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 17 | 3.5.3 | @@ -181,15 +183,31 @@ Please note that the included package list is subject to change as we continue t ### 📋Test images -- We provide alpha, beta, release candidate (rc), and development (identified as ~master) versions. -- The template for the `*-master` images is updated manually, which might lead to a delay of a few weeks sometimes. -- The ~master SFCGAL version is 1.5 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch). + These experimental images are designed for testing and development purposes. They include: + + **🔬 Pre-release versions (alpha, beta, rc):** Tagged versions of upcoming PostgreSQL or PostGIS releases that are not yet stable. These use specific version tags (e.g., + `18beta1`, `3.6.0alpha1`) and provide early access to new features for testing compatibility. + + **⚙️ Development builds (`*-master`):** Built from the latest development code in the main branches of PostgreSQL, PostGIS, and all geospatial dependencies (geos, proj, gdal, + cgal, sfcgal). These represent cutting-edge functionality but may contain unstable features. + + **⚠️ Important notes:** + - Pre-release and master images may have breaking changes or bugs + - The `*-master` template is updated manually and may lag behind actual development by a few weeks + - Master builds use SFCGAL 1.5+ and CGAL locked to the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch) + - Use these images for testing only, not in production environments | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | | [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`17-3.6.0alpha1-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.6.0alpha1-alpine3.22), [`17-3.6.0alpha1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.6.0alpha1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.6/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 17 | 3.6.0alpha1 | | [`17-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master-bookworm), [`17-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`18beta1-3.5-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5-alpine3.22), [`18beta1-3.5.3-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5.3-alpine3.22), [`18beta1-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/18-3.5/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 18beta1 | 3.5.3 | +| [`18beta1-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5-bookworm), [`18beta1-3.5.3-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5.3-bookworm), [`18beta1-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/18-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 18beta1 | 3.5.3 | +| [`18beta1-3.6.0alpha1-alpine3.22`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.6.0alpha1-alpine3.22), [`18beta1-3.6.0alpha1-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-3.6.0alpha1-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/18-3.6/alpine3.22/Dockerfile) | amd64 arm64 | alpine3.22 | 18beta1 | 3.6.0alpha1 | +| [`18beta1-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-master-bookworm), [`18beta1-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/18-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 18beta1 | development: postgis, geos, proj, gdal, cgal, sfcgal | +| [`18beta1-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-recent-bookworm), [`18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm), [`18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm), [`18beta1-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=18beta1-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/18-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 18beta1 | postgis=tags/3.5.3, geos=tags/3.13.1, proj=tags/9.6.2, gdal=tags/v3.11.0, cgal=tags/v6.0.1, sfcgal=tags/v2.1.0 | ## 🚀Usage @@ -263,7 +281,7 @@ It's crucial to be aware that in a cloud environment, with default settings, the - Note that ports which are not bound to the host (i.e., `-p 5432:5432` instead of `-p 127.0.0.1:5432:5432`) will be accessible from the outside. This also applies if you configured UFW to block this specific port, as Docker manages its own iptables rules. ( [Read More](https://docs.docker.com/network/iptables/) ) -#### Recomendations: +#### Recommendations: - You can add options for using SSL ( [see postgres example](https://github.com/docker-library/postgres/issues/989#issuecomment-1222648067) ) - `-c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key` diff --git a/templates/Dockerfile.alpine.template b/templates/Dockerfile.alpine.template index d24e58eca..c54b65184 100644 --- a/templates/Dockerfile.alpine.template +++ b/templates/Dockerfile.alpine.template @@ -4,25 +4,73 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }} ARG PGIS1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} ARG PGIS1_POSTGIS_REPOSITORY ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_CHECKOUT_SHA1 +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE -LABEL maintainer="PostGIS Project - https://postgis.net" \ +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="{{ .[env.variant].POSTGIS_VERSION }}" \ + org.opencontainers.image.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="{{ .[env.variant].POSTGIS_VERSION }}" \ + org.postgis.base.revision="${PGIS1_POSTGIS_CHECKOUT_SHA1}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.base.source.repository="${PGIS1_POSTGIS_REPOSITORY}" + RUN set -eux \ + # Update package cache first + && apk update \ + # Get exact versions of available packages + && GDAL_VERSION=$(apk list --available gdal-dev | grep 'gdal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && GEOS_VERSION=$(apk list --available geos-dev | grep 'geos-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROJ_VERSION=$(apk list --available proj-dev | grep 'proj-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && SFCGAL_VERSION=$(apk list --available sfcgal-dev | grep 'sfcgal-dev-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && JSON_C_VERSION=$(apk list --available json-c | grep 'json-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PROTOBUF_C_VERSION=$(apk list --available protobuf-c | grep 'protobuf-c-' | head -1 | awk '{print $1}' | cut -d'-' -f3-) \ + && PCRE_VERSION=$(apk list --available pcre | grep '^pcre-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + && PERL_VERSION=$(apk list --available perl | grep '^perl-' | head -1 | awk '{print $1}' | cut -d'-' -f2-) \ + \ + # Export build environment for child images ( see example in the end of this file ) + && echo "export GDAL_VERSION=${GDAL_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export GEOS_VERSION=${GEOS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROJ_VERSION=${PROJ_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export SFCGAL_VERSION=${SFCGAL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export JSON_C_VERSION=${JSON_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PROTOBUF_C_VERSION=${PROTOBUF_C_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PCRE_VERSION=${PCRE_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PERL_VERSION=${PERL_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apk add --no-cache --virtual .build-deps \ - \ ca-certificates \ - gdal-dev \ - geos-dev \ - proj-dev \ - proj-util \ - sfcgal-dev \ + gdal-dev=${GDAL_VERSION} \ + geos-dev=${GEOS_VERSION} \ + proj-dev=${PROJ_VERSION} \ + proj-util=${PROJ_VERSION} \ + sfcgal-dev=${SFCGAL_VERSION} \ \ # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. @@ -59,31 +107,36 @@ RUN set -eux \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then \ + echo "ERROR: SHA1 mismatch. Expected: $PGIS1_POSTGIS_CHECKOUT_SHA1, Got: $(git rev-parse HEAD)"; \ + exit 1; \ + fi \ && git log -1 > /_pgis_last_commit.txt \ -# build PostGIS - with Link Time Optimization (LTO) enabled + # build PostGIS - with Link Time Optimization (LTO) enabled && cd /usr/src/postgis \ && gettextize \ && ./autogen.sh \ && ./configure \ --enable-lto \ + --with-optimization-flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + --disable-debug \ && make -j$(nproc) \ && make install \ \ -# This section is for refreshing the proj data for the regression tests. -# It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 -# This increases the Docker image size by about 1 MB. + # This section is for refreshing the proj data for the regression tests. + # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 + # This increases the Docker image size by about 1 MB. && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ && projsync --system-directory --file us_noaa_eshpgn \ && projsync --system-directory --file us_noaa_prvi \ && projsync --system-directory --file us_noaa_wmhpgn \ -# This section performs a regression check. + # This section performs a regression check. && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ - && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ + && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ @@ -101,35 +154,64 @@ RUN set -eux \ && rm -rf /tempdb \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ -# add .postgis-rundeps + # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ - \ - gdal \ - geos \ - proj \ - sfcgal \ - \ - json-c \ - libstdc++ \ - pcre \ - protobuf-c \ - \ + gdal=${GDAL_VERSION} \ + geos=${GEOS_VERSION} \ + proj=${PROJ_VERSION} \ + sfcgal=${SFCGAL_VERSION} \ + json-c=${JSON_C_VERSION} \ + protobuf-c=${PROTOBUF_C_VERSION} \ + pcre=${PCRE_VERSION} \ # for postgis_restore.pl ; ref: https://github.com/postgis/docker-postgis/issues/373 - perl \ - # ca-certificates: for accessing remote raster files + perl=${PERL_VERSION} \ + # no locking, system componenets + libstdc++ \ + # ca-certificates: for accessing remote raster files ; need the latest, no locking # fix https://github.com/postgis/docker-postgis/issues/307 ca-certificates \ -# clean + # clean && cd / \ && rm -rf \ /usr/src/postgis \ /usr/local/share/doc \ /usr/local/share/man \ && apk del .build-deps \ - #&& apk del .fetch-deps \ -# At the end of the build, we print the collected information -# from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. + # Add system package versions to version report + && apk list --installed | grep -E "(geos|proj|gdal|sfcgal)" >> /_pgis_full_version.txt \ + && echo "Optimization flags: ${PGIS1_OPTIMIZATION_FLAGS}" >> /_pgis_full_version.txt \ + # At the end of the build, we print the collected information + # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. && cat /_pgis_full_version.txt COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh COPY ./update-postgis.sh /usr/local/bin + + +# Draft child image example ( pgrouting ) +#======================================================== +# FROM postgis/postgis:17-3.5-alpine3.22 +# LABEL \ +# # overwrite all org.opencontainers - labels +# maintainer="pgrouting maintainers" \ +# org.opencontainers.image.description="PostGIS with pgrouting" \ +# org.opencontainers.image.source="..." \ +# org.opencontainers.image.version="..." \ +# org.opencontainers.image.revision="..." \ +# org.opencontainers.image.created="..." \ +# org.opencontainers.image.base.name="postgis/postgis:17-3.5-alpine3.22" \ +# # add your org labels +# org.pgrouting.base.maintainer="..." \ +# org.pgrouting.base.optimization="...." +# +# # Install development packages with same versions +# RUN source /usr/local/share/docker-postgis-env.sh \ +# && apk add --no-cache --virtual .pgrouting-build-deps \ +# gdal-dev=${GDAL_VERSION} \ +# geos-dev=${GEOS_VERSION} \ +# $DOCKER_PG_LLVM_DEPS \ +# cmake \ +# boost-dev \ +# g++ \ +# gcc +# .... diff --git a/templates/Dockerfile.bundle0.template b/templates/Dockerfile.bundle0.template index e15f5b80d..2f299df92 100644 --- a/templates/Dockerfile.bundle0.template +++ b/templates/Dockerfile.bundle0.template @@ -1,5 +1,4 @@ - # Experimental Geo Bundle package. # This is a work in progress and not yet ready for production. # Some packages will be removed from this bundle and others will be added. @@ -13,32 +12,25 @@ ARG IMAGE_NAME={{ env.IMAGE_NAME }} ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} -ARG PGIS1_MOBILITYDB_REPOSITORY=https://github.com/MobilityDB/MobilityDB.git -ARG PGIS1_MOBILITYDB_CHECKOUT={{ .[env.variant].MOBILITYDB_CHECKOUT }} -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1={{ .[env.variant].MOBILITYDB_CHECKOUT_SHA1 }} - -ARG PGIS1_PGSQL_HTTP_REPOSITORY=https://github.com/pramsey/pgsql-http.git -ARG PGIS1_PGSQL_HTTP_CHECKOUT={{ .[env.variant].PGSQL_HTTP_CHECKOUT }} -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_HTTP_CHECKOUT_SHA1 }} - ARG PGIS1_PGSQL_GZIP_REPOSITORY=https://github.com/pramsey/pgsql-gzip.git ARG PGIS1_PGSQL_GZIP_CHECKOUT={{ .[env.variant].PGSQL_GZIP_CHECKOUT }} ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1={{ .[env.variant].PGSQL_GZIP_CHECKOUT_SHA1 }} -ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false -ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT={{ .[env.variant].TIMESCALEDB_CHECKOUT }} -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1={{ .[env.variant].TIMESCALEDB_CHECKOUT_SHA1 }} - ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT={{ .[env.variant].PG_HINT_PLAN_CHECKOUT }} ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1={{ .[env.variant].PG_HINT_PLAN_CHECKOUT_SHA1 }} ARG PGIS1_DUCKDB_CHECKOUT={{ .[env.variant].DUCKDB_CHECKOUT }} +# usable for forking the image +ARG PGIS1_OPTIMIZATION_FLAGS=" -O3 -mtune=generic " +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + FROM ${PGIS1_BASE_IMAGE} AS builder ARG PGIS1_DUCKDB_CHECKOUT +ARG PGIS1_OPTIMIZATION_FLAGS RUN set -eux \ && apt-get update \ @@ -58,36 +50,20 @@ RUN set -eux \ postgresql-server-dev-$PG_MAJOR \ unzip \ wget \ - # MobilityDB - libgeos++-dev \ - libgsl-dev \ - libjson-c-dev \ - libproj-dev \ - # TimescaleDB - libkrb5-dev \ - # pgsql-http - libcurl4-gnutls-dev \ - # hydra (columnar) - liblz4-dev \ # pgsql-gzip zlib1g-dev \ # sqlite_fdw sqlite3 \ - # plv8 - ninja-build \ - pkg-config \ # bytemagic libmagic-dev \ # pgsoudium \ libsodium-dev \ + # pg_curl + libcurl4-gnutls-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -FROM builder as builder-http-gzip - -ARG PGIS1_PGSQL_HTTP_REPOSITORY -ARG PGIS1_PGSQL_HTTP_CHECKOUT -ARG PGIS1_PGSQL_HTTP_CHECKOUT_SHA1 +FROM builder as builder-gzip ARG PGIS1_PGSQL_GZIP_REPOSITORY ARG PGIS1_PGSQL_GZIP_CHECKOUT @@ -106,79 +82,6 @@ RUN set -eux \ && make -j$(nproc) \ && make install -RUN set -eux \ - && mkdir -p /pgsql-http \ - && cd pgsql-http \ - && git init \ - && git remote add origin ${PGIS1_PGSQL_HTTP_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_PGSQL_HTTP_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_PGSQL_HTTP_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_pgsql_http_last_commit.txt \ - && make -j$(nproc) \ - && make install - - -FROM builder as builder-timescaledb - -ARG PGIS1_TIMESCALEDB_APACHE_ONLY -ARG PGIS1_TIMESCALEDB_REPOSITORY -ARG PGIS1_TIMESCALEDB_CHECKOUT -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1 - -# Install TimescaleDB; no Arm64 apt support, so build from source -RUN set -eux \ - && mkdir -p /timescaledb \ - && cd timescaledb \ - && git init \ - && git remote add origin ${PGIS1_TIMESCALEDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_TIMESCALEDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_TIMESCALEDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_timescaledb_last_commit.txt \ - && ./bootstrap \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - \ - -DAPACHE_ONLY=${PGIS1_TIMESCALEDB_APACHE_ONLY} \ - -DREGRESS_CHECKS=OFF \ - -DSEND_TELEMETRY_DEFAULT=NO \ - -DTAP_CHECKS=OFF \ - -DWARNINGS_AS_ERRORS=OFF \ - -DENABLE_DEBUG_UTILS=OFF \ - && cd build \ - && make -j$(nproc) \ - && make install - -FROM builder as builder-mobilitydb - -ARG PGIS1_MOBILITYDB_REPOSITORY -ARG PGIS1_MOBILITYDB_CHECKOUT -ARG PGIS1_MOBILITYDB_CHECKOUT_SHA1 - -# Install MobilityDB -RUN set -eux \ - && mkdir -p /MobilityDB \ - && cd MobilityDB \ - && git init \ - && git remote add origin ${PGIS1_MOBILITYDB_REPOSITORY} \ - && git fetch --depth 1 origin ${PGIS1_MOBILITYDB_CHECKOUT} \ - && git checkout FETCH_HEAD \ - # Verify that the commit hash matches the known good one - && if [ "$(git rev-parse HEAD)" != "$PGIS1_MOBILITYDB_CHECKOUT_SHA1" ]; then exit 1; fi \ - && git log -1 > /_MobilityDB_last_commit.txt \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DCMAKE_POLICY_DEFAULT_CMP0069=NEW \ - .. \ - && make -j$(nproc) \ - && make install - FROM builder as builder-pgxn @@ -187,8 +90,6 @@ RUN pgxn install --verbose ddlx RUN pgxn install --verbose dsef RUN pgxn install --verbose json_accessors RUN pgxn install --verbose lostgis - -#RUN pgxn install --verbose parray_gin # not working on CircleCI arm .. yet RUN pgxn install --verbose permuteseq RUN pgxn install --verbose pg_curl # https://github.com/RekGRpth/pg_curl RUN pgxn install --verbose pg_roaringbitmap @@ -198,13 +99,23 @@ RUN pgxn install --verbose pg_xenophile RUN pgxn install --verbose pg_xxhash RUN pgxn install --verbose pgsodium RUN pgxn install --verbose pgsql_tweaks +# RUN pgxn install --verbose sqlite_fdw {{ if env.version | startswith("17") then ( -}} -# sqlite_fdw is not available for PG17 +# pgxman pg_duckdb is not available / not working for PG17 yet {{ ) else ( -}} -RUN USE_PGXS=1 pgxn install sqlite_fdw +# pg_duckdb +RUN set -eux \ + && curl -sfL https://install.pgx.sh -o /tmp/pgx-install.sh \ + && chmod +x /tmp/pgx-install.sh \ + && /tmp/pgx-install.sh \ + && rm /tmp/pgx-install.sh +RUN pgxman install pg_duckdb {{ ) end -}} +#RUN pgxman install hydra_columnar +#RUN pgxman install pgvectorscale +#RUN pgxman install pg_quack FROM builder as builder-other @@ -212,34 +123,6 @@ ARG PGIS1_PG_HINT_PLAN_REPOSITORY ARG PGIS1_PG_HINT_PLAN_CHECKOUT ARG PGIS1_PG_HINT_PLAN_CHECKOUT_SHA1 - -{{ if env.version | startswith("17") then ( -}} -# hydradatabase/hydra is not available for PG17 -{{ ) else ( -}} -# Add hydradatabase -RUN set -eux \ - && git clone --depth 1 https://github.com/hydradatabase/hydra \ - && cd hydra/columnar \ - && git checkout main \ - && export COLUMNAR_O3=1 \ - && ./configure \ - && make -j$(nproc) \ - && make install -{{ ) end -}} - -# {{ if env.version | startswith("16") then ( -}} -# # pg_quack is not available for PG16 -# # - https://github.com/hydradatabase/pg_quack/issues/3 -# {{ ) else ( -}} -# # add pg_quack: PG 14 and PG 15 only (PG 16 is not yet supported) -# # TODO: add pg_quack version! -# RUN set -eux \ -# && git clone --depth 1 https://github.com/hydradatabase/pg_quack \ -# && cd pg_quack \ -# && make -j$(nproc) \ -# && make install -# {{ ) end -}} - # install pg_hint_plan RUN set -eux \ && mkdir pg_hint_plan \ @@ -266,9 +149,45 @@ RUN set -eux \ FROM ${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:{{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS Bundle - {{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} " \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +ARG PGIS1_OPTIMIZATION_FLAGS +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_TIMESCALEDB_TELEMETRY + +# Export build environment for child images (enterprise-grade package version locking) +RUN set -eux \ + # Ensure docker-postgis-env.sh exists (create empty if missing) + && touch /usr/local/share/docker-postgis-env.sh \ + # Export bundle-specific build versions for child images + && echo "# Bundle0 Extension Versions" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_OPTIMIZATION_FLAGS='${PGIS1_OPTIMIZATION_FLAGS}'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PG_HINT_PLAN_CHECKOUT='{{ .[env.variant].PG_HINT_PLAN_CHECKOUT }}'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_DUCKDB_CHECKOUT='{{ .[env.variant].DUCKDB_CHECKOUT }}'" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_PGSQL_GZIP_CHECKOUT='{{ .[env.variant].PGSQL_GZIP_CHECKOUT }}'" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + # Source the environment after populating it + && . /usr/local/share/docker-postgis-env.sh + +# Only override opencontainers labels for bundle-specific info +# org.postgis.base.* labels are inherited from base image and should NOT be overridden +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS Bundle - {{ .[env.variant].PG_DOCKER }}-{{ .[env.variant].postgis }}-{{ env.variant }} with MobilityDB, TimescaleDB, DuckDB and 40+ extensions" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="{{ .[env.variant].POSTGIS_VERSION }}-bundle0" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # Bundle-specific additional extensions (base PostGIS extensions inherited from org.postgis.base.extensions) +{{ if env.version | startswith("17") then ( -}} + org.postgis.bundle0.additional.extensions="timescaledb,mobilitydb,pgsql_http,pgsql_gzip,pgrouting,pgvector,h3,pointcloud,pgaudit,byteamagic,ddlx,dsef,json_accessors,lostgis,permuteseq,pg_curl,pg_roaringbitmap,pg_rowalesce,pg_uuidv7,pg_xenophile,pg_xxhash,pgsodium,pgsql_tweaks,asn1oid,extra_window_functions,first_last_agg,hll,hypopg,icu_ext,jsquery,numeral,ogr_fdw,partman,periods,pg_fact_loader,pg_failover_slots,pg_stat_kcache,pg_wait_sampling,pgl_ddl_deploy,pglogical,pgmp,pgpcre,pgq3,pgsphere,pgtap,pldebugger,plpgsql_check,prefix,prioritize,q3c,repack,rum,show_plans,squeeze" \ + org.postgis.bundle0.excluded.pg17="sqlite_fdw,age,decoderbufs" \ +{{ ) else ( -}} + org.postgis.bundle0.additional.extensions="timescaledb,mobilitydb,pgsql_http,pgsql_gzip,pgrouting,pgvector,h3,pointcloud,pgaudit,byteamagic,ddlx,dsef,json_accessors,lostgis,permuteseq,pg_curl,pg_roaringbitmap,pg_rowalesce,pg_uuidv7,pg_xenophile,pg_xxhash,pgsodium,pgsql_tweaks,sqlite_fdw,age,decoderbufs,asn1oid,extra_window_functions,first_last_agg,hll,hypopg,icu_ext,jsquery,numeral,ogr_fdw,partman,periods,pg_fact_loader,pg_failover_slots,pg_stat_kcache,pg_wait_sampling,pgl_ddl_deploy,pglogical,pgmp,pgpcre,pgq3,pgsphere,pgtap,pldebugger,plpgsql_check,prefix,prioritize,q3c,repack,rum,show_plans,squeeze" \ +{{ ) end -}} + org.postgis.bundle0.permanently.excluded="parray_gin,pg_quack" \ + org.postgis.bundle0.optimization.flags="${PGIS1_OPTIMIZATION_FLAGS}" \ + org.postgis.bundle0.timescaledb.telemetry="${PGIS1_TIMESCALEDB_TELEMETRY}" \ + org.postgis.bundle0.duckdb.version="{{ .[env.variant].DUCKDB_CHECKOUT }}" # install all utf8 locales; # helping: https://github.com/docker-library/docs/tree/master/postgres#locale-customization @@ -317,23 +236,28 @@ RUN set -eux \ pspg \ vip-manager \ \ + # add any exceptions for PG17 or PPG16 here {{ if env.version | startswith("17") then ( -}} - #postgresql-$PG_MAJOR-age \ # not available for PG17 - #postgresql-$PG_MAJOR-decoderbufs \ # not available for PG17 + # PostgreSQL 17 specific packages {{ ) else ( -}} - postgresql-$PG_MAJOR-age \ - postgresql-$PG_MAJOR-decoderbufs \ + # PostgreSQL 16 and earlier packages {{ ) end -}} \ + postgresql-$PG_MAJOR-age \ postgresql-$PG_MAJOR-asn1oid \ + postgresql-$PG_MAJOR-auto-failover \ + postgresql-$PG_MAJOR-credcheck \ postgresql-$PG_MAJOR-cron \ + postgresql-$PG_MAJOR-decoderbufs \ postgresql-$PG_MAJOR-extra-window-functions \ postgresql-$PG_MAJOR-first-last-agg \ postgresql-$PG_MAJOR-h3 \ postgresql-$PG_MAJOR-hll \ + postgresql-$PG_MAJOR-http \ postgresql-$PG_MAJOR-hypopg \ postgresql-$PG_MAJOR-icu-ext \ postgresql-$PG_MAJOR-jsquery \ + postgresql-$PG_MAJOR-mobilitydb \ postgresql-$PG_MAJOR-numeral \ postgresql-$PG_MAJOR-ogr-fdw \ postgresql-$PG_MAJOR-partman \ @@ -363,8 +287,7 @@ RUN set -eux \ postgresql-$PG_MAJOR-rum \ postgresql-$PG_MAJOR-show-plans \ postgresql-$PG_MAJOR-squeeze \ - # add MobilityDb missing dependency from libgsl-dev - libgsl27 \ + postgresql-$PG_MAJOR-timescaledb \ # MeCab based tokenizer for pgdg-pgroonga groonga-tokenizer-mecab \ # bytemagic @@ -379,40 +302,42 @@ RUN set -eux \ ARG PGIS1_DUCKDB_CHECKOUT ENV PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT} RUN arch=$(uname -m) \ - && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed 's/tags\///') \ + && DUCKDB_VERSION=$(echo "$PGIS1_DUCKDB_CHECKOUT" | sed -E 's|^.*/||; s|^tags/||; s|^v||') \ && echo "DUCKDB_VERSION=${DUCKDB_VERSION}" \ && echo "PGIS1_DUCKDB_CHECKOUT=${PGIS1_DUCKDB_CHECKOUT}" \ && case "$arch" in \ x86_64) \ duck_binary="duckdb_cli-linux-amd64.zip" ;; \ aarch64) \ - duck_binary="duckdb_cli-linux-aarch64.zip" ;; \ + duck_binary="duckdb_cli-linux-arm64.zip" ;; \ *) \ echo "Unsupported architecture: $arch"; exit 1 ;; \ esac \ - && wget https://github.com/duckdb/duckdb/releases/download/${DUCKDB_VERSION}/$duck_binary \ + && wget https://github.com/duckdb/duckdb/releases/download/v${DUCKDB_VERSION}/$duck_binary \ && unzip $duck_binary -d /usr/local/bin \ && rm $duck_binary \ && duckdb --version -# install extensions -# https://duckdb.org/docs/extensions/overview.html -ENV DUCKDB_EXTENSIONS="arrow autocomplete excel fts httpfs icu inet json parquet postgres_scanner spatial sqlite_scanner substrait tpcds tpch visualizer" +# install duckdb extensions +ENV DUCKDB_EXTENSIONS="excel fts httpfs inet postgres_scanner spatial sqlite_scanner tpcds tpch" RUN for e in ${DUCKDB_EXTENSIONS} ; do \ echo "Installing $e ..."; \ - duckdb -c "INSTALL $e;"; \ - echo "LOAD $e;" >> $HOME/.duckdbrc; \ - done + if duckdb -c "INSTALL $e;" 2>&1 | tee /tmp/duckdb-install-$e.log; then \ + echo "Successfully installed $e"; \ + echo "LOAD $e;" >> $HOME/.duckdbrc; \ + else \ + echo "Failed to install $e, check /tmp/duckdb-install-$e.log"; \ + fi; \ + done \ + # Add core extensions to .duckdbrc (these are built-in) + && echo "LOAD autocomplete;" >> $HOME/.duckdbrc \ + && echo "LOAD icu;" >> $HOME/.duckdbrc \ + && echo "LOAD json;" >> $HOME/.duckdbrc \ + && echo "LOAD parquet;" >> $HOME/.duckdbrc # Install from stages -COPY --from=builder-http-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-http-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-mobilitydb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-mobilitydb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib - -COPY --from=builder-timescaledb /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ -COPY --from=builder-timescaledb /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib +COPY --from=builder-gzip /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ +COPY --from=builder-gzip /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib COPY --from=builder-pgxn /usr/share/postgresql/$PG_MAJOR/extension/ /usr/share/postgresql/$PG_MAJOR/extension/ COPY --from=builder-pgxn /usr/lib/postgresql/$PG_MAJOR/lib /usr/lib/postgresql/$PG_MAJOR/lib @@ -441,7 +366,7 @@ RUN set -eux \ RUN set -eux \ && cp -v /usr/share/postgresql/postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample.orig; \ # add MobilityDB and TimescaleDB requirements - echo "shared_preload_libraries = 'pg_hint_plan,postgis-3,timescaledb,pg_cron,pg_stat_statements'" >> /usr/share/postgresql/postgresql.conf.sample; \ + echo "shared_preload_libraries = 'postgis-3,pg_stat_statements,timescaledb'" >> /usr/share/postgresql/postgresql.conf.sample ; \ # MobilityDB recomendation echo "max_locks_per_transaction = 128" >> /usr/share/postgresql/postgresql.conf.sample; \ echo "timescaledb.telemetry_level=off" >> /usr/share/postgresql/postgresql.conf.sample @@ -449,4 +374,4 @@ RUN set -eux \ # for postgres_dba Use ":dba" to see menu RUN printf "%s %s %s %s\n" \\set dba \'\\\\i /postgres_dba/start.psql\' >> ~/.psqlrc -COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh \ No newline at end of file +COPY ./initdb-bundle0.sh /docker-entrypoint-initdb.d/11_bundle0.sh diff --git a/templates/Dockerfile.debian.template b/templates/Dockerfile.debian.template index 4800d1616..1f61e9719 100644 --- a/templates/Dockerfile.debian.template +++ b/templates/Dockerfile.debian.template @@ -1,37 +1,87 @@ -FROM postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +ARG PGIS1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +ARG PGIS1_POSTGRES_MAJOR={{ .[env.variant].PG_MAJOR }} +ARG PGIS1_POSTGIS_VERSION={{ .[env.variant].POSTGIS_VERSION }} +ARG PGIS1_POSTGIS_MAJOR={{ .[env.variant].POSTGIS_MAJOR }} -LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS {{ .[env.variant].POSTGIS_VERSION }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" -ENV POSTGIS_MAJOR {{ .[env.variant].POSTGIS_MAJOR }} -ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} +FROM ${PGIS1_BASE_IMAGE} + +ARG PGIS1_POSTGRES_MAJOR +ARG PGIS1_POSTGIS_VERSION +ARG PGIS1_POSTGIS_MAJOR +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ + org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} {{ env.variant }}" \ + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="${PGIS1_POSTGIS_VERSION}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS ${PGIS1_POSTGIS_VERSION} spatial database extension with PostgreSQL ${PGIS1_POSTGRES_MAJOR} {{ env.variant }}" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="${PGIS1_POSTGIS_VERSION}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" + +ENV POSTGIS_MAJOR ${PGIS1_POSTGIS_MAJOR} +ENV POSTGIS_VERSION ${PGIS1_POSTGIS_VERSION} RUN set -eux \ - && apt-get update \ - && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ - && apt-get install -y --no-install-recommends \ - # ca-certificates: for accessing remote raster files; - # fix: https://github.com/postgis/docker-postgis/issues/307 - ca-certificates \ - \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ - postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ -{{ if env.version | startswith("11") then ( -}} - # \ -{{ ) else ( -}} - postgis \ -{{ ) end -}} - && rm -rf /var/lib/apt/lists/* + # Export Debian package environment for child images + && apt-get update \ + && POSTGIS_PACKAGE_VERSION=$(apt-cache madison postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR | head -1 | awk '{print $3}') \ + && echo "export POSTGIS_PACKAGE_VERSION=${POSTGIS_PACKAGE_VERSION}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PG_MAJOR=${PG_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_MAJOR=${POSTGIS_MAJOR}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export POSTGIS_VERSION=${POSTGIS_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ + && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ + && apt-get install -y --no-install-recommends \ + # ca-certificates: for accessing remote raster files; + # fix: https://github.com/postgis/docker-postgis/issues/307 + ca-certificates \ + \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ + postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ + postgis \ + && rm -rf /var/lib/apt/lists/* # multiple LLVM existance is not allowed. RUN set -eux \ && dpkg -l | grep llvm \ && llvm_count=$(dpkg -l | grep llvm | wc -l) \ && if [ "$llvm_count" -ne 1 ]; then \ - echo "More than one llvm package or none at all found. Stopping."; \ + echo "ERROR: Expected exactly 1 LLVM package, found $llvm_count. This may cause PostGIS compilation issues."; \ + echo "Installed LLVM packages:"; \ + dpkg -l | grep llvm; \ exit 1; \ - fi + fi \ + # Add installed package versions to environment export + && dpkg -l | grep -E "(libgeos|libproj|libgdal|postgis)" | awk '{gsub(/[:.+-]/, "_", $2); print "export " $2 "=\"" $3 "\""}' >> /usr/local/share/docker-postgis-env.sh \ + && echo "# LLVM validation: passed (exactly 1 LLVM package found)" >> /usr/local/share/docker-postgis-env.sh \ + # Debug: show the generated environment file + && echo "=== Generated docker-postgis-env.sh content ===" \ + && cat /usr/local/share/docker-postgis-env.sh \ + && echo "=== End of docker-postgis-env.sh ===" \ + # Test the generated environment file by sourcing it + && echo "=== Testing docker-postgis-env.sh sourcing ===" \ + && . /usr/local/share/docker-postgis-env.sh \ + && echo "Successfully sourced docker-postgis-env.sh" \ + && echo "POSTGIS_PACKAGE_VERSION: ${POSTGIS_PACKAGE_VERSION}" \ + && echo "PG_MAJOR: ${PG_MAJOR}" \ + && echo "POSTGIS_MAJOR: ${POSTGIS_MAJOR}" \ + && echo "POSTGIS_VERSION: ${POSTGIS_VERSION}" \ + && echo "=== docker-postgis-env.sh test completed ===" RUN mkdir -p /docker-entrypoint-initdb.d COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/templates/Dockerfile.master.template b/templates/Dockerfile.master.template index 7fd3220bd..dc45062b0 100644 --- a/templates/Dockerfile.master.template +++ b/templates/Dockerfile.master.template @@ -3,6 +3,10 @@ ARG PGIS1_BASE_IMAGE=postgres:{{ .[env.variant].PG_DOCKER }}-{{ env.variant }} +# usable for forking the image +ARG PGIS1_SOURCE_REPO="https://github.com/postgis/docker-postgis" +ARG PGIS1_MAINTAINER="PostGIS Project - https://postgis.net - ${PGIS1_SOURCE_REPO}/issues" + ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git @@ -42,10 +46,19 @@ FROM ${PGIS1_BASE_IMAGE} as builder WORKDIR / ARG PGIS1_BOOST_VERSION +ARG PGIS1_CMAKE_BUILD_TYPE +ARG PGIS1_BASE_IMAGE ENV PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} # apt-get install RUN set -eux \ + # Export build environment for child images + && echo "export PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE}" > /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_BASE_IMAGE=${PGIS1_BASE_IMAGE}" >> /usr/local/share/docker-postgis-env.sh \ + && echo "export PGIS1_GDAL_BUILD={{ .[env.variant].GDAL_BUILD }}" >> /usr/local/share/docker-postgis-env.sh \ + && chmod +x /usr/local/share/docker-postgis-env.sh \ + \ && apt-get update \ && apt-get install -y --no-install-recommends \ curl \ @@ -296,12 +309,14 @@ RUN set -eux \ # add backports \ && apt-get update \ && apt install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get update \ # Automatically determine the latest PGIS1 Arrow version and SOVERSION && apt-cache showpkg libarrow-dev \ - && PGIS1_ARROW_VERSION=$(apt-cache showpkg libarrow-dev | grep -m1 'Versions:' -A1 | tail -n1 | grep -oP '^\S+') \ + && PGIS1_ARROW_VERSION=$(apt-cache madison libarrow-dev | head -1 | awk '{print $3}') \ + && [ -n "$PGIS1_ARROW_VERSION" ] || { echo "Failed to detect Arrow version"; exit 1; } \ && apt-cache depends libarrow-dev=${PGIS1_ARROW_VERSION} | tee /_pgis1_libarrow-dev-dependencies.txt \ && PGIS1_ARROW_SOVERSION=$(grep 'Depends: libarrow' /_pgis1_libarrow-dev-dependencies.txt | grep -oP 'libarrow\K[0-9]+') \ && echo "Detected PGIS1_ARROW_VERSION=$PGIS1_ARROW_VERSION" \ @@ -448,9 +463,26 @@ RUN set -eux \ # ------------------------------------------- FROM ${PGIS1_BASE_IMAGE} -LABEL maintainer="PostGIS Project - https://postgis.net" \ +ARG PGIS1_SOURCE_REPO +ARG PGIS1_MAINTAINER +ARG PGIS1_BASE_IMAGE + +LABEL maintainer="${PGIS1_MAINTAINER}" \ org.opencontainers.image.description="PostGIS - {{ env.version }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ - org.opencontainers.image.source="https://github.com/postgis/docker-postgis" + org.opencontainers.image.source="${PGIS1_SOURCE_REPO}" \ + org.opencontainers.image.version="{{ env.version }}" \ + org.opencontainers.image.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.opencontainers.image.base.name="${PGIS1_BASE_IMAGE}" \ + \ + # child friendly image labels, so some duplacted labels expected + org.postgis.base.maintainer="${PGIS1_MAINTAINER}" \ + org.postgis.base.description="PostGIS - {{ env.version }} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ + org.postgis.base.source="${PGIS1_SOURCE_REPO}" \ + org.postgis.base.version="{{ env.version }}" \ + org.postgis.base.created="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \ + org.postgis.base.extensions="postgis,postgis_raster,postgis_sfcgal,postgis_topology,postgis_tiger_geocoder,address_standardizer" \ + org.postgis.base.name="${PGIS1_BASE_IMAGE}" \ + org.postgis.base.repositories="POSTGIS:${PGIS1_POSTGIS_REPOSITORY},GEOS:${PGIS1_GEOS_REPOSITORY},GDAL:${PGIS1_GDAL_REPOSITORY},PROJ:${PGIS1_PROJ_REPOSITORY},SFCGAL:${PGIS1_SFCGAL_REPOSITORY},CGAL:${PGIS1_CGAL_REPOSITORY}" ARG PGIS1_CMAKE_BUILD_TYPE ARG PGIS1_BASE_IMAGE @@ -461,7 +493,10 @@ ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} \ PGIS1_BOOST_VERSION=${PGIS1_BOOST_VERSION} RUN set -eux \ + # Update environment export with runtime packages && apt-get update \ + && BOOST_INSTALLED_VERSION=$(dpkg-query -W -f='${Version}' libboost-atomic${PGIS1_BOOST_VERSION} 2>/dev/null || echo "not-found") \ + && echo "export BOOST_INSTALLED_VERSION=${BOOST_INSTALLED_VERSION}" >> /usr/local/share/docker-postgis-env.sh \ && apt-get install -y -V --no-install-recommends \ \ curl \ @@ -503,7 +538,8 @@ RUN set -eux \ # Install Arrow + Parquet && apt-get update \ && apt-get install -y -V ca-certificates wget \ - && wget https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + && wget -q --timeout=30 --tries=3 https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-{{ env.variant }}.deb \ + || { echo "Failed to download Arrow apt source"; exit 1; } \ && apt-get install -y -V ./apache-arrow-apt-source-latest-{{ env.variant }}.deb \ && apt-get update \ # Load the PGIS1_ARROW version variables @@ -692,6 +728,12 @@ RUN set -eux \ && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean + # Add final version information to environment export + && echo "PostGIS build completed at $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> /usr/local/share/docker-postgis-env.sh \ + && find /_pgis*_commit.txt -type f -exec basename {} \; | while read commit_file; do \ + commit_hash=$(cat "/${commit_file}" | head -1 | awk '{print $2}') \ + && echo "export ${commit_file%.txt}=\"${commit_hash}\"" >> /usr/local/share/docker-postgis-env.sh; \ + done \ && cd / \ && rm -rf /usr/src/postgis \ && apt-get purge -y --autoremove \ diff --git a/test/tests/postgis-bundle/run.sh b/test/tests/postgis-bundle/run.sh index 1c51cf324..51d715c94 100755 --- a/test/tests/postgis-bundle/run.sh +++ b/test/tests/postgis-bundle/run.sh @@ -31,7 +31,7 @@ psql() { # Set default values for POSTGRES_TEST_TRIES and POSTGRES_TEST_SLEEP if they are not set. # You can change the default value of POSTGRES_TEST_TRIES and the POSTGRES_TEST_SLEEP in the CI build settings. # For special cases like Buildx/qemu tests, you may need to set POSTGRES_TEST_TRIES to 42. -: "${POSTGRES_TEST_TRIES:=15}" +: "${POSTGRES_TEST_TRIES:=30}" : "${POSTGRES_TEST_SLEEP:=2}" tries="$POSTGRES_TEST_TRIES" while ! echo 'SELECT 1' | psql &>/dev/null; do @@ -44,25 +44,48 @@ while ! echo 'SELECT 1' | psql &>/dev/null; do sleep "$POSTGRES_TEST_SLEEP" done +# -------- not working ; need more debug ---------- +##"" +##-- create extension if not exists periods cascade; +##-- create extension if not exists pg_cron cascade; +##-- create extension if not exists pg_stat_kcache cascade; +##-- create extension if not exists pg_xenophile cascade; +##-- create extension if not exists pgsodium cascade; +##""" + ## Minimal create extension test echo " -create extension if not exists asn1oid cascade; -create extension if not exists ddlx cascade; -create extension if not exists gzip cascade; -create extension if not exists h3 cascade; -create extension if not exists h3_postgis cascade; +create extension if not exists age cascade; +create extension if not exists byteamagic cascade; +create extension if not exists credcheck cascade; +create extension if not exists ddlx cascade; +create extension if not exists file_fdw cascade; +create extension if not exists first_last_agg cascade; +create extension if not exists gzip cascade; +create extension if not exists gzip cascade; +create extension if not exists h3 cascade; +create extension if not exists h3_postgis cascade; create extension if not exists hstore_plpython3u cascade; -create extension if not exists http cascade; -create extension if not exists mobilitydb cascade; -create extension if not exists ogr_fdw cascade; -create extension if not exists pg_curl cascade; -create extension if not exists pg_uuidv7 cascade; -create extension if not exists pgrouting cascade; -create extension if not exists pgtap cascade; -create extension if not exists plpython3u cascade; -create extension if not exists prioritize cascade; -create extension if not exists q3c cascade; -create extension if not exists vector cascade; +create extension if not exists http cascade; +create extension if not exists hypopg cascade; +create extension if not exists icu_ext cascade; +create extension if not exists json_accessors cascade; +create extension if not exists mobilitydb cascade; +create extension if not exists moddatetime cascade; +create extension if not exists numeral cascade; +create extension if not exists ogr_fdw cascade; +create extension if not exists permuteseq cascade; +create extension if not exists pg_buffercache cascade; +create extension if not exists pg_curl cascade; +create extension if not exists pg_fact_loader cascade; +create extension if not exists pg_show_plans cascade; +create extension if not exists pg_uuidv7 cascade; +create extension if not exists pgrouting cascade; +create extension if not exists pgtap cascade; +create extension if not exists plpython3u cascade; +create extension if not exists prioritize cascade; +create extension if not exists q3c cascade; +create extension if not exists vector cascade; " | psql echo " diff --git a/tools/cache_helper.sh b/tools/cache_helper.sh new file mode 100755 index 000000000..e4bf4648b --- /dev/null +++ b/tools/cache_helper.sh @@ -0,0 +1,154 @@ +#!/bin/bash +# Cache management functions for API calls +# Reduces GitHub API rate limiting by caching responses + +set -Eeuo pipefail + +CACHE_DIR="_cache" +CACHE_TIMESTAMPS_FILE="${CACHE_DIR}/cache_timestamps.txt" + +# Initialize cache directory +cache_init() { + mkdir -p "$CACHE_DIR" + [[ -f "$CACHE_TIMESTAMPS_FILE" ]] || touch "$CACHE_TIMESTAMPS_FILE" +} + +# Check if cache file is valid (within TTL) +cache_is_valid() { + local cache_file="$1" + local ttl_hours="${2:-6}" + local max_age=$((ttl_hours * 3600)) + + if [[ -f "$cache_file" ]]; then + local file_age=$(( $(date +%s) - $(stat -c %Y "$cache_file") )) + if [[ $file_age -lt $max_age ]]; then + return 0 # Valid + fi + fi + return 1 # Invalid or doesn't exist +} + +# Get data from cache if valid +cache_get() { + local cache_key="$1" + local cache_file="${CACHE_DIR}/${cache_key}.txt" + local ttl_hours="${2:-6}" + + cache_init + + if cache_is_valid "$cache_file" "$ttl_hours"; then + echo "# Cache hit: $cache_key ($(stat -c %y "$cache_file"))" >&2 + cat "$cache_file" + return 0 + else + echo "# Cache miss: $cache_key" >&2 + return 1 + fi +} + +# Store data in cache +cache_store() { + local cache_key="$1" + local data="$2" + local cache_file="${CACHE_DIR}/${cache_key}.txt" + + cache_init + + echo "$data" > "$cache_file" + + # Update timestamp record + grep -v "^${cache_key}=" "$CACHE_TIMESTAMPS_FILE" > "${CACHE_TIMESTAMPS_FILE}.tmp" 2>/dev/null || true + echo "${cache_key}=$(date +%s)" >> "${CACHE_TIMESTAMPS_FILE}.tmp" + mv "${CACHE_TIMESTAMPS_FILE}.tmp" "$CACHE_TIMESTAMPS_FILE" + + echo "# Cached: $cache_key" >&2 +} + +# Clean old cache files +cache_cleanup() { + local days_old="${1:-7}" + + if [[ -d "$CACHE_DIR" ]]; then + echo "# Cleaning cache files older than $days_old days..." >&2 + find "$CACHE_DIR" -name "*.txt" -type f -mtime +"$days_old" -delete 2>/dev/null || true + fi +} + +# Show cache status +cache_status() { + echo "# Cache Directory: $CACHE_DIR" + if [[ -d "$CACHE_DIR" ]]; then + echo "# Cache files:" + find "$CACHE_DIR" -name "*.txt" -type f -exec ls -lah {} \; 2>/dev/null || echo "# No cache files found" + else + echo "# Cache directory doesn't exist" + fi +} + +# Wrapper for curl with cache support +cached_curl() { + local cache_key="$1" + local url="$2" + local ttl_hours="${3:-6}" + shift 3 + local curl_args=("$@") + + # Try cache first + if cache_get "$cache_key" "$ttl_hours"; then + return 0 + fi + + # Cache miss - make API call + echo "# Fetching from API: $url" >&2 + local response + if response=$(curl -s "${curl_args[@]}" "$url"); then + cache_store "$cache_key" "$response" + echo "$response" + return 0 + else + echo "# API call failed for: $url" >&2 + return 1 + fi +} + +# Check GitHub rate limit before making API calls +check_github_rate_limit() { + local min_required="${1:-8}" # Default: need at least 8 requests + + echo "# Checking GitHub rate limit before API calls..." + + # Get rate limit info from headers + local rateLimitHeaders + if ! rateLimitHeaders=$(curl -sI https://api.github.com/users/postgis 2>/dev/null | grep -i x-ratelimit); then + echo "# Failed to check GitHub rate limit - proceeding with caution" + return 0 # Allow to continue if check fails + fi + + local rateLimitRemaining + rateLimitRemaining=$(echo "$rateLimitHeaders" | grep -i 'x-ratelimit-remaining:' | grep -o '[[:digit:]]*' || echo "0") + + echo "# GitHub rate limit remaining: $rateLimitRemaining" + + if [ "${rateLimitRemaining}" -le "${min_required}" ]; then + echo + echo " You do not have enough github requests available to continue!" + echo " Current remaining: $rateLimitRemaining, required: $min_required" + echo + echo " Without logging - the github api is limited to 60 requests per hour" + echo " see: https://developer.github.com/v3/#rate-limiting " + echo " You can check your remaining requests with :" + echo " curl -sI https://api.github.com/users/postgis | grep x-ratelimit " + echo + echo " ------------------------ " + echo "$rateLimitHeaders" + echo + echo " The limit will be reset at :" + echo "$rateLimitHeaders" | grep -i 'x-ratelimit-reset:' | cut -d' ' -f2 | xargs -I {} date -d @{} 2>/dev/null || echo "Unable to parse reset time" + return 1 # Fail - not enough requests + fi + + return 0 # Success - enough requests available +} + +# Export functions for use in other scripts +export -f cache_init cache_is_valid cache_get cache_store cache_cleanup cache_status cached_curl check_github_rate_limit \ No newline at end of file diff --git a/tools/environment_init.sh b/tools/environment_init.sh index 2577b8332..fe6da9ff5 100755 --- a/tools/environment_init.sh +++ b/tools/environment_init.sh @@ -60,8 +60,14 @@ IMAGE_VERSION_ID="" # Generate IMAGE_VERSION_ID if ENABLE_IMAGE_VERSION_ID is set to true if [[ "${ENABLE_IMAGE_VERSION_ID:-}" == "true" ]]; then # Note: Make sure to keep this synchronized with the corresponding section in Makefile - COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y%m%d) - COMMIT_HASH=$(git log -1 --pretty=format:%h) + if git rev-parse --git-dir >/dev/null 2>&1; then + COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y%m%d) + COMMIT_HASH=$(git log -1 --pretty=format:%h) + else + echo "Warning: Not in a git repository. Using fallback values for IMAGE_VERSION_ID." >&2 + COMMIT_DATE="00000000" + COMMIT_HASH="00000000" + fi BUILD_WEEK=$(date '+%Yw%V') IMAGE_VERSION_ID="-ver${COMMIT_DATE}-${COMMIT_HASH}-${BUILD_WEEK}" fi diff --git a/tools/install_dive.sh b/tools/install_dive.sh index a7a09789b..b6537a952 100755 --- a/tools/install_dive.sh +++ b/tools/install_dive.sh @@ -1,16 +1,16 @@ #!/bin/bash set -Eeuo pipefail -# https://github.com/wagoodman/dive/releases/tag/v0.12.0 -version="0.12.0" +# https://github.com/wagoodman/dive/releases/tag/v0.13.1 +version="0.13.1" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then IMAGE_ARCH=amd64 - checksum="20a7966523a0905f950c4fbf26471734420d6788cfffcd4a8c4bc972fded3e96 tools/dive_0.12.0_linux_amd64.tar.gz" + checksum="0970549eb4a306f8825a84145a2534153badb4d7dcf3febd1967c706367c3d0e tools/dive_0.13.1_linux_amd64.tar.gz" elif [[ "$(uname -m)" == "aarch64" ]]; then IMAGE_ARCH=arm64 - checksum="a2a1470302cdfa367a48f80b67bbf11c0cd8039af9211e39515bd2bbbda58fea tools/dive_0.12.0_linux_arm64.tar.gz" + checksum="2fcd2cf20f634ccdb41efac44048b204bfc867c115641f37a7420693ed480a18 tools/dive_0.13.1_linux_arm64.tar.gz" else echo "Architecture not supported: $(uname -m)" exit 1 diff --git a/tools/install_manifest-tool.sh b/tools/install_manifest-tool.sh index 2547d8521..785c8e34a 100755 --- a/tools/install_manifest-tool.sh +++ b/tools/install_manifest-tool.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail # https://github.com/estesp/manifest-tool -version="2.1.9" +version="2.2.0" # Determine IMAGE_ARCH based on the machine architecture if [[ "$(uname -m)" == "x86_64" ]]; then diff --git a/tools/install_shellcheck.sh b/tools/install_shellcheck.sh index 258126e70..57dfc5fb3 100755 --- a/tools/install_shellcheck.sh +++ b/tools/install_shellcheck.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail # https://github.com/koalaman/shellcheck#installing-a-pre-compiled-binary -scversion="stable" # or "v0.4.7", or "latest" +scversion="stable" wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv cp "shellcheck-${scversion}/shellcheck" /usr/bin/ shellcheck --version diff --git a/tools/manifest.sh b/tools/manifest.sh index 06639f203..940e82998 100755 --- a/tools/manifest.sh +++ b/tools/manifest.sh @@ -565,6 +565,26 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.21 \ --target ${dockername}:17-3.4.4-alpine3.21 || true +# ----- 17-3.4-alpine3.22 ----- + +echo "manifest: ${dockername}:17-3.4-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.4-alpine3.22 \ + --target ${dockername}:17-3.4-alpine3.22 || true + +echo "manifest: ${dockername}:17-3.4.4-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.4.4-alpine3.22 \ + --target ${dockername}:17-3.4.4-alpine3.22 || true + +echo "manifest: ${dockername}:17-3.4-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.4-alpine \ + --target ${dockername}:17-3.4-alpine || true + # ----- 17-3.5-alpine3.21 ----- echo "manifest: ${dockername}:17-3.5-alpine3.21" @@ -645,6 +665,46 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-3.5.2-bullseye \ --target ${dockername}:17-3.5.2-bullseye || true +# ----- 17-3.5-bundle0-bookworm ----- + +echo "manifest: ${dockername}:17-3.5-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bundle0-bookworm \ + --target ${dockername}:17-3.5-bundle0-bookworm || true + +echo "manifest: ${dockername}:17-3.5.3-bundle0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5.3-bundle0-bookworm \ + --target ${dockername}:17-3.5.3-bundle0-bookworm || true + +echo "manifest: ${dockername}:17-3.5-bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.5-bundle0 \ + --target ${dockername}:17-3.5-bundle0 || true + +echo "manifest: ${dockername}:bundle0" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:bundle0 \ + --target ${dockername}:bundle0 || true + +# ----- 17-3.6-alpine3.22 ----- + +echo "manifest: ${dockername}:17-3.6.0alpha1-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.6.0alpha1-alpine3.22 \ + --target ${dockername}:17-3.6.0alpha1-alpine3.22 || true + +echo "manifest: ${dockername}:17-3.6.0alpha1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:17-3.6.0alpha1-alpine \ + --target ${dockername}:17-3.6.0alpha1-alpine || true + # ----- 17-master-bookworm ----- echo "manifest: ${dockername}:17-master-bookworm" @@ -690,3 +750,97 @@ manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template ${dockername}-ARCHVARIANT:recent \ --target ${dockername}:recent || true + +# ----- 18-3.5-alpine3.22 ----- + +echo "manifest: ${dockername}:18beta1-3.5-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5-alpine3.22 \ + --target ${dockername}:18beta1-3.5-alpine3.22 || true + +echo "manifest: ${dockername}:18beta1-3.5.3-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5.3-alpine3.22 \ + --target ${dockername}:18beta1-3.5.3-alpine3.22 || true + +echo "manifest: ${dockername}:18beta1-3.5-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5-alpine \ + --target ${dockername}:18beta1-3.5-alpine || true + +# ----- 18-3.5-bookworm ----- + +echo "manifest: ${dockername}:18beta1-3.5-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5-bookworm \ + --target ${dockername}:18beta1-3.5-bookworm || true + +echo "manifest: ${dockername}:18beta1-3.5.3-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5.3-bookworm \ + --target ${dockername}:18beta1-3.5.3-bookworm || true + +echo "manifest: ${dockername}:18beta1-3.5" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.5 \ + --target ${dockername}:18beta1-3.5 || true + +# ----- 18-3.6-alpine3.22 ----- + +echo "manifest: ${dockername}:18beta1-3.6.0alpha1-alpine3.22" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.6.0alpha1-alpine3.22 \ + --target ${dockername}:18beta1-3.6.0alpha1-alpine3.22 || true + +echo "manifest: ${dockername}:18beta1-3.6.0alpha1-alpine" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-3.6.0alpha1-alpine \ + --target ${dockername}:18beta1-3.6.0alpha1-alpine || true + +# ----- 18-master-bookworm ----- + +echo "manifest: ${dockername}:18beta1-master-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-master-bookworm \ + --target ${dockername}:18beta1-master-bookworm || true + +echo "manifest: ${dockername}:18beta1-master" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-master \ + --target ${dockername}:18beta1-master || true + +# ----- 18-recent-bookworm ----- + +echo "manifest: ${dockername}:18beta1-recent-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-recent-bookworm \ + --target ${dockername}:18beta1-recent-bookworm || true + +echo "manifest: ${dockername}:18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm \ + --target ${dockername}:18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm || true + +echo "manifest: ${dockername}:18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm \ + --target ${dockername}:18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm || true + +echo "manifest: ${dockername}:18beta1-recent" +manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template ${dockername}-ARCHVARIANT:18beta1-recent \ + --target ${dockername}:18beta1-recent || true diff --git a/tools/setup_local_environment.sh b/tools/setup_local_environment.sh new file mode 100755 index 000000000..df7fc5285 --- /dev/null +++ b/tools/setup_local_environment.sh @@ -0,0 +1,118 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +echo "==============================================" +echo "Docker PostGIS - Local Development Environment Setup" +echo "==============================================" +echo "" + +# Check if running on Ubuntu/Debian +if ! command -v apt-get &> /dev/null; then + echo "Error: This script is designed for Ubuntu/Debian systems with apt-get package manager." + exit 1 +fi + +# Check if Docker is installed +if ! command -v docker &> /dev/null; then + echo "Error: Docker is not installed." + echo "Please install Docker first from: https://docs.docker.com/engine/install/ubuntu/" + exit 1 +fi + +# Check if running as root (not recommended for development) +if [[ $EUID -eq 0 ]]; then + echo "Warning: Running as root is not recommended for development environment setup." + echo "Consider running this script as a regular user with sudo privileges." + read -p "Continue anyway? (y/N): " -r + if [[ ! $REPLY =~ ^[Yy]$ ]]; then + exit 1 + fi +fi + +echo "Step 1: Updating system packages..." +sudo apt-get update || true + +echo "" +echo "Step 2: Installing system dependencies..." +# Install required system packages (compatible with Ubuntu 20.04-25.04) +sudo apt-get install -y \ + python3 \ + python3-pip \ + python3-venv \ + curl \ + wget \ + jq \ + gawk \ + git \ + make + +echo "" +echo "Step 3: Setting up Python virtual environment..." +# Create virtual environment if it doesn't exist +if [[ ! -d "venv-docker-postgis" ]]; then + python3 -m venv venv-docker-postgis + echo "Created Python virtual environment in ./venv-docker-postgis" +else + echo "Python virtual environment already exists in ./venv-docker-postgis" +fi + +# Activate virtual environment +# shellcheck source=/dev/null +source venv-docker-postgis/bin/activate +echo "Activated Python virtual environment" + +echo "" +echo "Step 4: Installing Python packages..." +# Upgrade pip and install required Python packages +pip3 install --upgrade pip +pip3 install --upgrade lastversion check-jsonschema + +echo "" +echo "Step 5: Installing manifest-tool..." +if ! command -v manifest-tool &> /dev/null; then + ./tools/install_manifest-tool.sh + echo "manifest-tool installed successfully" +else + echo "manifest-tool is already installed" + manifest-tool -v +fi + +echo "" +echo "Step 6: Installing dive tool..." +if [[ ! -f "tools/dive" ]]; then + ./tools/install_dive.sh + echo "dive tool installed successfully" +else + echo "dive tool already exists" + ./tools/dive -v +fi + +echo "" +echo "Step 7: Initializing environment..." +# shellcheck source=/dev/null +source ./tools/environment_init.sh + +echo "" +echo "Step 8: Running version check..." +make check_version + +echo "" +echo "==============================================" +echo "Setup completed successfully!" +echo "==============================================" +echo "" +echo "To use this environment in the future:" +echo " 1. cd $(pwd)" +echo " 2. source venv-docker-postgis/bin/activate" +echo " 3. source ./tools/environment_init.sh" +echo "" +echo "Available commands:" +echo " make build # Build all images" +echo " make test # Test all images" +echo " make lint # Run shellcheck" +echo " ./update.sh # Update all configurations" +echo " ./tools/versions.sh # Check for new versions" +echo "" +echo "For more information, see the Makefile targets:" +echo " make help" +echo "" \ No newline at end of file diff --git a/tools/versions.sh b/tools/versions.sh index 570f335e8..41ca68906 100755 --- a/tools/versions.sh +++ b/tools/versions.sh @@ -4,6 +4,7 @@ set -Eeuo pipefail # Source environment variables and necessary configurations source tools/environment_init.sh +source tools/cache_helper.sh [ -f ./versions.json ] # This code derived from: @@ -25,8 +26,8 @@ debian_latest="bookworm" alpine_latest="alpine3.22" postgis_latest="3.5" postgres_latest="17" -postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5" -postgres_versions="13 14 15 16 17" +postgis_versions="3.0 3.1 3.2 3.3 3.4 3.5 3.6" +postgres_versions="13 14 15 16 17 18" # MASTER_BRANCH_MODE='flexible'=if you want to use the latest version of the dependencies - automatically # if not set, it will use the locked version, and the checkout hash will be used @@ -73,10 +74,19 @@ function get_tag_hash() { # remove tag/ prefix if exists. version=${version#tags/} - git ls-remote --sort="v:refname" "$repo" refs/tags/"$version"* | - grep -E 'refs/tags/'"$version"'(\^\{\})?$' | - tail -n1 | - awk '{print $1}' + # Cache git ls-remote calls (6 hour TTL) + local cache_key + cache_key="git_tag_hash_${repo//[^a-zA-Z0-9]/_}_$version" + if tagResponse=$(cache_get "$cache_key" 6); then + echo "$tagResponse" + else + tagResponse=$(git ls-remote --sort="v:refname" "$repo" refs/tags/"$version"* | + grep -E 'refs/tags/'"$version"'(\^\{\})?$' | + tail -n1 | + awk '{print $1}') + cache_store "$cache_key" "$tagResponse" + echo "$tagResponse" + fi } # extracts a version number and limits it to up to two segments (digits separated by dots). @@ -115,10 +125,11 @@ function fetch_postgres_docker_versions() { postgres_all_docker_versions="" while true; do local response - response=$(curl --silent "https://registry.hub.docker.com/v2/repositories/library/postgres/tags?page=${page}&page_size=${PAGE_SIZE}") || { + # Try cache first, then API call + if ! response=$(cached_curl "dockerhub_postgres_page_${page}" "https://registry.hub.docker.com/v2/repositories/library/postgres/tags?page=${page}&page_size=${PAGE_SIZE}" 6); then echo "Failed to fetch from registry.hub.docker.com" return 1 - } + fi # Extract tag names from the JSON response local tags @@ -158,38 +169,57 @@ for variant in ${postgres_versions}; do done echo " " -# Check if the github api is limited <= 8 requests; if so, do not continue -if [ "$api_preference" == "github" ]; then - rateLimitRemaining=$(curl -iks https://api.github.com/users/postgis 2>&1 | grep -im1 'X-Ratelimit-Remaining:' | grep -o '[[:digit:]]*') - echo "github rateLimitRemaining = ${rateLimitRemaining}" - echo " " - if [ "${rateLimitRemaining}" -le 8 ]; then - echo - echo " You do not have enough github requests available to continue!" - echo - echo " Without logging - the github api is limited to 60 requests per hour" - echo " see: https://developer.github.com/v3/#rate-limiting " - echo " You can check your remaining requests with :" - echo " curl -sI https://api.github.com/users/postgis | grep x-ratelimit " - echo - echo " ------------------------ " - curl -sI https://api.github.com/users/postgis | grep x-ratelimit - echo - echo " The limit will be reset at :" - curl -sI https://api.github.com/users/postgis | grep x-ratelimit-reset | cut -d' ' -f2 | xargs -I {} date -d @{} + +packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' + +# Check if we need to fetch git branch HEADs (check cache first) +need_git_calls=false +for git_check in "git_branch_cgal_5.6.x" "git_branch_sfcgal_master" "git_branch_proj_master" "git_branch_gdal_master" "git_branch_geos_main" "git_branch_postgis_master"; do + if ! cache_get "$git_check" 2 >/dev/null; then + need_git_calls=true + break + fi +done + +# Check GitHub rate limit before git ls-remote calls (if needed) +if [ "$need_git_calls" = true ]; then + if ! check_github_rate_limit 10; then # Need ~6 requests for git ls-remote calls exit 1 fi fi -packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/' -cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" -sfcgalGitHash="$(git ls-remote https://gitlab.com/sfcgal/SFCGAL.git heads/master | awk '{ print $1}')" -projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" -gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" -geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')" -postgisGitHash="$(git ls-remote https://github.com/postgis/postgis.git heads/master | awk '{ print $1}')" - -# Function to get the latest version tag and its SHA1 hash +# Cache git branch HEAD hashes (2 hour TTL) +if ! cgal5XGitHash=$(cache_get "git_branch_cgal_5.6.x" 2); then + cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')" + cache_store "git_branch_cgal_5.6.x" "$cgal5XGitHash" +fi + +if ! sfcgalGitHash=$(cache_get "git_branch_sfcgal_master" 2); then + sfcgalGitHash="$(git ls-remote https://gitlab.com/sfcgal/SFCGAL.git heads/master | awk '{ print $1}')" + cache_store "git_branch_sfcgal_master" "$sfcgalGitHash" +fi + +if ! projGitHash=$(cache_get "git_branch_proj_master" 2); then + projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')" + cache_store "git_branch_proj_master" "$projGitHash" +fi + +if ! gdalGitHash=$(cache_get "git_branch_gdal_master" 2); then + gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')" + cache_store "git_branch_gdal_master" "$gdalGitHash" +fi + +if ! geosGitHash=$(cache_get "git_branch_geos_main" 2); then + geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')" + cache_store "git_branch_geos_main" "$geosGitHash" +fi + +if ! postgisGitHash=$(cache_get "git_branch_postgis_master" 2); then + postgisGitHash="$(git ls-remote https://github.com/postgis/postgis.git heads/master | awk '{ print $1}')" + cache_store "git_branch_postgis_master" "$postgisGitHash" +fi + +# Function to get the latest version tag and its SHA1 hash (with caching) get_latest_version_and_hash() { # Argument 1: Repository URL local repo_url="$1" @@ -205,7 +235,39 @@ get_latest_version_and_hash() { # remove tag/ prefix if exists. checkout_lock=${checkout_lock#tags/} + # Save original repo_only for cache key + local original_repo_only="$repo_only" + + # Create cache key based on all parameters + local cache_key="lastversion_${repo_id}_${repo_development}_${original_repo_only}_${checkout_lock}" + cache_key=${cache_key//[^a-zA-Z0-9]/_} + echo "[+] Checking lastversion : $repo_id - $repo_url" + + # Try cache first (6 hour TTL) + if cachedResult=$(cache_get "$cache_key" 6); then + echo " Using cached result for $repo_id" + # Parse cached result: version|sha1 + local cached_version + local cached_sha1 + cached_version=$(echo "$cachedResult" | cut -d'|' -f1) + cached_sha1=$(echo "$cachedResult" | cut -d'|' -f2) + + # Set the variables as the original function would (after repo_only processing) + if [[ "$repo_only" == "norepo" ]]; then + repo_only="" + fi + local var_name="lastversion_${repo_id}${repo_only}" + eval "${var_name}=${cached_version}" + eval "${var_name}_sha1=${cached_sha1}" + + echo " lastversion_${repo_id}${repo_only} = ${cached_version}" + echo " lastversion_${repo_id}${repo_only}_sha1 = ${cached_sha1}" + echo " " + return 0 + fi + + # Cache miss - fetch from API # Fetch the latest version tag using the lastversion command if [[ "${repo_development}" == "pre-releases" ]]; then @@ -247,6 +309,9 @@ get_latest_version_and_hash() { local sha1_value=${!sha1_var_name} echo " lastversion_${repo_id}${repo_only}_sha1 = ${sha1_value}" echo " " + + # Store result in cache: version|sha1 + cache_store "$cache_key" "${last_version}|${sha1_value}" if [ -z "$last_version" ]; then echo "[-] Error: could not get the latest version tag! Stopping!" @@ -259,10 +324,54 @@ get_latest_version_and_hash() { fi } -get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" releases norepo "" +# Function to get version and hash with optional failure for missing releases +get_latest_version_and_hash_optional() { + local repo_url="$1" + local repo_id="$2" + local repo_development="${3:-}" + local repo_only="${4:-}" + local checkout_lock="${5:-}" + + echo "[+] Checking lastversion (optional): $repo_id - $repo_url" + + # Try to get the version, but don't exit on failure + if [ -z "$repo_only" ]; then + local version_result + version_result=$(lastversion "${repo_development}" --format tag "${repo_url}" 2>/dev/null || echo "") + eval "lastversion_${repo_id}=${version_result}" + else + local version_result + version_result=$(lastversion "${repo_development}" --format tag --only "${repo_only}" "${repo_url}" 2>/dev/null || echo "") + eval "lastversion_${repo_id}${repo_only}=${version_result}" + fi + + local var_name="lastversion_${repo_id}${repo_only}" + local last_version=${!var_name} + + if [ -n "$last_version" ]; then + # Only get SHA1 if we have a version + eval "lastversion_${repo_id}${repo_only}_sha1=$(get_tag_hash "${repo_url}" "${last_version}" 2>/dev/null || echo "")" + local sha1_var_name="lastversion_${repo_id}${repo_only}_sha1" + local sha1_value=${!sha1_var_name} + echo " lastversion_${repo_id}${repo_only} = ${last_version}" + echo " lastversion_${repo_id}${repo_only}_sha1 = ${sha1_value}" + else + # Set empty values for missing releases + eval "lastversion_${repo_id}${repo_only}=" + eval "lastversion_${repo_id}${repo_only}_sha1=" + echo " lastversion_${repo_id}${repo_only} = (not found - optional)" + echo " lastversion_${repo_id}${repo_only}_sha1 = (not found - optional)" + fi + echo " " +} + +# Check GitHub rate limit before making multiple lastversion calls +if ! check_github_rate_limit 10; then # Reduced from 25 - most calls are now cached + exit 1 +fi + get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases norepo "" get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases norepo "" -get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases norepo "" get_latest_version_and_hash "https://github.com/duckdb/duckdb" "duckdb" releases norepo "" get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases norepo "" @@ -272,6 +381,10 @@ get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases nore get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases norepo "${PROJ_CHECKOUT_LOCK}" get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases norepo "${SFCGAL_CHECKOUT_LOCK}" +get_latest_version_and_hash_optional "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL18 "" +get_latest_version_and_hash_optional "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL20 "" +get_latest_version_and_hash_optional "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL19 "" +get_latest_version_and_hash_optional "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL17 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL17 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 "" get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 "" @@ -290,10 +403,11 @@ function fetch_postgis_versions() { while true; do local response if [ "$api_preference" == "github" ]; then - response=$(curl --silent "https://api.github.com/repos/$REPO/tags?per_page=$PER_PAGE&page=$page") || { + # Try cache first, then API call + if ! response=$(cached_curl "github_postgis_tags_page_${page}" "https://api.github.com/repos/$REPO/tags?per_page=$PER_PAGE&page=$page" 6); then echo "Failed to fetch postgis_versions from api.github.com/repos/$REPO/tags" return 1 - } + fi elif [ "$api_preference" == "osgeo" ]; then response=$(curl --silent "https://git.osgeo.org/gitea/api/v1/repos/${REPO}/tags?page=$page&limit=$PER_PAGE") || { echo "Failed to fetch postgis_versions from git.osgeo.org/gitea/api/v1/repos/${REPO}/tags" @@ -329,6 +443,13 @@ function fetch_postgis_versions() { done } +# Check GitHub rate limit before fetching PostGIS versions +if [ "$api_preference" == "github" ]; then + if ! check_github_rate_limit 8; then # Reduced from 15 - PostGIS pages are cached + exit 1 + fi +fi + fetch_postgis_versions || { echo "Error fetching postgis versions! Maybe network or server error!" exit 1 @@ -368,7 +489,17 @@ for variant in ${postgis_versions}; do postgisSrcSha1[$variant]="" else if [ "$api_preference" == "github" ]; then - postgisSrcSha256[$variant]="$(curl -sSL "https://github.com/postgis/postgis/archive/${postgisLastTags[$variant]}.tar.gz" | sha256sum | awk '{ print $1 }')" + # Cache PostGIS SHA256 hash (cache the computed hash, not the binary file) + cache_key="postgis_sha256_${postgisLastTags[$variant]}" + if cached_sha256=$(cache_get "$cache_key" 168); then # 7 days TTL for SHA256 hashes + postgisSrcSha256[$variant]="$cached_sha256" + echo "# PostGIS SHA256 cache hit: ${postgisLastTags[$variant]} = $cached_sha256" + else + echo "# Computing PostGIS SHA256 for ${postgisLastTags[$variant]}..." + postgisSrcSha256[$variant]="$(curl -sSL "https://github.com/postgis/postgis/archive/${postgisLastTags[$variant]}.tar.gz" | sha256sum | awk '{ print $1 }')" + cache_store "$cache_key" "${postgisSrcSha256[$variant]}" + echo "# PostGIS SHA256 computed and cached: ${postgisLastTags[$variant]} = ${postgisSrcSha256[$variant]}" + fi postgisSrcSha1[$variant]=$(get_tag_hash https://github.com/postgis/postgis.git "${postgisLastTags[$variant]}") elif [ "$api_preference" == "osgeo" ]; then postgisSrcSha256[$variant]="$(curl -sSL "https://git.osgeo.org/gitea/postgis/postgis/archive/${postgisLastTags[$variant]}.tar.gz" | sha256sum | awk '{ print $1 }')" @@ -676,25 +807,22 @@ for version in "${versions[@]}"; do printf " template: '%s'\n" "Dockerfile.${bundleType}.template" printf " initfile: '%s'\n" "initdb-${bundleType}.sh" - printf " MOBILITYDB_CHECKOUT: 'tags/%s'\n" "$lastversion_mobilitydb" - printf " MOBILITYDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_mobilitydb_sha1" - printf " PGSQL_HTTP_CHECKOUT: 'tags/%s'\n" "$lastversion_pgsql_http" printf " PGSQL_HTTP_CHECKOUT_SHA1: '%s'\n" "$lastversion_pgsql_http_sha1" printf " PGSQL_GZIP_CHECKOUT: 'tags/%s'\n" "$lastversion_pgsql_gzip" printf " PGSQL_GZIP_CHECKOUT_SHA1: '%s'\n" "$lastversion_pgsql_gzip_sha1" - printf " TIMESCALEDB_CHECKOUT: 'tags/%s'\n" "$lastversion_timescaledb" - printf " TIMESCALEDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_timescaledb_sha1" - printf " DUCKDB_CHECKOUT: 'tags/%s'\n" "$lastversion_duckdb" printf " DUCKDB_CHECKOUT_SHA1: '%s'\n" "$lastversion_duckdb_sha1" lastversion_pg_hint_plan="lastversion_pg_hint_planREL${postgresVersion}" lastversion_pg_hint_plan_sha1="lastversion_pg_hint_planREL${postgresVersion}_sha1" - printf " PG_HINT_PLAN_CHECKOUT: 'tags/%s'\n" "${!lastversion_pg_hint_plan}" - printf " PG_HINT_PLAN_CHECKOUT_SHA1: '%s'\n" "${!lastversion_pg_hint_plan_sha1}" + # Only add pg_hint_plan if version exists (for beta PostgreSQL versions) + if [ -n "${!lastversion_pg_hint_plan}" ]; then + printf " PG_HINT_PLAN_CHECKOUT: 'tags/%s'\n" "${!lastversion_pg_hint_plan}" + printf " PG_HINT_PLAN_CHECKOUT_SHA1: '%s'\n" "${!lastversion_pg_hint_plan_sha1}" + fi fi diff --git a/versions.json b/versions.json index 989fc7322..40af5447b 100644 --- a/versions.json +++ b/versions.json @@ -409,14 +409,10 @@ "arch": "amd64 arm64", "template": "Dockerfile.bundle0.template", "initfile": "initdb-bundle0.sh", - "MOBILITYDB_CHECKOUT": "tags/v1.2.0", - "MOBILITYDB_CHECKOUT_SHA1": "60048b5b4b7ce2f7560c024d1af024db73b3bd5b", "PGSQL_HTTP_CHECKOUT": "tags/v1.6.3", "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.20.3", - "TIMESCALEDB_CHECKOUT_SHA1": "7b30533d4d9b6ce1353b8bac0ba6215be20f2633", "DUCKDB_CHECKOUT": "tags/v1.3.1", "DUCKDB_CHECKOUT_SHA1": "2063dda3e6bd955c364ce8e61939c6248a907be6", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -491,6 +487,20 @@ "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", "POSTGIS_CHECKOUT": "tags/3.4.4", "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" + }, + "alpine3.22": { + "tags": "17-3.4-alpine3.22 17-3.4.4-alpine3.22 17-3.4-alpine", + "readme_group": "alpine3.22", + "postgis": "3.4", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "POSTGIS_VERSION": "3.4.4", + "POSTGIS_SHA256": "e4a95ee95e675c70c21f1a96438a4cbd2c54d4e3ddd0d4ee2850c00624211f42", + "POSTGIS_CHECKOUT": "tags/3.4.4", + "POSTGIS_CHECKOUT_SHA1": "e5ae0d451ef9ad3abc5c1c4ef43f9c149c05fd9d" } }, "17-3.5": { @@ -547,6 +557,44 @@ "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" } }, + "17-3.5-bundle0": { + "bookworm": { + "tags": "17-3.5-bundle0-bookworm 17-3.5.3-bundle0-bookworm 17-3.5-bundle0 bundle0", + "postgis": "3.5", + "readme_group": "bundle0", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "arch": "amd64 arm64", + "template": "Dockerfile.bundle0.template", + "initfile": "initdb-bundle0.sh", + "PGSQL_HTTP_CHECKOUT": "tags/v1.6.3", + "PGSQL_HTTP_CHECKOUT_SHA1": "865e72b328050bc8d1bf8bd2f982edb7a4eb4e26", + "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", + "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", + "DUCKDB_CHECKOUT": "tags/v1.3.1", + "DUCKDB_CHECKOUT_SHA1": "2063dda3e6bd955c364ce8e61939c6248a907be6", + "PG_HINT_PLAN_CHECKOUT": "tags/REL17_1_7_0", + "PG_HINT_PLAN_CHECKOUT_SHA1": "85e07af6ca4675a26fa2281370c37371b883b2a9", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" + } + }, + "17-3.6": { + "alpine3.22": { + "tags": "17-3.6.0alpha1-alpine3.22 17-3.6.0alpha1-alpine", + "readme_group": "test", + "postgis": "3.6.0alpha1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "17", + "PG_DOCKER": "17", + "POSTGIS_VERSION": "3.6.0alpha1", + "POSTGIS_SHA256": "9f1981716001afff2e4ec75e4107cb64e8d3d9d26ad2abf573444038db0830eb", + "POSTGIS_CHECKOUT": "tags/3.6.0alpha1", + "POSTGIS_CHECKOUT_SHA1": "b32829d707ef65515df1224361b9f2d5889db348" + } + }, "17-master": { "bookworm": { "tags": "17-master-bookworm 17-master", @@ -599,6 +647,102 @@ "BOOST_VERSION": "1.74.0" } }, + "18-3.5": { + "bookworm": { + "tags": "18beta1-3.5-bookworm 18beta1-3.5.3-bookworm 18beta1-3.5", + "postgis": "3.5", + "readme_group": "test", + "PG_MAJOR": "18", + "PG_DOCKER": "18beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.debian.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_MAJOR": "3", + "POSTGIS_VERSION": "3.5.3+dfsg-1~exp1.pgdg120+1" + }, + "alpine3.22": { + "tags": "18beta1-3.5-alpine3.22 18beta1-3.5.3-alpine3.22 18beta1-3.5-alpine", + "readme_group": "test", + "postgis": "3.5", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "18", + "PG_DOCKER": "18beta1", + "POSTGIS_VERSION": "3.5.3", + "POSTGIS_SHA256": "44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91" + } + }, + "18-3.6": { + "alpine3.22": { + "tags": "18beta1-3.6.0alpha1-alpine3.22 18beta1-3.6.0alpha1-alpine", + "readme_group": "test", + "postgis": "3.6.0alpha1", + "arch": "amd64 arm64", + "template": "Dockerfile.alpine.template", + "initfile": "initdb-postgis.sh", + "PG_MAJOR": "18", + "PG_DOCKER": "18beta1", + "POSTGIS_VERSION": "3.6.0alpha1", + "POSTGIS_SHA256": "9f1981716001afff2e4ec75e4107cb64e8d3d9d26ad2abf573444038db0830eb", + "POSTGIS_CHECKOUT": "tags/3.6.0alpha1", + "POSTGIS_CHECKOUT_SHA1": "b32829d707ef65515df1224361b9f2d5889db348" + } + }, + "18-master": { + "bookworm": { + "tags": "18beta1-master-bookworm 18beta1-master", + "postgis": "master", + "readme_group": "test", + "PG_MAJOR": "18", + "PG_DOCKER": "18beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "master", + "POSTGIS_CHECKOUT_SHA1": "nocheck", + "CGAL_CHECKOUT": "master", + "CGAL_CHECKOUT_SHA1": "nocheck", + "SFCGAL_CHECKOUT": "master", + "SFCGAL_CHECKOUT_SHA1": "nocheck", + "PROJ_CHECKOUT": "master", + "PROJ_CHECKOUT_SHA1": "nocheck", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT": "master", + "GDAL_CHECKOUT_SHA1": "nocheck", + "GEOS_CHECKOUT": "main", + "GEOS_CHECKOUT_SHA1": "nocheck", + "BOOST_VERSION": "1.74.0" + } + }, + "18-recent": { + "bookworm": { + "tags": "18beta1-recent-bookworm 18beta1-recent-postgis3.5.3-geos3.13.1-proj9.6.2-gdal3.11.0-cgal6.0.1-sfcgal2.1.0-bookworm 18beta1-recent-postgis3.5-geos3.13-proj9.6-gdal3.11-cgal6.0-sfcgal2.1-bookworm 18beta1-recent", + "postgis": "recent", + "readme_group": "test", + "PG_MAJOR": "18", + "PG_DOCKER": "18beta1", + "arch": "amd64 arm64", + "template": "Dockerfile.master.template", + "initfile": "initdb-postgis.sh", + "POSTGIS_CHECKOUT": "tags/3.5.3", + "POSTGIS_CHECKOUT_SHA1": "aab5f55897aa2e8eb5f17c3996b61268c5f1ec91", + "PROJ_CHECKOUT": "tags/9.6.2", + "PROJ_CHECKOUT_SHA1": "7c3d4a1fa9c1d5a3941b5eaee7c8d149f5936f54", + "GDAL_BUILD": "with_extra", + "GDAL_CHECKOUT": "tags/v3.11.0", + "GDAL_CHECKOUT_SHA1": "447eb5238bb6ef2837e68bf2ec742c64007b680b", + "GEOS_CHECKOUT": "tags/3.13.1", + "GEOS_CHECKOUT_SHA1": "431568d6e311e0bbfb057b4ec3d44d0d3ba3335f", + "SFCGAL_CHECKOUT": "tags/v2.1.0", + "SFCGAL_CHECKOUT_SHA1": "60573cfb6b3fc01eceda563d275a226317ba01db", + "CGAL_CHECKOUT": "tags/v6.0.1", + "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", + "BOOST_VERSION": "1.74.0" + } + }, "14-l3.1.9gcp": { "bookworm": { "_comment": "source: ./locked.yml", diff --git a/versions.schema.json b/versions.schema.json index 67efffbec..1c0743810 100644 --- a/versions.schema.json +++ b/versions.schema.json @@ -12,7 +12,7 @@ }, "pg_version": { "type": "string", - "pattern": "^[0-9]{2}$" + "pattern": "^[0-9]{2}(beta[0-9]+|rc[0-9]+)?$" }, "gdal_build_type": { "type": "string", @@ -24,7 +24,7 @@ }, "docker_tags": { "type": "string", - "pattern": "^(([0-9]{2}-[a-zA-Z0-9.-]+|recent|latest|alpine)\\s*)+$" + "pattern": "^(([0-9]{2}(beta[0-9]+|rc[0-9]+)?-[a-zA-Z0-9.-]+(alpha[0-9]+|beta[0-9]+|rc[0-9]+)?|recent|latest|alpine|bundle0)\\s*)+$" }, "readme_group_type": { "type": "string", @@ -66,11 +66,8 @@ "GEOS_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "SFCGAL_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "CGAL_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, - "MOBILITYDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "PGSQL_HTTP_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "PGSQL_GZIP_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, - "TIMESCALEDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, - "DUCKDB_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "PG_HINT_PLAN_CHECKOUT": {"$ref": "#/definitions/git_checkout_ref"}, "POSTGIS_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "PROJ_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, @@ -78,11 +75,8 @@ "GEOS_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "SFCGAL_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "CGAL_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, - "MOBILITYDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "PGSQL_HTTP_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "PGSQL_GZIP_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, - "TIMESCALEDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, - "DUCKDB_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"}, "PG_HINT_PLAN_CHECKOUT_SHA1": {"$ref": "#/definitions/sha1_value"} }, "patternProperties": { From ab185c51a788f023b00926c59c15841cb67246e7 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 4 Jul 2025 07:14:56 +0200 Subject: [PATCH 165/167] feat: add auto-rerun-helper to default branch (#105) --- .github/workflows/auto-rerun-helper.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/auto-rerun-helper.yml diff --git a/.github/workflows/auto-rerun-helper.yml b/.github/workflows/auto-rerun-helper.yml new file mode 100644 index 000000000..ad494d33f --- /dev/null +++ b/.github/workflows/auto-rerun-helper.yml @@ -0,0 +1,25 @@ +name: Auto-re-run Random Test (helper) + +on: + workflow_run: + workflows: ["Retry Test | Random Failure Test Workflow"] + types: [completed] + +permissions: + actions: write # needed for rerun + contents: read + +jobs: + rerun-failed: + if: > + github.event.workflow_run.conclusion == 'failure' && + github.event.workflow_run.run_attempt < 3 + runs-on: ubuntu-24.04 + + steps: + - name: Re-run only failed jobs + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh run rerun ${{ github.event.workflow_run.id }} --failed \ + --repo ${{ github.repository }} From 9d96476d2e41b8fd90ddab0170fc10567187a49a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 4 Jul 2025 07:22:40 +0200 Subject: [PATCH 166/167] Update auto-rerun-helper.yml --- .github/workflows/auto-rerun-helper.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-rerun-helper.yml b/.github/workflows/auto-rerun-helper.yml index ad494d33f..3447fbfdb 100644 --- a/.github/workflows/auto-rerun-helper.yml +++ b/.github/workflows/auto-rerun-helper.yml @@ -1,6 +1,7 @@ name: Auto-re-run Random Test (helper) on: + workflow_dispatch: workflow_run: workflows: ["Retry Test | Random Failure Test Workflow"] types: [completed] From 3e45d06da1ef958c047195f28a6d4c386e414130 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Fri, 4 Jul 2025 10:10:17 +0200 Subject: [PATCH 167/167] Update auto-rerun-helper.yml --- .github/workflows/auto-rerun-helper.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-rerun-helper.yml b/.github/workflows/auto-rerun-helper.yml index 3447fbfdb..0fd005389 100644 --- a/.github/workflows/auto-rerun-helper.yml +++ b/.github/workflows/auto-rerun-helper.yml @@ -1,11 +1,21 @@ -name: Auto-re-run Random Test (helper) +name: Auto-rerun Failed Builds (helper) on: workflow_dispatch: workflow_run: - workflows: ["Retry Test | Random Failure Test Workflow"] + workflows: + - workflow-build-alpine + - workflow-build-debian + - workflow-build-development + - workflow-build-test + - workflow-build-retrytest + types: [completed] +concurrency: + group: "${{ github.event.workflow_run.id }}-helper" + cancel-in-progress: true + permissions: actions: write # needed for rerun contents: read @@ -14,7 +24,7 @@ jobs: rerun-failed: if: > github.event.workflow_run.conclusion == 'failure' && - github.event.workflow_run.run_attempt < 3 + github.event.workflow_run.attempt < 3 runs-on: ubuntu-24.04 steps: @@ -22,5 +32,12 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + echo "🔄 Queuing attempt $((${{ github.event.workflow_run.attempt }} + 1)) for workflow '${{ github.event.workflow_run.name }}'" + echo "📊 Failed run ID: ${{ github.event.workflow_run.id }}" + echo "📅 Original run started: ${{ github.event.workflow_run.created_at }}" + echo "🎯 Retrying only failed jobs..." + gh run rerun ${{ github.event.workflow_run.id }} --failed \ --repo ${{ github.repository }} + + echo "✅ Retry queued successfully!"