make update (#349)

postgis · Jun 19, 2023 · 22973a5 · 22973a5
1 parent 1cf257e
commit 22973a5
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
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.3+dfsg-1~exp1.pgdg110+1 spatial database extension with PostgreSQL 11 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.3.3+dfsg-1.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.3+dfsg-1~exp1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

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

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

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

diff --git a/14-master/Dockerfile b/14-master/Dockerfile
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -168,7 +168,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
 ENV CGAL5X_GIT_HASH ad130ba0e0603c06c2a3de887c2570b131ed206f
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 
 # 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 b0388921dcea093d370fddc45b3259610f34153a
+ENV POSTGIS_GIT_HASH e6d6be316631881e464778e958b94cda1c270348
 
 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.3+dfsg-1~exp1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.3.3+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.3+dfsg-1~exp1.pgdg110+1
+ENV POSTGIS_VERSION 3.3.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

diff --git a/15-master/Dockerfile b/15-master/Dockerfile
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -168,7 +168,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
 ENV CGAL5X_GIT_HASH ad130ba0e0603c06c2a3de887c2570b131ed206f
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 
 # 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 b0388921dcea093d370fddc45b3259610f34153a
+ENV POSTGIS_GIT_HASH e6d6be316631881e464778e958b94cda1c270348
 
 RUN set -ex \
     && apt-get update \

diff --git a/16beta1-master/Dockerfile b/16beta1-master/Dockerfile
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -168,7 +168,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
 ENV CGAL5X_GIT_HASH ad130ba0e0603c06c2a3de887c2570b131ed206f
 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
-ENV PROJ_GIT_HASH 7e10ddc628e014c317c18d4bf464ea8947ce082b
+ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
 ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
-ENV GDAL_GIT_HASH 9b77dcc88edf71da468e6e29e26b17df2cf76e5f
+ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
 
 # 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 b0388921dcea093d370fddc45b3259610f34153a
+ENV POSTGIS_GIT_HASH e6d6be316631881e464778e958b94cda1c270348
 
 RUN set -ex \
     && apt-get update \

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-18)
+# Versions (2023-06-19)
 
 Supported architecture: `amd64`