update to 18rc1 and refresh SHA256 tags

thomasboussekey · thomasboussekey · commit fde17f95755d · 2025-09-07T16:49:51.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -44,19 +44,19 @@ jobs:
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04-arm'
-          - postgres: 18beta3
+          - postgres: 18rc1
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04'
-          - postgres: 18beta3
+          - postgres: 18rc1
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04-arm'
-          - postgres: 18beta3
+          - postgres: 18rc1
             postgis: '3.6'
             variant: default
             runner-platform: 'ubuntu-24.04'
-          - postgres: 18beta3
+          - postgres: 18rc1
             postgis: '3.6'
             variant: default
             runner-platform: 'ubuntu-24.04-arm'
diff --git a/13-3.5/alpine/update-postgis.sh b/13-3.5/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/13-3.5/update-postgis.sh b/13-3.5/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/14-3.5/alpine/update-postgis.sh b/14-3.5/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/14-3.5/update-postgis.sh b/14-3.5/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/15-3.5/alpine/update-postgis.sh b/15-3.5/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/15-3.5/update-postgis.sh b/15-3.5/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/16-3.5/alpine/update-postgis.sh b/16-3.5/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/16-3.5/update-postgis.sh b/16-3.5/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/16-master/Dockerfile b/16-master/Dockerfile
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # cgal & sfcgal
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
-ENV SFCGAL_GIT_HASH 9646ad8b696a6ad5a4d3880b12a41130a011b731
+ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
+ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 5bb60a85366c8792fed15096b89cd2bd2a80c8c1
+ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 3bdeea5375b13c4f57da6e9e399b2c4e39540737
+ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH a0eb37ecf8c2696ff9506580788cd14e3a60b80f
+ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
-ENV SFCGAL_GIT_HASH 9646ad8b696a6ad5a4d3880b12a41130a011b731
-ENV PROJ_GIT_HASH 5bb60a85366c8792fed15096b89cd2bd2a80c8c1
-ENV GEOS_GIT_HASH 3bdeea5375b13c4f57da6e9e399b2c4e39540737
-ENV GDAL_GIT_HASH a0eb37ecf8c2696ff9506580788cd14e3a60b80f
+ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
+ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
+ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
+ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
+ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH 799c1d873c39a3ae9c475c24e9dfeda6078aa956
+ENV POSTGIS_GIT_HASH ff7d11679c1851caa081a730a70fd29d7e8f84e7
 
 RUN set -ex \
     && apt-get update \
diff --git a/16-master/update-postgis.sh b/16-master/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/17-3.5/alpine/update-postgis.sh b/17-3.5/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/17-3.5/update-postgis.sh b/17-3.5/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/17-3.6/alpine/update-postgis.sh b/17-3.6/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/17-master/Dockerfile b/17-master/Dockerfile
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # cgal & sfcgal
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
-ENV SFCGAL_GIT_HASH 9646ad8b696a6ad5a4d3880b12a41130a011b731
+ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
+ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 5bb60a85366c8792fed15096b89cd2bd2a80c8c1
+ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 3bdeea5375b13c4f57da6e9e399b2c4e39540737
+ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH a0eb37ecf8c2696ff9506580788cd14e3a60b80f
+ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
-ENV SFCGAL_GIT_HASH 9646ad8b696a6ad5a4d3880b12a41130a011b731
-ENV PROJ_GIT_HASH 5bb60a85366c8792fed15096b89cd2bd2a80c8c1
-ENV GEOS_GIT_HASH 3bdeea5375b13c4f57da6e9e399b2c4e39540737
-ENV GDAL_GIT_HASH a0eb37ecf8c2696ff9506580788cd14e3a60b80f
+ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
+ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
+ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
+ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
+ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH 799c1d873c39a3ae9c475c24e9dfeda6078aa956
+ENV POSTGIS_GIT_HASH ff7d11679c1851caa081a730a70fd29d7e8f84e7
 
 RUN set -ex \
     && apt-get update \
diff --git a/17-master/update-postgis.sh b/17-master/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/18rc1-3.6/Dockerfile b/18rc1-3.6/Dockerfile
@@ -2,10 +2,10 @@
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM postgres:18beta3-trixie
+FROM postgres:18rc1-trixie
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18beta3 trixie" \
+      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18rc1 trixie" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
diff --git a/18rc1-3.6/alpine/Dockerfile b/18rc1-3.6/alpine/Dockerfile
@@ -1,11 +1,11 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:18beta3-alpine3.22
+ARG BASE_IMAGE=postgres:18rc1-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.6.0 spatial database extension with PostgreSQL 18beta3 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.6.0 spatial database extension with PostgreSQL 18rc1 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION 3.6.0
diff --git a/18rc1-3.6/alpine/initdb-postgis.sh b/18rc1-3.6/alpine/initdb-postgis.sh
diff --git a/18rc1-3.6/alpine/update-postgis.sh b/18rc1-3.6/alpine/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/18rc1-3.6/initdb-postgis.sh b/18rc1-3.6/initdb-postgis.sh
diff --git a/18rc1-3.6/update-postgis.sh b/18rc1-3.6/update-postgis.sh
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
     psql --dbname="$DB" -c "
         -- Upgrade PostGIS (includes raster)
         CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
-        ALTER EXTENSION postgis  UPDATE TO '$POSTGIS_VERSION';
+        ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
 
         -- Upgrade Topology
         CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';
diff --git a/README.md b/README.md
@@ -77,8 +77,8 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
 | --------------- | ---------- | -- | -------- | ------- |
 | [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:17-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-master/Dockerfile) | debian:bullseye | 17 | development: postgis, geos, proj, gdal |
-| [postgis/postgis:18beta3-3.6](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18beta3-3.6) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18beta3-3.6/Dockerfile) | debian:trixie | 18beta3 | 3.6.0 |
-| [postgis/postgis:18beta3-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18beta3-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18beta3-3.6/alpine/Dockerfile) | alpine:3.22 | 18beta3 | 3.6.0 |
+| [postgis/postgis:18rc1-3.6](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18rc1-3.6) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18rc1-3.6/Dockerfile) | debian:trixie | 18rc1 | 3.6.0 |
+| [postgis/postgis:18rc1-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18rc1-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18rc1-3.6/alpine/Dockerfile) | alpine:3.22 | 18rc1 | 3.6.0 |
 
 ## Usage
 
diff --git a/update.sh b/update.sh
@@ -36,7 +36,7 @@ declare -A debianSuite=(
     [15]='bullseye-slim'
     [16]='bullseye-slim'
     [17]='bullseye-slim'
-    [18beta3]='trixie-slim'
+    [18rc1]='trixie-slim'
     [18]='trixie-slim'
 )
 
