From 0ddbe043719cc9ee9bf7aa6687cc3db63b3eae56 Mon Sep 17 00:00:00 2001 From: thomasboussekey Date: Sat, 23 Nov 2024 11:19:15 +0100 Subject: [PATCH 1/2] Update PgSQL 17.2 16.6 15.10 14.15 13.18 12.22 --- 16-master/Dockerfile | 22 +++++++++++----------- 17-master/Dockerfile | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/16-master/Dockerfile b/16-master/Dockerfile index 639bae6a..fc9f5d86 100644 --- a/16-master/Dockerfile +++ b/16-master/Dockerfile @@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # cgal & sfcgal ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633 -ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29 +ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b +ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b 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 54a7662dbc52963da70303ac8c9124966f4cf6b4 +ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 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 d7c51c401213d11f5dafd56596295274433379b6 +ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 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 014581eece0d174ac283691e855c5f370a73d990 +ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633 -ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29 -ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4 -ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6 -ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990 +ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b +ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b +ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 +ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 +ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 # Minimal command line test ( fail fast ) RUN set -ex \ @@ -322,7 +322,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 77bcee79332a82a5b5fc7ae6ae47470939a855fa +ENV POSTGIS_GIT_HASH 78f1646214ca915fd34580a63989afd772736521 RUN set -ex \ && apt-get update \ diff --git a/17-master/Dockerfile b/17-master/Dockerfile index a297941e..be11f072 100644 --- a/17-master/Dockerfile +++ b/17-master/Dockerfile @@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} # cgal & sfcgal ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633 -ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29 +ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b +ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b 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 54a7662dbc52963da70303ac8c9124966f4cf6b4 +ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 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 d7c51c401213d11f5dafd56596295274433379b6 +ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 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 014581eece0d174ac283691e855c5f370a73d990 +ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} -ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633 -ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29 -ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4 -ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6 -ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990 +ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b +ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b +ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 +ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 +ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 # Minimal command line test ( fail fast ) RUN set -ex \ @@ -322,7 +322,7 @@ RUN set -ex \ || echo "ogr2ogr missing PostgreSQL driver" && exit 1 # install postgis -ENV POSTGIS_GIT_HASH 77bcee79332a82a5b5fc7ae6ae47470939a855fa +ENV POSTGIS_GIT_HASH 78f1646214ca915fd34580a63989afd772736521 RUN set -ex \ && apt-get update \ From 045597b784557e44d653c97a3c9fe2189c4c2b19 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 24 Nov 2024 08:54:04 +0100 Subject: [PATCH 2/2] ./update.sh update master --- 16-master/Dockerfile | 8 ++++---- 17-master/Dockerfile | 8 ++++---- README.md | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/16-master/Dockerfile b/16-master/Dockerfile index fc9f5d86..38fd4506 100644 --- a/16-master/Dockerfile +++ b/16-master/Dockerfile @@ -150,7 +150,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 +ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2 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 17f6835f621cb785f39aff7eb6ee215255f7ed93 +ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -302,8 +302,8 @@ ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 -ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 -ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 +ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2 +ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba # Minimal command line test ( fail fast ) RUN set -ex \ diff --git a/17-master/Dockerfile b/17-master/Dockerfile index be11f072..a46fb0a9 100644 --- a/17-master/Dockerfile +++ b/17-master/Dockerfile @@ -150,7 +150,7 @@ RUN set -ex \ && rm -fr /usr/src/PROJ # geos -ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 +ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2 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 17f6835f621cb785f39aff7eb6ee215255f7ed93 +ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba RUN set -ex \ && cd /usr/src \ && git clone https://github.com/OSGeo/gdal.git \ @@ -302,8 +302,8 @@ ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094 -ENV GEOS_GIT_HASH 1ab10dd64bcb0032adbd76b91fa699bacba8d4e2 -ENV GDAL_GIT_HASH 17f6835f621cb785f39aff7eb6ee215255f7ed93 +ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2 +ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba # Minimal command line test ( fail fast ) RUN set -ex \ diff --git a/README.md b/README.md index 5be554f5..55e8dd6a 100644 --- 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 (2024-10-15) +# Versions (2024-11-24) Supported architecture: `amd64` (also known as X86-64)"