update to postgres 16rc1 (#357)

postgis · Sep 2, 2023 · 36375f7 · 36375f7
1 parent c8f7932
commit 36375f7
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 47 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [12, 13, 14, 15, 16beta3]
+        postgres: [12, 13, 14, 15, 16rc1]
         postgis: ['3.4']
         variant: [default, alpine]
         include:
@@ -25,7 +25,7 @@ jobs:
           - postgres: 15
             postgis: master
             variant: default
-          - postgres: 16beta3
+          - postgres: 16rc1
             postgis: master
             variant: default
           - postgres: 11

diff --git a/14-master/Dockerfile b/14-master/Dockerfile
@@ -88,8 +88,8 @@ 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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
 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 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
-ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 
 # 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 6f6839a334a188edfc5a437ecc689621ee6c440d
+ENV POSTGIS_GIT_HASH cc7a8ca0871ae2114e920aa7472c639ec80abe7d
 
 RUN set -ex \
     && apt-get update \

diff --git a/15-master/Dockerfile b/15-master/Dockerfile
@@ -88,8 +88,8 @@ 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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
 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 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
-ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 
 # 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 6f6839a334a188edfc5a437ecc689621ee6c440d
+ENV POSTGIS_GIT_HASH cc7a8ca0871ae2114e920aa7472c639ec80abe7d
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta3-3.4/Dockerfile → 16rc1-3.4/Dockerfile b/16beta3-3.4/Dockerfile → 16rc1-3.4/Dockerfile
@@ -2,10 +2,10 @@
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM postgres:16beta3-bullseye
+FROM postgres:16rc1-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.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16rc1 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3

diff --git a/16beta3-3.4/alpine/Dockerfile → 16rc1-3.4/alpine/Dockerfile b/16beta3-3.4/alpine/Dockerfile → 16rc1-3.4/alpine/Dockerfile
@@ -1,11 +1,11 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:16beta3-alpine3.18
+ARG BASE_IMAGE=postgres:16rc1-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.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16rc1 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION 3.4.0

diff --git a/16beta3-3.4/alpine/initdb-postgis.sh → 16rc1-3.4/alpine/initdb-postgis.sh b/16beta3-3.4/alpine/initdb-postgis.sh → 16rc1-3.4/alpine/initdb-postgis.sh
diff --git a/16beta3-3.4/alpine/update-postgis.sh → 16rc1-3.4/alpine/update-postgis.sh b/16beta3-3.4/alpine/update-postgis.sh → 16rc1-3.4/alpine/update-postgis.sh
diff --git a/16beta3-3.4/initdb-postgis.sh → 16rc1-3.4/initdb-postgis.sh b/16beta3-3.4/initdb-postgis.sh → 16rc1-3.4/initdb-postgis.sh
diff --git a/16beta3-3.4/update-postgis.sh → 16rc1-3.4/update-postgis.sh b/16beta3-3.4/update-postgis.sh → 16rc1-3.4/update-postgis.sh
diff --git a/16beta3-master/Dockerfile → 16rc1-master/Dockerfile b/16beta3-master/Dockerfile → 16rc1-master/Dockerfile
@@ -7,10 +7,10 @@
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
 ARG CGAL_GIT_BRANCH=5.6.x-branch
-FROM postgres:16beta3-bullseye as builder
+FROM postgres:16rc1-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 16beta3 bullseye" \
+      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 16rc1 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 WORKDIR /
@@ -88,8 +88,8 @@ 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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
 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 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -252,7 +252,7 @@ RUN set -ex \
 # -------------------------------------------
 # STAGE  final
 # -------------------------------------------
-FROM postgres:16beta3-bullseye
+FROM postgres:16rc1-bullseye
 
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
@@ -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 d0b188bf41704a155c9ad72fd7635f7a709764e5
-ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
-ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
-ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
+ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
+ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
+ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
+ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
 
 # 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 6f6839a334a188edfc5a437ecc689621ee6c440d
+ENV POSTGIS_GIT_HASH cc7a8ca0871ae2114e920aa7472c639ec80abe7d
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta3-master/initdb-postgis.sh → 16rc1-master/initdb-postgis.sh b/16beta3-master/initdb-postgis.sh → 16rc1-master/initdb-postgis.sh
diff --git a/16beta3-master/update-postgis.sh → 16rc1-master/update-postgis.sh b/16beta3-master/update-postgis.sh → 16rc1-master/update-postgis.sh
diff --git 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-08-17)
+# Versions (2023-09-01)
 
 Supported architecture: `amd64` (also known as X86-64)"
 
@@ -68,10 +68,10 @@ Recommended version for new users: `postgis/postgis:15-3.4`
 | --------------- | ---------- | -- | -------- | ------- |
 | [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 |
-
+| [postgis/postgis:16rc1-3.4](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16rc1-3.4) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16rc1-3.4/Dockerfile) | debian:bullseye | 16rc1 | 3.4.0 |
+| [postgis/postgis:16rc1-3.4-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16rc1-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16rc1-3.4/alpine/Dockerfile) | alpine:3.18 | 16rc1 | 3.4.0 |
+| [postgis/postgis:16rc1-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16rc1-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16rc1-master/Dockerfile) | debian:bullseye | 16rc1 | 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: