From cca48f8f91dab3efbf37172abf486f4b78a2177a Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 6 Aug 2023 21:55:56 +0200 Subject: [PATCH] update 3.4.0beta2 --> 3.4.0rc1 (#353) Changes to be committed: modified: .github/workflows/main.yml modified: 14-master/Dockerfile renamed: 15-3.4.0beta2/Dockerfile -> 15-3.4.0rc1/Dockerfile renamed: 15-3.4.0beta2/alpine/Dockerfile -> 15-3.4.0rc1/alpine/Dockerfile renamed: 15-3.4.0beta2/alpine/initdb-postgis.sh -> 15-3.4.0rc1/alpine/initdb-postgis.sh renamed: 15-3.4.0beta2/alpine/update-postgis.sh -> 15-3.4.0rc1/alpine/update-postgis.sh modified: 15-master/Dockerfile renamed: 16beta2-3.4.0beta2/Dockerfile -> 16beta2-3.4.0rc1/Dockerfile renamed: 16beta2-3.4.0beta2/alpine/Dockerfile -> 16beta2-3.4.0rc1/alpine/Dockerfile renamed: 16beta2-3.4.0beta2/alpine/initdb-postgis.sh -> 16beta2-3.4.0rc1/alpine/initdb-postgis.sh renamed: 16beta2-3.4.0beta2/alpine/update-postgis.sh -> 16beta2-3.4.0rc1/alpine/update-postgis.sh modified: 16beta2-master/Dockerfile modified: README.md --- .github/workflows/main.yml | 4 ++-- 14-master/Dockerfile | 14 +++++++------- {15-3.4.0beta2 => 15-3.4.0rc1}/Dockerfile | 0 {15-3.4.0beta2 => 15-3.4.0rc1}/alpine/Dockerfile | 6 +++--- .../alpine/initdb-postgis.sh | 0 .../alpine/update-postgis.sh | 0 15-master/Dockerfile | 14 +++++++------- .../Dockerfile | 0 .../alpine/Dockerfile | 6 +++--- .../alpine/initdb-postgis.sh | 0 .../alpine/update-postgis.sh | 0 16beta2-master/Dockerfile | 14 +++++++------- README.md | 6 +++--- 13 files changed, 32 insertions(+), 32 deletions(-) rename {15-3.4.0beta2 => 15-3.4.0rc1}/Dockerfile (100%) rename {15-3.4.0beta2 => 15-3.4.0rc1}/alpine/Dockerfile (95%) rename {15-3.4.0beta2 => 15-3.4.0rc1}/alpine/initdb-postgis.sh (100%) rename {15-3.4.0beta2 => 15-3.4.0rc1}/alpine/update-postgis.sh (100%) rename {16beta2-3.4.0beta2 => 16beta2-3.4.0rc1}/Dockerfile (100%) rename {16beta2-3.4.0beta2 => 16beta2-3.4.0rc1}/alpine/Dockerfile (94%) rename {16beta2-3.4.0beta2 => 16beta2-3.4.0rc1}/alpine/initdb-postgis.sh (100%) rename {16beta2-3.4.0beta2 => 16beta2-3.4.0rc1}/alpine/update-postgis.sh (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50e32a39..582e154e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,10 +29,10 @@ jobs: postgis: master variant: default - postgres: 15 - postgis: 3.4.0beta2 + postgis: 3.4.0rc1 variant: alpine - postgres: 16beta2 - postgis: 3.4.0beta2 + postgis: 3.4.0rc1 variant: alpine name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} diff --git a/14-master/Dockerfile b/14-master/Dockerfile index 395b54a8..4c1a2cff 100644 --- a/14-master/Dockerfile +++ b/14-master/Dockerfile @@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # 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 dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c RUN set -ex \ && mkdir -p /usr/src \ @@ -152,7 +152,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/libgeos/geos.git \ @@ -168,7 +168,7 @@ RUN set -ex \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +324,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6c7661430ebcce4521b23bd97b0a0d2be5ea027d +ENV POSTGIS_GIT_HASH 111e4a133b3e036cf634826ab05e7217ebc81cbf RUN set -ex \ && apt-get update \ diff --git a/15-3.4.0beta2/Dockerfile b/15-3.4.0rc1/Dockerfile similarity index 100% rename from 15-3.4.0beta2/Dockerfile rename to 15-3.4.0rc1/Dockerfile diff --git a/15-3.4.0beta2/alpine/Dockerfile b/15-3.4.0rc1/alpine/Dockerfile similarity index 95% rename from 15-3.4.0beta2/alpine/Dockerfile rename to 15-3.4.0rc1/alpine/Dockerfile index 0ed905e2..4600026c 100644 --- a/15-3.4.0beta2/alpine/Dockerfile +++ b/15-3.4.0rc1/alpine/Dockerfile @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.18 FROM ${BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0beta2 spatial database extension with PostgreSQL 15 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 15 Alpine" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0beta2 -ENV POSTGIS_SHA256 9460f546b02e95958ce3c4c763d75aa4dc8d44d559a9d5a108ef0e718671b3aa +ENV POSTGIS_VERSION 3.4.0rc1 +ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58 RUN set -eux \ && apk add --no-cache --virtual .fetch-deps \ diff --git a/15-3.4.0beta2/alpine/initdb-postgis.sh b/15-3.4.0rc1/alpine/initdb-postgis.sh similarity index 100% rename from 15-3.4.0beta2/alpine/initdb-postgis.sh rename to 15-3.4.0rc1/alpine/initdb-postgis.sh diff --git a/15-3.4.0beta2/alpine/update-postgis.sh b/15-3.4.0rc1/alpine/update-postgis.sh similarity index 100% rename from 15-3.4.0beta2/alpine/update-postgis.sh rename to 15-3.4.0rc1/alpine/update-postgis.sh diff --git a/15-master/Dockerfile b/15-master/Dockerfile index d786aff5..dc88a1e7 100644 --- a/15-master/Dockerfile +++ b/15-master/Dockerfile @@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # 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 dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c RUN set -ex \ && mkdir -p /usr/src \ @@ -152,7 +152,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/libgeos/geos.git \ @@ -168,7 +168,7 @@ RUN set -ex \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +324,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6c7661430ebcce4521b23bd97b0a0d2be5ea027d +ENV POSTGIS_GIT_HASH 111e4a133b3e036cf634826ab05e7217ebc81cbf RUN set -ex \ && apt-get update \ diff --git a/16beta2-3.4.0beta2/Dockerfile b/16beta2-3.4.0rc1/Dockerfile similarity index 100% rename from 16beta2-3.4.0beta2/Dockerfile rename to 16beta2-3.4.0rc1/Dockerfile diff --git a/16beta2-3.4.0beta2/alpine/Dockerfile b/16beta2-3.4.0rc1/alpine/Dockerfile similarity index 94% rename from 16beta2-3.4.0beta2/alpine/Dockerfile rename to 16beta2-3.4.0rc1/alpine/Dockerfile index 24712905..78127776 100644 --- a/16beta2-3.4.0beta2/alpine/Dockerfile +++ b/16beta2-3.4.0rc1/alpine/Dockerfile @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:16beta2-alpine3.18 FROM ${BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0beta2 spatial database extension with PostgreSQL 16beta2 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 16beta2 Alpine" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0beta2 -ENV POSTGIS_SHA256 9460f546b02e95958ce3c4c763d75aa4dc8d44d559a9d5a108ef0e718671b3aa +ENV POSTGIS_VERSION 3.4.0rc1 +ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58 RUN set -eux \ && apk add --no-cache --virtual .fetch-deps \ diff --git a/16beta2-3.4.0beta2/alpine/initdb-postgis.sh b/16beta2-3.4.0rc1/alpine/initdb-postgis.sh similarity index 100% rename from 16beta2-3.4.0beta2/alpine/initdb-postgis.sh rename to 16beta2-3.4.0rc1/alpine/initdb-postgis.sh diff --git a/16beta2-3.4.0beta2/alpine/update-postgis.sh b/16beta2-3.4.0rc1/alpine/update-postgis.sh similarity index 100% rename from 16beta2-3.4.0beta2/alpine/update-postgis.sh rename to 16beta2-3.4.0rc1/alpine/update-postgis.sh diff --git a/16beta2-master/Dockerfile b/16beta2-master/Dockerfile index 2dd9ff5b..a2cb4342 100644 --- a/16beta2-master/Dockerfile +++ b/16beta2-master/Dockerfile @@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # 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 dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c RUN set -ex \ && mkdir -p /usr/src \ @@ -152,7 +152,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/libgeos/geos.git \ @@ -168,7 +168,7 @@ RUN set -ex \ && rm -fr /usr/src/geos # gdal -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL5X_GIT_HASH dd3b569e7abd66ba181d8d5567b62b1b88f187d1 +ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180 -ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2 +ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 # Minimal command line test ( fail fast ) RUN set -ex \ @@ -324,7 +324,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 6c7661430ebcce4521b23bd97b0a0d2be5ea027d +ENV POSTGIS_GIT_HASH 111e4a133b3e036cf634826ab05e7217ebc81cbf RUN set -ex \ && apt-get update \ diff --git a/README.md b/README.md index 0857909a..5e3e47f7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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-07-29) +# Versions (2023-08-06) Supported architecture: `amd64` @@ -64,11 +64,11 @@ Recommended version for new users: `postgis/postgis:15-3.3` | 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-3.4.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0beta2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4.0beta2/alpine/Dockerfile) | alpine:3.18 | 15 | 3.4.0beta2 | +| [postgis/postgis:15-3.4.0rc1-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0rc1-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4.0rc1/alpine/Dockerfile) | alpine:3.18 | 15 | 3.4.0rc1 | | [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:16beta2-3.3](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.3/Dockerfile) | debian:bullseye | 16beta2 | 3.3.4 | | [postgis/postgis:16beta2-3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.3/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.3.4 | -| [postgis/postgis:16beta2-3.4.0beta2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.4.0beta2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.4.0beta2/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.4.0beta2 | +| [postgis/postgis:16beta2-3.4.0rc1-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.4.0rc1-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.4.0rc1/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.4.0rc1 | | [postgis/postgis:16beta2-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-master/Dockerfile) | debian:bullseye | 16beta2 | development: postgis, geos, proj, gdal | ## Usage