upgrade to PostGIS 3.4 (#355)

* upgrade to PostGIS 3.4 * update LATEST_VERSION to 15-3.4 * add more clarity about 11-3.3 version in the README
postgis · Aug 18, 2023 · c8f7932 · c8f7932
1 parent 734a176
commit c8f7932
Show file tree

Hide file tree

Showing 44 changed files with 71 additions and 430 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,8 +15,8 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [11, 12, 13, 14, 15, 16beta3]
-        postgis: ['3.3']
+        postgres: [12, 13, 14, 15, 16beta3]
+        postgis: ['3.4']
         variant: [default, alpine]
         include:
           - postgres: 14
@@ -28,11 +28,11 @@ jobs:
           - postgres: 16beta3
             postgis: master
             variant: default
-          - postgres: 15
-            postgis: 3.4.0rc2
-            variant: alpine
-          - postgres: 16beta3
-            postgis: 3.4.0rc2
+          - postgres: 11
+            postgis: 3.3
+            variant: default
+          - postgres: 11
+            postgis: 3.3
             variant: alpine
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}

diff --git a/12-3.3/Dockerfile → 12-3.4/Dockerfile b/12-3.3/Dockerfile → 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.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.0+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.4+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/12-3.3/alpine/Dockerfile → 12-3.4/alpine/Dockerfile b/12-3.3/alpine/Dockerfile → 12-3.4/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.4 spatial database extension with PostgreSQL 12 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 12 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.4
-ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
+ENV POSTGIS_VERSION 3.4.0
+ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/12-3.3/alpine/initdb-postgis.sh → 12-3.4/alpine/initdb-postgis.sh b/12-3.3/alpine/initdb-postgis.sh → 12-3.4/alpine/initdb-postgis.sh
diff --git a/12-3.3/alpine/update-postgis.sh → 12-3.4/alpine/update-postgis.sh b/12-3.3/alpine/update-postgis.sh → 12-3.4/alpine/update-postgis.sh
diff --git a/12-3.3/initdb-postgis.sh → 12-3.4/initdb-postgis.sh b/12-3.3/initdb-postgis.sh → 12-3.4/initdb-postgis.sh
diff --git a/12-3.3/update-postgis.sh → 12-3.4/update-postgis.sh b/12-3.3/update-postgis.sh → 12-3.4/update-postgis.sh
diff --git a/13-3.3/Dockerfile → 13-3.4/Dockerfile b/13-3.3/Dockerfile → 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.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.0+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.4+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/13-3.3/alpine/Dockerfile → 13-3.4/alpine/Dockerfile b/13-3.3/alpine/Dockerfile → 13-3.4/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.4 spatial database extension with PostgreSQL 13 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 13 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.4
-ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
+ENV POSTGIS_VERSION 3.4.0
+ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/13-3.3/alpine/initdb-postgis.sh → 13-3.4/alpine/initdb-postgis.sh b/13-3.3/alpine/initdb-postgis.sh → 13-3.4/alpine/initdb-postgis.sh
diff --git a/13-3.3/alpine/update-postgis.sh → 13-3.4/alpine/update-postgis.sh b/13-3.3/alpine/update-postgis.sh → 13-3.4/alpine/update-postgis.sh
diff --git a/13-3.3/initdb-postgis.sh → 13-3.4/initdb-postgis.sh b/13-3.3/initdb-postgis.sh → 13-3.4/initdb-postgis.sh
diff --git a/13-3.3/update-postgis.sh → 13-3.4/update-postgis.sh b/13-3.3/update-postgis.sh → 13-3.4/update-postgis.sh
diff --git a/14-3.3/Dockerfile → 14-3.4/Dockerfile b/14-3.3/Dockerfile → 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.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.0+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.4+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/14-3.3/alpine/Dockerfile → 14-3.4/alpine/Dockerfile b/14-3.3/alpine/Dockerfile → 14-3.4/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.4 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.4
-ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
+ENV POSTGIS_VERSION 3.4.0
+ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/14-3.3/alpine/initdb-postgis.sh → 14-3.4/alpine/initdb-postgis.sh b/14-3.3/alpine/initdb-postgis.sh → 14-3.4/alpine/initdb-postgis.sh
diff --git a/14-3.3/alpine/update-postgis.sh → 14-3.4/alpine/update-postgis.sh b/14-3.3/alpine/update-postgis.sh → 14-3.4/alpine/update-postgis.sh
diff --git a/14-3.3/initdb-postgis.sh → 14-3.4/initdb-postgis.sh b/14-3.3/initdb-postgis.sh → 14-3.4/initdb-postgis.sh
diff --git a/14-3.3/update-postgis.sh → 14-3.4/update-postgis.sh b/14-3.3/update-postgis.sh → 14-3.4/update-postgis.sh
diff --git a/14-master/Dockerfile b/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 edf855967dd10dff04318b0cdde980f397194565
+ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 RUN set -ex \
     && mkdir -p /usr/src \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
+ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
 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 949ac934a6518f0e4fe60ca55827ec5e9d29d755
+ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
 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 edf855967dd10dff04318b0cdde980f397194565
+ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
-ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
-ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
+ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
+ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
 
 # 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 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
+ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d
 
 RUN set -ex \
     && apt-get update \

diff --git a/15-3.4.0rc2/Dockerfile b/15-3.4.0rc2/Dockerfile
diff --git a/15-3.4.0rc2/alpine/Dockerfile b/15-3.4.0rc2/alpine/Dockerfile
diff --git a/15-3.3/Dockerfile → 15-3.4/Dockerfile b/15-3.3/Dockerfile → 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.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.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.3.4+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/15-3.3/alpine/Dockerfile → 15-3.4/alpine/Dockerfile b/15-3.3/alpine/Dockerfile → 15-3.4/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 15 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 15 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.4
-ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
+ENV POSTGIS_VERSION 3.4.0
+ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/15-3.3/alpine/initdb-postgis.sh → 15-3.4/alpine/initdb-postgis.sh b/15-3.3/alpine/initdb-postgis.sh → 15-3.4/alpine/initdb-postgis.sh
diff --git a/15-3.3/alpine/update-postgis.sh → 15-3.4/alpine/update-postgis.sh b/15-3.3/alpine/update-postgis.sh → 15-3.4/alpine/update-postgis.sh
diff --git a/15-3.3/initdb-postgis.sh → 15-3.4/initdb-postgis.sh b/15-3.3/initdb-postgis.sh → 15-3.4/initdb-postgis.sh
diff --git a/15-3.3/update-postgis.sh → 15-3.4/update-postgis.sh b/15-3.3/update-postgis.sh → 15-3.4/update-postgis.sh
diff --git a/15-master/Dockerfile b/15-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 edf855967dd10dff04318b0cdde980f397194565
+ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 RUN set -ex \
     && mkdir -p /usr/src \
@@ -152,7 +152,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
+ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
 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 949ac934a6518f0e4fe60ca55827ec5e9d29d755
+ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
 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 edf855967dd10dff04318b0cdde980f397194565
+ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
-ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
-ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
+ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
+ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
 
 # 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 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
+ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d
 
 RUN set -ex \
     && apt-get update \