postgis 3.3.3 update and add Postgres 16beta1 (#344)

* make update * add 16beta1 * update README and CI with the new informations * manual fix * mv 16beta1-3.3 to 16beta1-3.3.3 as a perfect fix.
postgis · May 31, 2023 · 4021772 · 4021772
1 parent 20bbcef
commit 4021772
Show file tree

Hide file tree

Showing 21 changed files with 753 additions and 59 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,6 +25,12 @@ jobs:
           - postgres: 15
             postgis: master
             variant: default
+          - postgres: 16beta1
+            postgis: master
+            variant: default
+          - postgres: 16beta1
+            postgis: 3.3.3
+            variant: alpine
 
     name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
     runs-on: ubuntu-20.04

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

diff --git a/11-3.3/alpine/Dockerfile b/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.2 spatial database extension with PostgreSQL 11 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 11 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.2
-ENV POSTGIS_SHA256 2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
+ENV POSTGIS_VERSION 3.3.3
+ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

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

diff --git a/12-3.3/alpine/Dockerfile b/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.2 spatial database extension with PostgreSQL 12 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 12 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.2
-ENV POSTGIS_SHA256 2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
+ENV POSTGIS_VERSION 3.3.3
+ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

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

diff --git a/13-3.3/alpine/Dockerfile b/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.2 spatial database extension with PostgreSQL 13 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 13 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.2
-ENV POSTGIS_SHA256 2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
+ENV POSTGIS_VERSION 3.3.3
+ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

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

diff --git a/14-3.3/alpine/Dockerfile b/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.2 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.2
-ENV POSTGIS_SHA256 2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
+ENV POSTGIS_VERSION 3.3.3
+ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/14-master/Dockerfile b/14-master/Dockerfile
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # By utilizing the latest commit of the CGAL 5.5.x-branch and implementing a header-only build for SFCGAL,
 # one can benefit from the latest CGAL patches while avoiding compatibility issues.
 ENV CGAL_GIT_BRANCH 5.5.x-branch
-ENV CGAL55_GIT_HASH f93ccadc282d09774c4a22914f71723ceadbd7ce
-ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
+ENV CGAL55_GIT_HASH 0c17d17f62216319809ed3d259355bc9b35bb12e
+ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH fc456d9f23ad6f3aad996cd08cc36be04adcd2d0
+ENV PROJ_GIT_HASH 4c3b4264056b641de9a6baeb6aabbb69aaacbb09
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 2cac99d49fef48d4054f4d74bfc3cbd7bc8bcdcf
+ENV GEOS_GIT_HASH 335cf85d0a66540bcf4474a00f9f39c1084976b3
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH 1e23a32efcba827e591d6a198bbb2af609a22ca8
+ENV GDAL_GIT_HASH da9dd6dbc6b6b3773c56da87245118ae2120eb9c
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -298,11 +298,11 @@ COPY --from=builder /_pgis*.* /
 COPY --from=builder /usr/local /usr/local
 
 ENV CGAL_GIT_BRANCH 5.5.x-branch
-ENV CGAL55_GIT_HASH f93ccadc282d09774c4a22914f71723ceadbd7ce
-ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
-ENV PROJ_GIT_HASH fc456d9f23ad6f3aad996cd08cc36be04adcd2d0
-ENV GEOS_GIT_HASH 2cac99d49fef48d4054f4d74bfc3cbd7bc8bcdcf
-ENV GDAL_GIT_HASH 1e23a32efcba827e591d6a198bbb2af609a22ca8
+ENV CGAL55_GIT_HASH 0c17d17f62216319809ed3d259355bc9b35bb12e
+ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
+ENV PROJ_GIT_HASH 4c3b4264056b641de9a6baeb6aabbb69aaacbb09
+ENV GEOS_GIT_HASH 335cf85d0a66540bcf4474a00f9f39c1084976b3
+ENV GDAL_GIT_HASH da9dd6dbc6b6b3773c56da87245118ae2120eb9c
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -321,7 +321,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH 6080076af801c1b13f1a6bafa88d5ef41b1cf0a3
+ENV POSTGIS_GIT_HASH 36fcdd626ba8b888119c8a53c7365ca9e9786f61
 
 RUN set -ex \
     && apt-get update \

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

diff --git a/15-3.3/alpine/Dockerfile b/15-3.3/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.2 spatial database extension with PostgreSQL 15 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 15 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION 3.3.2
-ENV POSTGIS_SHA256 2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
+ENV POSTGIS_VERSION 3.3.3
+ENV POSTGIS_SHA256 441bb33bd2be362c7c463161207f290a1c25083027a069322696eeec74fc916b
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \

diff --git a/15-master/Dockerfile b/15-master/Dockerfile
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # By utilizing the latest commit of the CGAL 5.5.x-branch and implementing a header-only build for SFCGAL,
 # one can benefit from the latest CGAL patches while avoiding compatibility issues.
 ENV CGAL_GIT_BRANCH 5.5.x-branch
-ENV CGAL55_GIT_HASH f93ccadc282d09774c4a22914f71723ceadbd7ce
-ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
+ENV CGAL55_GIT_HASH 0c17d17f62216319809ed3d259355bc9b35bb12e
+ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH fc456d9f23ad6f3aad996cd08cc36be04adcd2d0
+ENV PROJ_GIT_HASH 4c3b4264056b641de9a6baeb6aabbb69aaacbb09
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH 2cac99d49fef48d4054f4d74bfc3cbd7bc8bcdcf
+ENV GEOS_GIT_HASH 335cf85d0a66540bcf4474a00f9f39c1084976b3
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH 1e23a32efcba827e591d6a198bbb2af609a22ca8
+ENV GDAL_GIT_HASH da9dd6dbc6b6b3773c56da87245118ae2120eb9c
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -298,11 +298,11 @@ COPY --from=builder /_pgis*.* /
 COPY --from=builder /usr/local /usr/local
 
 ENV CGAL_GIT_BRANCH 5.5.x-branch
-ENV CGAL55_GIT_HASH f93ccadc282d09774c4a22914f71723ceadbd7ce
-ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
-ENV PROJ_GIT_HASH fc456d9f23ad6f3aad996cd08cc36be04adcd2d0
-ENV GEOS_GIT_HASH 2cac99d49fef48d4054f4d74bfc3cbd7bc8bcdcf
-ENV GDAL_GIT_HASH 1e23a32efcba827e591d6a198bbb2af609a22ca8
+ENV CGAL55_GIT_HASH 0c17d17f62216319809ed3d259355bc9b35bb12e
+ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
+ENV PROJ_GIT_HASH 4c3b4264056b641de9a6baeb6aabbb69aaacbb09
+ENV GEOS_GIT_HASH 335cf85d0a66540bcf4474a00f9f39c1084976b3
+ENV GDAL_GIT_HASH da9dd6dbc6b6b3773c56da87245118ae2120eb9c
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -321,7 +321,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH 6080076af801c1b13f1a6bafa88d5ef41b1cf0a3
+ENV POSTGIS_GIT_HASH 36fcdd626ba8b888119c8a53c7365ca9e9786f61
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta1-3.3.3/Dockerfile b/16beta1-3.3.3/Dockerfile
@@ -0,0 +1,3 @@
+ # placeholder Dockerfile
+ # Debian version of postgis  is not detected!
+ # This is an autogenerated message of ./update.sh