feat: Add Pg18 GA

.github/workflows/main.yml

@@ -44,19 +44,19 @@ jobs:
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04-arm'
-          - postgres: 18rc1
+          - postgres: 18
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04'
-          - postgres: 18rc1
+          - postgres: 18
             postgis: '3.6'
             variant: alpine
             runner-platform: 'ubuntu-24.04-arm'
-          - postgres: 18rc1
+          - postgres: 18
             postgis: '3.6'
             variant: default
             runner-platform: 'ubuntu-24.04'
-          - postgres: 18rc1
+          - postgres: 18
             postgis: '3.6'
             variant: default
             runner-platform: 'ubuntu-24.04-arm'

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=c02da896fb65cfb07ded49337e315b84d68c469a
-ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
+ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
+ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
 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=b4c9ccbde81d8062114f174e1487b2afaa23b860
+ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
 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=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
+ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
 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=b1958fa2e081739c187d6ed42d56884d9fb8b92d
+ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
 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=c02da896fb65cfb07ded49337e315b84d68c469a
-ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
-ENV PROJ_GIT_HASH=b4c9ccbde81d8062114f174e1487b2afaa23b860
-ENV GEOS_GIT_HASH=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
-ENV GDAL_GIT_HASH=b1958fa2e081739c187d6ed42d56884d9fb8b92d
+ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
+ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
+ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
+ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
+ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
 
 # 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=a59d494dc8a08c42be167edaa0c9830e045e5412
+ENV POSTGIS_GIT_HASH=fda22140ee28de287fd61bb943cad155dc277ee2
 
 RUN set -ex \
     && apt-get update \

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=c02da896fb65cfb07ded49337e315b84d68c469a
-ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
+ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
+ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
 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=b4c9ccbde81d8062114f174e1487b2afaa23b860
+ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
 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=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
+ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
 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=b1958fa2e081739c187d6ed42d56884d9fb8b92d
+ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
 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=c02da896fb65cfb07ded49337e315b84d68c469a
-ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
-ENV PROJ_GIT_HASH=b4c9ccbde81d8062114f174e1487b2afaa23b860
-ENV GEOS_GIT_HASH=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
-ENV GDAL_GIT_HASH=b1958fa2e081739c187d6ed42d56884d9fb8b92d
+ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
+ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
+ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
+ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
+ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
 
 # 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=a59d494dc8a08c42be167edaa0c9830e045e5412
+ENV POSTGIS_GIT_HASH=fda22140ee28de287fd61bb943cad155dc277ee2
 
 RUN set -ex \
     && apt-get update \

18rc1-3.6/Dockerfile → 18-3.6/Dockerfile

@@ -2,10 +2,10 @@
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM postgres:18rc1-trixie
+FROM postgres:18-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 18rc1 trixie" \
+      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR=3

18rc1-3.6/alpine/Dockerfile → 18-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:18rc1-alpine3.22
+ARG BASE_IMAGE=postgres:18-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 18rc1 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.6.0 spatial database extension with PostgreSQL 18 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION=3.6.0

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 (2025-09-16)
+# Versions (2025-09-26)
 
 Supported architecture: `amd64` (also known as X86-64)"
 
@@ -48,6 +48,7 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
 | [postgis/postgis:15-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/Dockerfile) | debian:bullseye | 15 | 3.5.2 |
 | [postgis/postgis:16-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/Dockerfile) | debian:bullseye | 16 | 3.5.2 |
 | [postgis/postgis:17-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/Dockerfile) | debian:bullseye | 17 | 3.5.2 |
+| [postgis/postgis:18-3.6](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18-3.6) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18-3.6/Dockerfile) | debian:trixie | 18 | 3.6.0 |
 
 ### Alpine based
 
@@ -67,6 +68,7 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
 | [postgis/postgis:16-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine/Dockerfile) | alpine:3.22 | 16 | 3.5.3 |
 | [postgis/postgis:17-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine/Dockerfile) | alpine:3.22 | 17 | 3.5.3 |
 | [postgis/postgis:17-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.6/alpine/Dockerfile) | alpine:3.22 | 17 | 3.6.0 |
+| [postgis/postgis:18-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18-3.6/alpine/Dockerfile) | alpine:3.22 | 18 | 3.6.0 |
 
 ### Test images
 
@@ -77,8 +79,6 @@ 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: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
 

update.sh

@@ -36,7 +36,6 @@ declare -A debianSuite=(
     [15]='bullseye-slim'
     [16]='bullseye-slim'
     [17]='bullseye-slim'
-    [18rc1]='trixie-slim'
     [18]='trixie-slim'
 )