Update PostGIS 3.6.3, prepare for 3.7, and refresh images

.github/workflows/main.yml

@@ -16,19 +16,19 @@ jobs:
     strategy:
       matrix:
         runner-platform: ['ubuntu-24.04', 'ubuntu-24.04-arm']
-        postgres: [13, 14, 15, 16, 17 ]
+        postgres: [14, 15, 16, 17]
         postgis: ['3.5']
         variant: [default, alpine]
         include:
-          - postgres: 16
+          - postgres: 18
             postgis: master
             variant: default
             runner-platform: 'ubuntu-24.04'
           - postgres: 17
             postgis: master
             variant: default
             runner-platform: 'ubuntu-24.04'
-          - postgres: 16
+          - postgres: 18
             postgis: master
             variant: default
             runner-platform: 'ubuntu-24.04-arm'

14-3.5/alpine/Dockerfile

@@ -1,17 +1,17 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:14-alpine3.22
+ARG BASE_IMAGE=postgres:14-alpine3.23
 FROM ${BASE_IMAGE}
 
 ARG NPROC=
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.5 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.6 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.5
-ENV POSTGIS_SHA256=fc3408c474662b5354c9569cfbd18172f2f4818c09945725b8d0089169925fb1
+ENV POSTGIS_VERSION=3.5.6
+ENV POSTGIS_SHA256=b002b067d2a0e10374d487e03259b44020cad11ba06a34bd9b4f02c242694a05
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

14-3.5/alpine/initdb-postgis.sh

@@ -19,7 +19,23 @@ for DB in template_postgis "$POSTGRES_DB"; do
 		-- Reconnect to update pg_setting.resetval
 		-- See https://github.com/postgis/docker-postgis/issues/288
 		\c
-		CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
-		CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+		--
+		DO $$
+		DECLARE
+			postgis_major integer;
+			postgis_minor integer;
+		BEGIN
+			SELECT substring(postgis_lib_version() from '^([0-9]+)')::integer,
+				substring(postgis_lib_version() from '^[0-9]+\.([0-9]+)')::integer
+			INTO postgis_major, postgis_minor;
+
+			-- Install the legacy tiger geocoder stack only for PostGIS versions before 3.7.
+			-- fuzzystrmatch is required by postgis_tiger_geocoder, which PostGIS 3.7 and later no longer provide.
+			IF postgis_major < 3 OR (postgis_major = 3 AND postgis_minor < 7) THEN
+				CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+				CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+			END IF;
+		END
+		$$;
 EOSQL
 done

14-3.5/initdb-postgis.sh

@@ -19,7 +19,23 @@ for DB in template_postgis "$POSTGRES_DB"; do
 		-- Reconnect to update pg_setting.resetval
 		-- See https://github.com/postgis/docker-postgis/issues/288
 		\c
-		CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
-		CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+		--
+		DO $$
+		DECLARE
+			postgis_major integer;
+			postgis_minor integer;
+		BEGIN
+			SELECT substring(postgis_lib_version() from '^([0-9]+)')::integer,
+				substring(postgis_lib_version() from '^[0-9]+\.([0-9]+)')::integer
+			INTO postgis_major, postgis_minor;
+
+			-- Install the legacy tiger geocoder stack only for PostGIS versions before 3.7.
+			-- fuzzystrmatch is required by postgis_tiger_geocoder, which PostGIS 3.7 and later no longer provide.
+			IF postgis_major < 3 OR (postgis_major = 3 AND postgis_minor < 7) THEN
+				CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+				CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+			END IF;
+		END
+		$$;
 EOSQL
 done

15-3.5/alpine/Dockerfile

@@ -1,17 +1,17 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:15-alpine3.22
+ARG BASE_IMAGE=postgres:15-alpine3.23
 FROM ${BASE_IMAGE}
 
 ARG NPROC=
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.5 spatial database extension with PostgreSQL 15 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.6 spatial database extension with PostgreSQL 15 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.5
-ENV POSTGIS_SHA256=fc3408c474662b5354c9569cfbd18172f2f4818c09945725b8d0089169925fb1
+ENV POSTGIS_VERSION=3.5.6
+ENV POSTGIS_SHA256=b002b067d2a0e10374d487e03259b44020cad11ba06a34bd9b4f02c242694a05
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

15-3.5/alpine/initdb-postgis.sh

@@ -19,7 +19,23 @@ for DB in template_postgis "$POSTGRES_DB"; do
 		-- Reconnect to update pg_setting.resetval
 		-- See https://github.com/postgis/docker-postgis/issues/288
 		\c
-		CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
-		CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+		--
+		DO $$
+		DECLARE
+			postgis_major integer;
+			postgis_minor integer;
+		BEGIN
+			SELECT substring(postgis_lib_version() from '^([0-9]+)')::integer,
+				substring(postgis_lib_version() from '^[0-9]+\.([0-9]+)')::integer
+			INTO postgis_major, postgis_minor;
+
+			-- Install the legacy tiger geocoder stack only for PostGIS versions before 3.7.
+			-- fuzzystrmatch is required by postgis_tiger_geocoder, which PostGIS 3.7 and later no longer provide.
+			IF postgis_major < 3 OR (postgis_major = 3 AND postgis_minor < 7) THEN
+				CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+				CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+			END IF;
+		END
+		$$;
 EOSQL
 done