postgis 3.3.1 and 15beta4 upgrade ; remove postgis 2.5 (#313)

* postgis 3.3 upgrade, remove postgis 2.5

* fix CI/CD  matrix

* remove 15beta3-3.3.0rc2

* revert 15beta3-master/Dockerfile

* remove 15beta3-master

* 3.3 upgrade

* remove 15beta3-3.3

* add 15beta4-* images

* remove extra spaces

Author: ImreSamu

.github/workflows/main.yml

@@ -15,32 +15,24 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [10, 11, 12, 13, 14, 15beta3]
-        postgis: ['2.5', '3.2']
+        postgres: [11, 12, 13, 14, '15beta4']
+        postgis: ['3.3']
         variant: [default, alpine]
-        exclude:
-          - postgres: 12
-            postgis: '2.5'
-          - postgres: 13
-            postgis: '2.5'
-          - postgres: 14
-            postgis: '2.5'
-          - postgres: 15beta3
-            postgis: '2.5'
         include:
+          - postgres: 10
+            postgis: '3.2'
+            variant: default
+          - postgres: 10
+            postgis: '3.2'
+            variant: alpine
+
           - postgres: 13
             postgis: master
             variant: default
           - postgres: 14
             postgis: master
             variant: default
-          - postgres: 14
-            postgis: '3.3.0rc2'
-            variant: alpine
-          - postgres: '15beta3'
-            postgis: '3.3.0rc2'
-            variant: alpine
-          - postgres: '15beta3'
+          - postgres: '15beta4'
             postgis: master
             variant: default
 

10-2.5/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.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

11-2.5/Dockerfile

@@ -2,8 +2,8 @@ FROM postgres:11-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.3
-ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
+ENV POSTGIS_VERSION 3.3.1
+ENV POSTGIS_SHA256 12298af0ef8804d913d2e8ca726785d1dc1e51b9589ae49f83d2c64472821500
 
 RUN set -eux \
     \

11-2.5/alpine/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.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

11-3.2/Dockerfile renamed to 11-3.3/Dockerfile

@@ -2,8 +2,8 @@ FROM postgres:12-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.3
-ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
+ENV POSTGIS_VERSION 3.3.1
+ENV POSTGIS_SHA256 12298af0ef8804d913d2e8ca726785d1dc1e51b9589ae49f83d2c64472821500
 
 RUN set -eux \
     \

11-3.2/alpine/Dockerfile renamed to 11-3.3/alpine/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.3+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

10-2.5/alpine/initdb-postgis.sh renamed to 11-3.3/alpine/initdb-postgis.sh

@@ -2,8 +2,8 @@ FROM postgres:13-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
-ENV POSTGIS_VERSION 3.2.3
-ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
+ENV POSTGIS_VERSION 3.3.1
+ENV POSTGIS_SHA256 12298af0ef8804d913d2e8ca726785d1dc1e51b9589ae49f83d2c64472821500
 
 RUN set -eux \
     \

10-2.5/alpine/update-postgis.sh renamed to 11-3.3/alpine/update-postgis.sh

@@ -82,7 +82,7 @@ RUN set -ex \
 
 # proj
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
+ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
 
 RUN set -ex \
     && cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
+ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
 
 RUN set -ex \
     && cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
 
 RUN set -ex \
     && cd /usr/src \
@@ -210,9 +210,9 @@ RUN set -ex \
 COPY --from=builder /usr/local /usr/local
 
 #ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
-ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
+ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
+ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
 
 # Minimal command line test.
 RUN set -ex \
@@ -230,7 +230,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH d31888c038285d36b460e34773e5dddece27d585
+ENV POSTGIS_GIT_HASH ad456b38fe05c328e39e65e9481d66b0fa432593
 
 RUN set -ex \
     && apt-get update \