update to 16beta2 + make update (#350)

Changes to be committed: modified: .github/workflows/main.yml modified: 14-master/Dockerfile modified: 15-master/Dockerfile renamed: 16beta1-3.3.3/Dockerfile -> 16beta2-3.3.3/Dockerfile renamed: 16beta1-3.3.3/alpine/Dockerfile -> 16beta2-3.3.3/alpine/Dockerfile renamed: 16beta1-3.3.3/alpine/initdb-postgis.sh -> 16beta2-3.3.3/alpine/initdb-postgis.sh renamed: 16beta1-3.3.3/alpine/update-postgis.sh -> 16beta2-3.3.3/alpine/update-postgis.sh renamed: 16beta1-master/Dockerfile -> 16beta2-master/Dockerfile renamed: 16beta1-master/initdb-postgis.sh -> 16beta2-master/initdb-postgis.sh renamed: 16beta1-master/update-postgis.sh -> 16beta2-master/update-postgis.sh modified: README.md
postgis · Jul 5, 2023 · baa1c86 · baa1c86
1 parent 22973a5
commit baa1c86
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,10 +25,10 @@ jobs:
           - postgres: 15
             postgis: master
             variant: default
-          - postgres: 16beta1
+          - postgres: 16beta2
             postgis: master
             variant: default
-          - postgres: 16beta1
+          - postgres: 16beta2
             postgis: 3.3.3
             variant: alpine
 

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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
 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 afcb31885fb206d2e3093ead943aa320a991370a
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
 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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
-ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 
 # 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 e6d6be316631881e464778e958b94cda1c270348
+ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
 
 RUN set -ex \
     && apt-get update \

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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
 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 afcb31885fb206d2e3093ead943aa320a991370a
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
 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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
-ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 
 # 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 e6d6be316631881e464778e958b94cda1c270348
+ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta1-3.3.3/Dockerfile → 16beta2-3.3.3/Dockerfile b/16beta1-3.3.3/Dockerfile → 16beta2-3.3.3/Dockerfile
diff --git a/16beta1-3.3.3/alpine/Dockerfile → 16beta2-3.3.3/alpine/Dockerfile b/16beta1-3.3.3/alpine/Dockerfile → 16beta2-3.3.3/alpine/Dockerfile
@@ -1,11 +1,11 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:16beta1-alpine3.18
+ARG BASE_IMAGE=postgres:16beta2-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 16beta1 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.3.3 spatial database extension with PostgreSQL 16beta2 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION 3.3.3

diff --git a/16beta1-3.3.3/alpine/initdb-postgis.sh → 16beta2-3.3.3/alpine/initdb-postgis.sh b/16beta1-3.3.3/alpine/initdb-postgis.sh → 16beta2-3.3.3/alpine/initdb-postgis.sh
diff --git a/16beta1-3.3.3/alpine/update-postgis.sh → 16beta2-3.3.3/alpine/update-postgis.sh b/16beta1-3.3.3/alpine/update-postgis.sh → 16beta2-3.3.3/alpine/update-postgis.sh
diff --git a/16beta1-master/Dockerfile → 16beta2-master/Dockerfile b/16beta1-master/Dockerfile → 16beta2-master/Dockerfile
@@ -7,10 +7,10 @@
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
 ARG CGAL_GIT_BRANCH=5.6.x-branch
-FROM postgres:16beta1-bullseye as builder
+FROM postgres:16beta2-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 16beta1 bullseye" \
+      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 16beta2 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 WORKDIR /
@@ -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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
 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 afcb31885fb206d2e3093ead943aa320a991370a
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
 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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -252,7 +252,7 @@ RUN set -ex \
 # -------------------------------------------
 # STAGE  final
 # -------------------------------------------
-FROM postgres:16beta1-bullseye
+FROM postgres:16beta2-bullseye
 
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
@@ -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 ad130ba0e0603c06c2a3de887c2570b131ed206f
+ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
-ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
+ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
+ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
+ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
 
 # 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 e6d6be316631881e464778e958b94cda1c270348
+ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta1-master/initdb-postgis.sh → 16beta2-master/initdb-postgis.sh b/16beta1-master/initdb-postgis.sh → 16beta2-master/initdb-postgis.sh
diff --git a/16beta1-master/update-postgis.sh → 16beta2-master/update-postgis.sh b/16beta1-master/update-postgis.sh → 16beta2-master/update-postgis.sh
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ This image ensures that the default database created by the parent `postgres` im
 
 Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
 
-# Versions (2023-06-19)
+# Versions (2023-07-04)
 
 Supported architecture: `amd64`
 
@@ -65,8 +65,8 @@ Recommended version for new users: `postgis/postgis:15-3.3`
 | --------------- | ---------- | -- | -------- | ------- |
 | [postgis/postgis:14-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-master/Dockerfile) | debian:bullseye | 14 | development: postgis, geos, proj, gdal |
 | [postgis/postgis:15-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/Dockerfile) | debian:bullseye | 15 | development: postgis, geos, proj, gdal |
-| [postgis/postgis:16beta1-3.3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta1-3.3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta1-3.3.3/alpine/Dockerfile) | alpine:3.18 | 16beta1 | 3.3.3 |
-| [postgis/postgis:16beta1-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta1-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta1-master/Dockerfile) | debian:bullseye | 16beta1 | development: postgis, geos, proj, gdal |
+| [postgis/postgis:16beta2-3.3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.3.3/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.3.3 |
+| [postgis/postgis:16beta2-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-master/Dockerfile) | debian:bullseye | 16beta2 | development: postgis, geos, proj, gdal |
 
 ## Usage