Postgres 17, PostGIS 3.4.3 and 3.5.0, and other updates

- Improved `./update.sh`: Backported full PostGIS version detection for Alpine, used when no Debian version is available (from https://github.com/ImreSamu/docker-postgis/blob/master/update.sh). Now, `16-3.5/alpine` and `17-3.5/alpine` are automatically set up. - Removed: 15-master and added : 17-master - Updated: 17rc1 -> 17 - Updated postgis 3.4.2 -> 3.4.3 - New: 16-3.5 , 17-3.5 (only Alpine version, as no Debian PostGIS 3.5 package exists yet) - Used the ./update.sh to update Dockerfiles from the template - Updated README.md with alpine, debian, master matrix - Small manual fixes in README.md important: "Recommended versions for new users are: postgis/postgis:17-3.4, postgis/postgis:16-3.4 " ( until PostgreSQL 17.1 ) - Manually updated: ./github/workflows/main.yml
postgis · Sep 27, 2024 · 46c5548 · 46c5548
1 parent 121ba84
commit 46c5548
Show file tree

Hide file tree

Showing 32 changed files with 369 additions and 546 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,24 +15,21 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [12, 13, 14, 15, 16]
+        postgres: [12, 13, 14, 15, 16, 17]
         postgis: ['3.4']
         variant: [default, alpine]
         include:
-          - postgres: 15
-            postgis: master
-            variant: default
           - postgres: 16
             postgis: master
             variant: default
-          - postgres: 17rc1
+          - postgres: 17
             postgis: master
             variant: default
           - postgres: 16
-            postgis: 3.5.0alpha2
+            postgis: 3.5
             variant: alpine
-          - postgres: 17rc1
-            postgis: 3.5.0alpha2
+          - postgres: 17
+            postgis: 3.5
             variant: alpine
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}

diff --git a/12-3.4/Dockerfile b/12-3.4/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:12-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/12-3.4/alpine/Dockerfile b/12-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:12-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 12 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 12 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.4.2
-ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/13-3.4/Dockerfile b/13-3.4/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:13-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/13-3.4/alpine/Dockerfile b/13-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:13-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 13 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 13 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.4.2
-ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/14-3.4/Dockerfile b/14-3.4/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:14-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/14-3.4/alpine/Dockerfile b/14-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:14-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.4.2
-ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/15-3.4/Dockerfile b/15-3.4/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:15-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/15-3.4/alpine/Dockerfile b/15-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 15 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 15 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.4.2
-ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/16-3.4/Dockerfile b/16-3.4/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:16-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/16-3.4/alpine/Dockerfile b/16-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:16-alpine3.20
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 16 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 16 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.4.2
-ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/16-3.5.0alpha2/Dockerfile → 16-3.5/Dockerfile b/16-3.5.0alpha2/Dockerfile → 16-3.5/Dockerfile
diff --git a/16-3.5.0alpha2/alpine/Dockerfile → 16-3.5/alpine/Dockerfile b/16-3.5.0alpha2/alpine/Dockerfile → 16-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:16-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 16 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.0 spatial database extension with PostgreSQL 16 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.5.0alpha2
-ENV POSTGIS_SHA256 27c69b0f3d0a1329897060fb5e8345162d960f30b95f8903e98356fb3236427f
+ENV POSTGIS_VERSION 3.5.0
+ENV POSTGIS_SHA256 a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/15-master/initdb-postgis.sh → 16-3.5/alpine/initdb-postgis.sh b/15-master/initdb-postgis.sh → 16-3.5/alpine/initdb-postgis.sh
diff --git a/15-master/update-postgis.sh → 16-3.5/alpine/update-postgis.sh b/15-master/update-postgis.sh → 16-3.5/alpine/update-postgis.sh
diff --git a/16-master/Dockerfile b/16-master/Dockerfile
@@ -89,7 +89,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
 ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
-ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
+ENV SFCGAL_GIT_HASH 88ec10481fc51efb4d232fd2f45bb556120a6f4c
 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 0a407325fbb5bf42407a7dc5d4f948be9707e302
+ENV PROJ_GIT_HASH d19ab643b9825bf4de5ff336e228b9abc06e2991
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
+ENV GEOS_GIT_HASH e142764b77f4b8d0c36ec88406300c5f876743fb
 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 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
+ENV GDAL_GIT_HASH 91bfec36a4dc03cfba554e6197a83099d9ec122a
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -302,10 +302,10 @@ COPY --from=builder /usr/local /usr/local
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
 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
+ENV SFCGAL_GIT_HASH 88ec10481fc51efb4d232fd2f45bb556120a6f4c
+ENV PROJ_GIT_HASH d19ab643b9825bf4de5ff336e228b9abc06e2991
+ENV GEOS_GIT_HASH e142764b77f4b8d0c36ec88406300c5f876743fb
+ENV GDAL_GIT_HASH 91bfec36a4dc03cfba554e6197a83099d9ec122a
 
 # 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 8349e1670aa4f273dd68813813a1a37b59c12a8c
+ENV POSTGIS_GIT_HASH b28f00c3efd772460714cb9db30b0dc9a0ff27fd
 
 RUN set -ex \
     && apt-get update \

diff --git a/17-3.4/Dockerfile b/17-3.4/Dockerfile
@@ -0,0 +1,28 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM postgres:17-bullseye
+
+LABEL maintainer="PostGIS Project - https://postgis.net" \
+      org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \
+      org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
+
+ENV POSTGIS_MAJOR 3
+ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
+
+RUN apt-get update \
+      && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
+      && apt-get install -y --no-install-recommends \
+           # ca-certificates: for accessing remote raster files;
+           #   fix: https://github.com/postgis/docker-postgis/issues/307
+           ca-certificates \
+           \
+           postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
+           postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
+      && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /docker-entrypoint-initdb.d
+COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
+COPY ./update-postgis.sh /usr/local/bin
+
diff --git a/17rc1-3.5.0alpha2/alpine/Dockerfile → 17-3.4/alpine/Dockerfile b/17rc1-3.5.0alpha2/alpine/Dockerfile → 17-3.4/alpine/Dockerfile
@@ -1,15 +1,15 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:17rc1-alpine3.20
+ARG BASE_IMAGE=postgres:17-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 17rc1 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.3 spatial database extension with PostgreSQL 17 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.5.0alpha2
-ENV POSTGIS_SHA256 27c69b0f3d0a1329897060fb5e8345162d960f30b95f8903e98356fb3236427f
+ENV POSTGIS_VERSION 3.4.3
+ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/16-3.5.0alpha2/alpine/initdb-postgis.sh → 17-3.4/alpine/initdb-postgis.sh b/16-3.5.0alpha2/alpine/initdb-postgis.sh → 17-3.4/alpine/initdb-postgis.sh
diff --git a/16-3.5.0alpha2/alpine/update-postgis.sh → 17-3.4/alpine/update-postgis.sh b/16-3.5.0alpha2/alpine/update-postgis.sh → 17-3.4/alpine/update-postgis.sh
diff --git a/17rc1-3.5.0alpha2/alpine/initdb-postgis.sh → 17-3.4/initdb-postgis.sh b/17rc1-3.5.0alpha2/alpine/initdb-postgis.sh → 17-3.4/initdb-postgis.sh
diff --git a/17rc1-3.5.0alpha2/alpine/update-postgis.sh → 17-3.4/update-postgis.sh b/17rc1-3.5.0alpha2/alpine/update-postgis.sh → 17-3.4/update-postgis.sh
diff --git a/17rc1-3.5.0alpha2/Dockerfile → 17-3.5/Dockerfile b/17rc1-3.5.0alpha2/Dockerfile → 17-3.5/Dockerfile