From 6ee940632c5ed4e87e6749bd2aaa8574b05cb954 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 4 Jan 2025 17:43:44 +0100 Subject: [PATCH] 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 e20d96d5..1c360d07 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 96fe531e..eb6dcd4b 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 9a08aaed..496d07db 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 aca5fb60..5d1f0c8f 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 8bc44af3..9c1e1626 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 83c6b6dd..8788d94a 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 7fc29cf7..69c6e42f 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 c652c85f..f8499e23 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 9edbdd7d..bdc43016 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 e6335a01..2af2aa46 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 1b2c9eb4..71b145fa 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 efe79d47..cf4010cd 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 f59017c1..19cb9603 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 c0d806ac..e17be52c 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 f4a5e22f..abf9f2e4 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 4a4e82d7..753171c8 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 9011cd43..155de3c0 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 153e0b49..aaf727d1 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 4c34c05d..00dda947 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 25f1f540..2f62defd 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 6402453e..816a4af0 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 43edcb45..5f07c3e5 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 a42a2f5e..a5d1e2e9 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 71ac787a..60de1389 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 2a404356..a0d149ad 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 547297fe..2a8e8772 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 6617b1b1..60888dec 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 6df75ab5..02191624 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 fd4813a1..be609556 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 776d51be..10a092f3 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 d4860a3e..10053e49 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 5f449125..f478cff5 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 7adafdaf..f27c990a 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 1657e36e..2577b833 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 eee895bd..8aa136fb 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 00000000..67efffbe --- /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