Skip to content

Commit 51b3555

Browse files
committed
Update PostGIS 3.6.3, prepare for 3.7, and refresh images
- Remove PostgreSQL 13 images. - Update Alpine images to Alpine 3.23. - Update PostgreSQL 18 / PostGIS 3.6.3 Debian and Alpine images. - Refresh master images: - Remove 16-master. - Move 17-master and 18-master to Debian Trixie. - Fix Trixie dependencies: PCRE2, TIFF6, t64 runtime packages, and Boost 1.83 alignment. - Build CGAL from the 6.1.x branch for SFCGAL compatibility. - Install h3/h3_postgis and address_standardizer from their upstream main branches. - Run targeted h3-pg regress tests and address_standardizer installcheck. - Prepare for PostGIS >= 3.7: - Update initdb-postgis.sh for optional extension changes. - Handle address_standardizer and postgis_tiger_geocoder moving out of PostGIS itself. - Update postgis-basics to require address_standardizer tests for PostGIS 3.5/3.6 and run them for 3.7+ when available. - Update README.md with the supported version range, Alpine 3.23 package versions, and master image notes. - Update GitHub workflow for the refreshed image matrix.
1 parent c902fca commit 51b3555

37 files changed

Lines changed: 628 additions & 507 deletions

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
strategy:
1717
matrix:
1818
runner-platform: ['ubuntu-24.04', 'ubuntu-24.04-arm']
19-
postgres: [13, 14, 15, 16, 17 ]
19+
postgres: [14, 15, 16, 17]
2020
postgis: ['3.5']
2121
variant: [default, alpine]
2222
include:
23-
- postgres: 16
23+
- postgres: 18
2424
postgis: master
2525
variant: default
2626
runner-platform: 'ubuntu-24.04'
2727
- postgres: 17
2828
postgis: master
2929
variant: default
3030
runner-platform: 'ubuntu-24.04'
31-
- postgres: 16
31+
- postgres: 18
3232
postgis: master
3333
variant: default
3434
runner-platform: 'ubuntu-24.04-arm'

13-3.5/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

13-3.5/alpine/Dockerfile

Lines changed: 0 additions & 126 deletions
This file was deleted.

13-3.5/alpine/initdb-postgis.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

13-3.5/initdb-postgis.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

13-3.5/update-postgis.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

14-3.5/alpine/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
4-
ARG BASE_IMAGE=postgres:14-alpine3.22
4+
ARG BASE_IMAGE=postgres:14-alpine3.23
55
FROM ${BASE_IMAGE}
66

77
ARG NPROC=
88

99
LABEL maintainer="PostGIS Project - https://postgis.net" \
10-
org.opencontainers.image.description="PostGIS 3.5.5 spatial database extension with PostgreSQL 14 Alpine" \
10+
org.opencontainers.image.description="PostGIS 3.5.6 spatial database extension with PostgreSQL 14 Alpine" \
1111
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1212

13-
ENV POSTGIS_VERSION=3.5.5
14-
ENV POSTGIS_SHA256=fc3408c474662b5354c9569cfbd18172f2f4818c09945725b8d0089169925fb1
13+
ENV POSTGIS_VERSION=3.5.6
14+
ENV POSTGIS_SHA256=b002b067d2a0e10374d487e03259b44020cad11ba06a34bd9b4f02c242694a05
1515

1616
RUN set -eux \
1717
&& apk add --no-cache --virtual .fetch-deps \

14-3.5/alpine/initdb-postgis.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,23 @@ for DB in template_postgis "$POSTGRES_DB"; do
1919
-- Reconnect to update pg_setting.resetval
2020
-- See https://github.com/postgis/docker-postgis/issues/288
2121
\c
22-
CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
23-
CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
22+
--
23+
DO $$
24+
DECLARE
25+
postgis_major integer;
26+
postgis_minor integer;
27+
BEGIN
28+
SELECT substring(postgis_lib_version() from '^([0-9]+)')::integer,
29+
substring(postgis_lib_version() from '^[0-9]+\.([0-9]+)')::integer
30+
INTO postgis_major, postgis_minor;
31+
32+
-- Install the legacy tiger geocoder stack only for PostGIS versions before 3.7.
33+
-- fuzzystrmatch is required by postgis_tiger_geocoder, which PostGIS 3.7 and later no longer provide.
34+
IF postgis_major < 3 OR (postgis_major = 3 AND postgis_minor < 7) THEN
35+
CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
36+
CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
37+
END IF;
38+
END
39+
$$;
2440
EOSQL
2541
done

14-3.5/initdb-postgis.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,23 @@ for DB in template_postgis "$POSTGRES_DB"; do
1919
-- Reconnect to update pg_setting.resetval
2020
-- See https://github.com/postgis/docker-postgis/issues/288
2121
\c
22-
CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
23-
CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
22+
--
23+
DO $$
24+
DECLARE
25+
postgis_major integer;
26+
postgis_minor integer;
27+
BEGIN
28+
SELECT substring(postgis_lib_version() from '^([0-9]+)')::integer,
29+
substring(postgis_lib_version() from '^[0-9]+\.([0-9]+)')::integer
30+
INTO postgis_major, postgis_minor;
31+
32+
-- Install the legacy tiger geocoder stack only for PostGIS versions before 3.7.
33+
-- fuzzystrmatch is required by postgis_tiger_geocoder, which PostGIS 3.7 and later no longer provide.
34+
IF postgis_major < 3 OR (postgis_major = 3 AND postgis_minor < 7) THEN
35+
CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
36+
CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
37+
END IF;
38+
END
39+
$$;
2440
EOSQL
2541
done

15-3.5/alpine/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
4-
ARG BASE_IMAGE=postgres:15-alpine3.22
4+
ARG BASE_IMAGE=postgres:15-alpine3.23
55
FROM ${BASE_IMAGE}
66

77
ARG NPROC=
88

99
LABEL maintainer="PostGIS Project - https://postgis.net" \
10-
org.opencontainers.image.description="PostGIS 3.5.5 spatial database extension with PostgreSQL 15 Alpine" \
10+
org.opencontainers.image.description="PostGIS 3.5.6 spatial database extension with PostgreSQL 15 Alpine" \
1111
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1212

13-
ENV POSTGIS_VERSION=3.5.5
14-
ENV POSTGIS_SHA256=fc3408c474662b5354c9569cfbd18172f2f4818c09945725b8d0089169925fb1
13+
ENV POSTGIS_VERSION=3.5.6
14+
ENV POSTGIS_SHA256=b002b067d2a0e10374d487e03259b44020cad11ba06a34bd9b4f02c242694a05
1515

1616
RUN set -eux \
1717
&& apk add --no-cache --virtual .fetch-deps \

0 commit comments

Comments
 (0)