upgrade to postgres17rc1

steps: - git mv 17beta3-master 17rc1-master - git mv 17beta3-3.5.0alpha2 17rc1-3.5.0alpha2 - run: ./update.sh - .github/workflows/main.yml: replace 17beta3 to 17rc1 - README.md : updated test image info
postgis · Sep 14, 2024 · e08274d · e08274d
1 parent 979f475
commit e08274d
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 46 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,13 +25,13 @@ jobs:
           - postgres: 16
             postgis: master
             variant: default
-          - postgres: 17beta3
+          - postgres: 17rc1
             postgis: master
             variant: default
           - postgres: 16
             postgis: 3.5.0alpha2
             variant: alpine
-          - postgres: 17beta3
+          - postgres: 17rc1
             postgis: 3.5.0alpha2
             variant: alpine
 

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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
 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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
     \
     && rm -fr /usr/src/PROJ
 
-# geos - lock 3.12 branch
-ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
+# geos
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
 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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
-ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
-ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
-ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 
 # 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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
+ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
 
 RUN set -ex \
     && apt-get update \

diff --git a/16-master/Dockerfile b/16-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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
 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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
     \
     && rm -fr /usr/src/PROJ
 
-# geos - lock 3.12 branch
-ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
+# geos
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
 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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
-ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
-ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
-ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 
 # 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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
+ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
 
 RUN set -ex \
     && apt-get update \

diff --git a/17beta3-3.5.0alpha2/Dockerfile → 17rc1-3.5.0alpha2/Dockerfile b/17beta3-3.5.0alpha2/Dockerfile → 17rc1-3.5.0alpha2/Dockerfile
diff --git a/17beta3-3.5.0alpha2/alpine/Dockerfile → 17rc1-3.5.0alpha2/alpine/Dockerfile b/17beta3-3.5.0alpha2/alpine/Dockerfile → 17rc1-3.5.0alpha2/alpine/Dockerfile
@@ -1,11 +1,11 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:17beta3-alpine3.20
+ARG BASE_IMAGE=postgres:17rc1-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.0alpha2 spatial database extension with PostgreSQL 17beta3 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.0alpha2 spatial database extension with PostgreSQL 17rc1 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION 3.5.0alpha2

diff --git a/17beta3-3.5.0alpha2/alpine/initdb-postgis.sh → 17rc1-3.5.0alpha2/alpine/initdb-postgis.sh b/17beta3-3.5.0alpha2/alpine/initdb-postgis.sh → 17rc1-3.5.0alpha2/alpine/initdb-postgis.sh
diff --git a/17beta3-3.5.0alpha2/alpine/update-postgis.sh → 17rc1-3.5.0alpha2/alpine/update-postgis.sh b/17beta3-3.5.0alpha2/alpine/update-postgis.sh → 17rc1-3.5.0alpha2/alpine/update-postgis.sh
diff --git a/17beta3-master/Dockerfile → 17rc1-master/Dockerfile b/17beta3-master/Dockerfile → 17rc1-master/Dockerfile
@@ -7,10 +7,10 @@
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
 ARG CGAL_GIT_BRANCH=5.6.x-branch
-FROM postgres:17beta3-bullseye as builder
+FROM postgres:17rc1-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 17beta3 bullseye" \
+      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 17rc1 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
 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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
     \
     && rm -fr /usr/src/PROJ
 
-# geos - lock 3.12 branch
-ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
+# geos
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
 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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 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:17beta3-bullseye
+FROM postgres:17rc1-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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
-ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
-ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
-ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
-ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
+ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
+ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
+ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
+ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
+ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
 
 # 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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
+ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
 
 RUN set -ex \
     && apt-get update \

diff --git a/17beta3-master/initdb-postgis.sh → 17rc1-master/initdb-postgis.sh b/17beta3-master/initdb-postgis.sh → 17rc1-master/initdb-postgis.sh
diff --git a/17beta3-master/update-postgis.sh → 17rc1-master/update-postgis.sh b/17beta3-master/update-postgis.sh → 17rc1-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 (2024-08-20)
+# Versions (2024-09-14)
 
 Supported architecture: `amd64` (also known as X86-64)"
 
@@ -65,8 +65,8 @@ Recommended version for new users: `postgis/postgis:16-3.4`
 | [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:16-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 16 | 3.5.0alpha2 |
 | [postgis/postgis: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/Dockerfile) | debian:bullseye | 16 | development: postgis, geos, proj, gdal |
-| [postgis/postgis:17beta3-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17beta3 | 3.5.0alpha2 |
-| [postgis/postgis:17beta3-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-master/Dockerfile) | debian:bullseye | 17beta3 | development: postgis, geos, proj, gdal |
+| [postgis/postgis:17rc1-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17rc1-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17rc1-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17rc1 | 3.5.0alpha2 |
+| [postgis/postgis:17rc1-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17rc1-master/Dockerfile) | debian:bullseye | 17rc1 | development: postgis, geos, proj, gdal |
 
 ## Usage