add 15beta2-3.2 and upgrade postgis 3.2.2 (#306)

ImreSamu · web-flow · commit 969ef8a9e4a2 · 2022-07-26T13:22:01.000-04:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [10, 11, 12, 13, 14]
+        postgres: [10, 11, 12, 13, 14, 15beta2]
         postgis: ['2.5', '3.2']
         variant: [default, alpine]
         exclude:
@@ -25,6 +25,8 @@ jobs:
             postgis: '2.5'
           - postgres: 14
             postgis: '2.5'
+          - postgres: 15beta2
+            postgis: '2.5'
         include:
           - postgres: 13
             postgis: master
diff --git a/10-3.2/Dockerfile b/10-3.2/Dockerfile
@@ -3,7 +3,7 @@ FROM postgres:10-bullseye
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/10-3.2/alpine/Dockerfile b/10-3.2/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM postgres:10-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.1
-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
 
 RUN set -eux \
     \
diff --git a/11-3.2/Dockerfile b/11-3.2/Dockerfile
@@ -3,7 +3,7 @@ FROM postgres:11-bullseye
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/11-3.2/alpine/Dockerfile b/11-3.2/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM postgres:11-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.1
-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
 
 RUN set -eux \
     \
diff --git a/12-3.2/Dockerfile b/12-3.2/Dockerfile
@@ -3,7 +3,7 @@ FROM postgres:12-bullseye
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/12-3.2/alpine/Dockerfile b/12-3.2/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM postgres:12-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.1
-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
 
 RUN set -eux \
     \
diff --git a/13-3.2/Dockerfile b/13-3.2/Dockerfile
@@ -3,7 +3,7 @@ FROM postgres:13-bullseye
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/13-3.2/alpine/Dockerfile b/13-3.2/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM postgres:13-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.1
-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
 
 RUN set -eux \
     \
diff --git a/13-master/Dockerfile b/13-master/Dockerfile
@@ -82,7 +82,7 @@ RUN set -ex \
 
 # proj
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
+ENV PROJ_GIT_HASH 398649d9e765bdd58647a35d805370a7edbb47a8
 
 RUN set -ex \
     && cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
+ENV GEOS_GIT_HASH ae1b4b792a8418ff4e3f349022d8fe8adebc80b5
 
 RUN set -ex \
     && cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
+ENV GDAL_GIT_HASH bc69439b943d06c4acd0a45801bb3d5092641aef
 
 RUN set -ex \
     && cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
 COPY --from=builder /usr/local /usr/local
 
 #ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
-ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
-ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
-ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
+ENV PROJ_GIT_HASH 398649d9e765bdd58647a35d805370a7edbb47a8
+ENV GEOS_GIT_HASH ae1b4b792a8418ff4e3f349022d8fe8adebc80b5
+ENV GDAL_GIT_HASH bc69439b943d06c4acd0a45801bb3d5092641aef
 
 # Minimal command line test.
 RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH a31a43a7a74ad8f5c22b165c3c92bfd2f9ad92f7
+ENV POSTGIS_GIT_HASH b9f1e10befad02207cf87b46ef3f85591e25ee4c
 
 RUN set -ex \
     && apt-get update \
diff --git a/14-3.2/Dockerfile b/14-3.2/Dockerfile
@@ -3,7 +3,7 @@ FROM postgres:14-bullseye
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
-ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/14-3.2/alpine/Dockerfile b/14-3.2/alpine/Dockerfile
@@ -2,8 +2,8 @@ FROM postgres:14-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.1
-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
 
 RUN set -eux \
     \
diff --git a/14-master/Dockerfile b/14-master/Dockerfile
@@ -82,7 +82,7 @@ RUN set -ex \
 
 # proj
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
+ENV PROJ_GIT_HASH 398649d9e765bdd58647a35d805370a7edbb47a8
 
 RUN set -ex \
     && cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
+ENV GEOS_GIT_HASH ae1b4b792a8418ff4e3f349022d8fe8adebc80b5
 
 RUN set -ex \
     && cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
+ENV GDAL_GIT_HASH bc69439b943d06c4acd0a45801bb3d5092641aef
 
 RUN set -ex \
     && cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
 COPY --from=builder /usr/local /usr/local
 
 #ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
-ENV PROJ_GIT_HASH 2d8cf765765ac0499d2b4cccabfce55c33c9bafb
-ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
-ENV GDAL_GIT_HASH 0b1e20dd2d31d656330aeec983f1e8f433332f77
+ENV PROJ_GIT_HASH 398649d9e765bdd58647a35d805370a7edbb47a8
+ENV GEOS_GIT_HASH ae1b4b792a8418ff4e3f349022d8fe8adebc80b5
+ENV GDAL_GIT_HASH bc69439b943d06c4acd0a45801bb3d5092641aef
 
 # Minimal command line test.
 RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH a31a43a7a74ad8f5c22b165c3c92bfd2f9ad92f7
+ENV POSTGIS_GIT_HASH b9f1e10befad02207cf87b46ef3f85591e25ee4c
 
 RUN set -ex \
     && apt-get update \
diff --git a/15beta2-3.2/Dockerfile b/15beta2-3.2/Dockerfile
@@ -0,0 +1,18 @@
+FROM postgres:15beta2-bullseye
+
+LABEL maintainer="PostGIS Project - https://postgis.net"
+
+ENV POSTGIS_MAJOR 3
+ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
+
+RUN apt-get update \
+      && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
+      && apt-get install -y --no-install-recommends \
+           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/15beta2-3.2/alpine/Dockerfile b/15beta2-3.2/alpine/Dockerfile
@@ -0,0 +1,129 @@
+FROM postgres:15beta2-alpine3.16
+
+LABEL maintainer="PostGIS Project - https://postgis.net"
+
+ENV POSTGIS_VERSION 3.2.2
+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
+
+RUN set -eux \
+    \
+    &&  if   [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
+            set -eux ; \
+            #
+            # using only v3.16
+            #
+            #GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
+            export GEOS_ALPINE_VER=3.10 ; \
+            #GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
+            export GDAL_ALPINE_VER=3.5 ; \
+            #PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
+            export PROJ_ALPINE_VER=9.0 ; \
+            #
+        elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
+            set -eux ; \
+            #
+            # using older branches v3.13; v3.14 for GEOS,GDAL,PROJ
+            #
+            #GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.13 \
+            export GEOS_ALPINE_VER=3.8 ; \
+            #GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.14 \
+            export GDAL_ALPINE_VER=3.2 ; \
+            #PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.14 \
+            export PROJ_ALPINE_VER=7.2 ; \
+            #
+            \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.14/main'      >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.13/main'      >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.13/community' >> /etc/apk/repositories ; \
+            \
+        else \
+            set -eux ; \
+            echo ".... unknown \$POSTGIS_VERSION ...." ; \
+            exit 1 ; \
+        fi \
+    \
+    && apk add --no-cache --virtual .fetch-deps \
+        ca-certificates \
+        openssl \
+        tar \
+    \
+    && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \
+    && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \
+    && mkdir -p /usr/src/postgis \
+    && tar \
+        --extract \
+        --file postgis.tar.gz \
+        --directory /usr/src/postgis \
+        --strip-components 1 \
+    && rm postgis.tar.gz \
+    \
+    && apk add --no-cache --virtual .build-deps \
+        \
+        gdal-dev~=${GDAL_ALPINE_VER} \
+        geos-dev~=${GEOS_ALPINE_VER} \
+        proj-dev~=${PROJ_ALPINE_VER} \
+        \
+        autoconf \
+        automake \
+        clang-dev \
+        file \
+        g++ \
+        gcc \
+        gettext-dev \
+        json-c-dev \
+        libtool \
+        libxml2-dev \
+        llvm-dev \
+        make \
+        pcre-dev \
+        perl \
+        protobuf-c-dev \
+    \
+# build PostGIS
+    \
+    && cd /usr/src/postgis \
+    && gettextize \
+    && ./autogen.sh \
+    && ./configure \
+        --with-pcredir="$(pcre-config --prefix)" \
+    && make -j$(nproc) \
+    && make install \
+    \
+# regress check
+    && mkdir /tempdb \
+    && chown -R postgres:postgres /tempdb \
+    && su postgres -c 'pg_ctl -D /tempdb init' \
+    && su postgres -c 'pg_ctl -D /tempdb start' \
+    && cd regress \
+    && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
+    #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
+    #&& make garden                                      PGUSER=postgres \
+    \
+    && su postgres -c 'psql    -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
+    && su postgres -c 'psql -t -c "SELECT version();"'              >> /_pgis_full_version.txt \
+    && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \
+    \
+    && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
+    && rm -rf /tempdb \
+    && rm -rf /tmp/pgis_reg \
+# add .postgis-rundeps
+    && apk add --no-cache --virtual .postgis-rundeps \
+        \
+        gdal~=${GDAL_ALPINE_VER} \
+        geos~=${GEOS_ALPINE_VER} \
+        proj~=${PROJ_ALPINE_VER} \
+        \
+        json-c \
+        libstdc++ \
+        pcre \
+        protobuf-c \
+# clean
+    && cd / \
+    && rm -rf /usr/src/postgis \
+    && apk del .fetch-deps .build-deps \
+# print PostGIS_Full_Version() for the log. ( experimental & internal )
+    && cat /_pgis_full_version.txt
+
+COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
+COPY ./update-postgis.sh /usr/local/bin
diff --git a/15beta2-3.2/alpine/initdb-postgis.sh b/15beta2-3.2/alpine/initdb-postgis.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
+
+# Create the 'template_postgis' template db
+"${psql[@]}" <<- 'EOSQL'
+CREATE DATABASE template_postgis IS_TEMPLATE true;
+EOSQL
+
+# Load PostGIS into both template_database and $POSTGRES_DB
+for DB in template_postgis "$POSTGRES_DB"; do
+	echo "Loading PostGIS extensions into $DB"
+	"${psql[@]}" --dbname="$DB" <<-'EOSQL'
+		CREATE EXTENSION IF NOT EXISTS postgis;
+		CREATE EXTENSION IF NOT EXISTS postgis_topology;
+		-- Reconnect to update pg_setting.resetval
+		-- See https://github.com/postgis/docker-postgis/issues/288
+		\c
+		CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+		CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+EOSQL
+done
diff --git a/15beta2-3.2/alpine/update-postgis.sh b/15beta2-3.2/alpine/update-postgis.sh
diff --git a/15beta2-3.2/initdb-postgis.sh b/15beta2-3.2/initdb-postgis.sh
diff --git a/15beta2-3.2/update-postgis.sh b/15beta2-3.2/update-postgis.sh
diff --git a/15beta2-master/Dockerfile b/15beta2-master/Dockerfile
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ FROM postgres:10-alpine3.16`
`2`	`2`
`3`	`3`	`LABEL maintainer="PostGIS Project - https://postgis.net"`
`4`	`4`
`5`		`-ENV POSTGIS_VERSION 3.2.1`
`6`		`-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3`
	`5`	`+ENV POSTGIS_VERSION 3.2.2`
	`6`	`+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b`
`7`	`7`
`8`	`8`	`RUN set -eux \`
`9`	`9`	`\`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ FROM postgres:11-alpine3.16`
`2`	`2`
`3`	`3`	`LABEL maintainer="PostGIS Project - https://postgis.net"`
`4`	`4`
`5`		`-ENV POSTGIS_VERSION 3.2.1`
`6`		`-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3`
	`5`	`+ENV POSTGIS_VERSION 3.2.2`
	`6`	`+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b`
`7`	`7`
`8`	`8`	`RUN set -eux \`
`9`	`9`	`\`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ FROM postgres:12-alpine3.16`
`2`	`2`
`3`	`3`	`LABEL maintainer="PostGIS Project - https://postgis.net"`
`4`	`4`
`5`		`-ENV POSTGIS_VERSION 3.2.1`
`6`		`-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3`
	`5`	`+ENV POSTGIS_VERSION 3.2.2`
	`6`	`+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b`
`7`	`7`
`8`	`8`	`RUN set -eux \`
`9`	`9`	`\`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ FROM postgres:13-alpine3.16`
`2`	`2`
`3`	`3`	`LABEL maintainer="PostGIS Project - https://postgis.net"`
`4`	`4`
`5`		`-ENV POSTGIS_VERSION 3.2.1`
`6`		`-ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3`
	`5`	`+ENV POSTGIS_VERSION 3.2.2`
	`6`	`+ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b`
`7`	`7`
`8`	`8`	`RUN set -eux \`
`9`	`9`	`\`