Upgrade to Postgis 3.3.4 / 3.4.0beta2 + related changes (#352)

* Upgrade to Postgis 3.3.4 + related changes

Changes to be committed:
	modified:   .github/workflows/main.yml
	modified:   11-3.3/Dockerfile
	modified:   11-3.3/alpine/Dockerfile
	modified:   12-3.3/Dockerfile
	modified:   12-3.3/alpine/Dockerfile
	modified:   13-3.3/Dockerfile
	modified:   13-3.3/alpine/Dockerfile
	modified:   14-3.3/Dockerfile
	modified:   14-3.3/alpine/Dockerfile
	modified:   14-master/Dockerfile
	modified:   15-3.3/Dockerfile
	modified:   15-3.3/alpine/Dockerfile
	modified:   15-master/Dockerfile
        deleted:    16beta2-3.3.3/Dockerfile
	new file:   16beta2-3.3/Dockerfile
	renamed:    16beta2-3.3.3/alpine/Dockerfile -> 16beta2-3.3/alpine/Dockerfile
	renamed:    16beta2-3.3.3/alpine/initdb-postgis.sh -> 16beta2-3.3/alpine/initdb-postgis.sh
	renamed:    16beta2-3.3.3/alpine/update-postgis.sh -> 16beta2-3.3/alpine/update-postgis.sh
	new file:   16beta2-3.3/initdb-postgis.sh
	new file:   16beta2-3.3/update-postgis.sh
	modified:   16beta2-master/Dockerfile
	modified:   README.md

* Add 3.4.0beta2 test images ( alpine only )

Changes to be committed:
	modified:   .github/workflows/main.yml
	new file:   15-3.4.0beta2/Dockerfile
	new file:   15-3.4.0beta2/alpine/Dockerfile
	new file:   15-3.4.0beta2/alpine/initdb-postgis.sh
	new file:   15-3.4.0beta2/alpine/update-postgis.sh
	new file:   16beta2-3.4.0beta2/Dockerfile
	new file:   16beta2-3.4.0beta2/alpine/Dockerfile
	new file:   16beta2-3.4.0beta2/alpine/initdb-postgis.sh
	new file:   16beta2-3.4.0beta2/alpine/update-postgis.sh
	modified:   README.md
	modified:   update.sh

Author: ImreSamu

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [11, 12, 13, 14, 15]
+        postgres: [11, 12, 13, 14, 15, 16beta2]
         postgis: ['3.3']
         variant: [default, alpine]
         include:
@@ -28,8 +28,11 @@ jobs:
           - postgres: 16beta2
             postgis: master
             variant: default
+          - postgres: 15
+            postgis: 3.4.0beta2
+            variant: alpine
           - postgres: 16beta2
-            postgis: 3.3.3
+            postgis: 3.4.0beta2
             variant: alpine
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}

11-3.3/Dockerfile

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

11-3.3/alpine/Dockerfile

@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:11-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 11 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 11 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.3
-ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
+ENV POSTGIS_VERSION 3.3.4
+ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

12-3.3/Dockerfile

@@ -5,11 +5,11 @@
 FROM postgres:12-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.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.3.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

12-3.3/alpine/Dockerfile

@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:12-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 12 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 12 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.3
-ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
+ENV POSTGIS_VERSION 3.3.4
+ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

13-3.3/Dockerfile

@@ -5,11 +5,11 @@
 FROM postgres:13-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.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.3.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

13-3.3/alpine/Dockerfile

@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:13-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 13 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 13 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.3
-ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
+ENV POSTGIS_VERSION 3.3.4
+ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

14-3.3/Dockerfile

@@ -5,11 +5,11 @@
 FROM postgres:14-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.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.3.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

14-3.3/alpine/Dockerfile

@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:14-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.3
-ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
+ENV POSTGIS_VERSION 3.3.4
+ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

14-master/Dockerfile

@@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # one can benefit from the latest CGAL patches while avoiding compatibility issues.
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
+ENV CGAL5X_GIT_HASH dd3b569e7abd66ba181d8d5567b62b1b88f187d1
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 RUN set -ex \
     && mkdir -p /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
+ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
 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 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
+ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180
 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 f11a55b71435db4000db1665739cd65f8441cde7
+ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
+ENV CGAL5X_GIT_HASH dd3b569e7abd66ba181d8d5567b62b1b88f187d1
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
-ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
-ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
+ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
+ENV GEOS_GIT_HASH 3d4870f7970dfac1b090e8a0d05d9b969a9d1180
+ENV GDAL_GIT_HASH d5ae41aed1960dfd511d3c1edfbcefbe85d1adb2
 
 # 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 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
+ENV POSTGIS_GIT_HASH 6c7661430ebcce4521b23bd97b0a0d2be5ea027d
 
 RUN set -ex \
     && apt-get update \