From c5ff4f1f99e6527fe63549150cc5a1bf9689fff0 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 4 Nov 2023 12:37:49 +0100 Subject: [PATCH] update templates, add netcdf to gdal, etc .. --- 11-3.3/alpine3.18/Dockerfile | 18 ----------- 12-3.4/alpine3.18/Dockerfile | 18 ----------- 13-3.4/alpine3.18/Dockerfile | 18 ----------- 14-3.4-bundle0/bookworm/Dockerfile | 4 +-- 14-3.4/alpine3.18/Dockerfile | 18 ----------- 15-3.4-bundle0/bookworm/Dockerfile | 4 +-- 15-3.4/alpine3.18/Dockerfile | 18 ----------- 15-master/bookworm/Dockerfile | 43 +++++++++++++++++++++--- 15-recent/bookworm/Dockerfile | 37 ++++++++++++++++++++- 16-3.4-bundle0/bookworm/Dockerfile | 4 +-- 16-3.4/alpine3.18/Dockerfile | 18 ----------- 16-master/bookworm/Dockerfile | 43 +++++++++++++++++++++--- 16-recent/bookworm/Dockerfile | 37 ++++++++++++++++++++- Dockerfile.alpine.template | 18 ----------- Dockerfile.master.template | 35 ++++++++++++++++++++ README.md | 2 +- versions.json | 52 +++++++++++++++--------------- versions.sh | 47 ++++++++++++++++----------- 18 files changed, 246 insertions(+), 188 deletions(-) diff --git a/11-3.3/alpine3.18/Dockerfile b/11-3.3/alpine3.18/Dockerfile index c7689bfa..0221b233 100644 --- a/11-3.3/alpine3.18/Dockerfile +++ b/11-3.3/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 11 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.3.4 -# ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/12-3.4/alpine3.18/Dockerfile b/12-3.4/alpine3.18/Dockerfile index 834d6adc..cd1db43c 100644 --- a/12-3.4/alpine3.18/Dockerfile +++ b/12-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 12 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/13-3.4/alpine3.18/Dockerfile b/13-3.4/alpine3.18/Dockerfile index 5a0a52ab..e8d8c40d 100644 --- a/13-3.4/alpine3.18/Dockerfile +++ b/13-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 13 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile index a2b02ce3..577a4e03 100644 --- a/14-3.4-bundle0/bookworm/Dockerfile +++ b/14-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2 diff --git a/14-3.4/alpine3.18/Dockerfile b/14-3.4/alpine3.18/Dockerfile index 84b212d5..4a0af0f6 100644 --- a/14-3.4/alpine3.18/Dockerfile +++ b/14-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 14 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile index d5cc8d89..648ebc2d 100644 --- a/15-3.4-bundle0/bookworm/Dockerfile +++ b/15-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1 diff --git a/15-3.4/alpine3.18/Dockerfile b/15-3.4/alpine3.18/Dockerfile index 53e2d2b6..0255bd80 100644 --- a/15-3.4/alpine3.18/Dockerfile +++ b/15-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 15 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index d6c3bcb7..daf20df1 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -15,13 +15,20 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 -ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 -ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 -ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 75291922..97d6421c 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -17,11 +17,18 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile index f8afb7b9..75978ec0 100644 --- a/16-3.4-bundle0/bookworm/Dockerfile +++ b/16-3.4-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.13.0-dev1 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=98623ea1d97be06106a6ce593296253c1c5f38c1 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0 diff --git a/16-3.4/alpine3.18/Dockerfile b/16-3.4/alpine3.18/Dockerfile index 589a5ee8..03a3926b 100644 --- a/16-3.4/alpine3.18/Dockerfile +++ b/16-3.4/alpine3.18/Dockerfile @@ -19,25 +19,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL 16 alpine3.18" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION 3.4.0 -# ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024 - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index 76b7f16d..e6306aa0 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -15,13 +15,20 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git -ARG PGIS1_POSTGIS_CHECKOUT=6adb29e43b5514be567c4f91b43c635ad9163948 -ARG PGIS1_GEOS_CHECKOUT=a7a12f54371ddefee4e468ef89677ba9305719b1 -ARG PGIS1_GDAL_CHECKOUT=33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9 -ARG PGIS1_PROJ_CHECKOUT=576fbc42fd7412fd68e802376f3e629ebb84d961 +ARG PGIS1_POSTGIS_CHECKOUT=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT=21244f7db80aaf3a2f6552fb190a54744e067200 ARG PGIS1_SFCGAL_CHECKOUT=cbcf0adaa6cecc80347345952b5c850a64d2db4f ARG PGIS1_CGAL_CHECKOUT=07d93e2b452c4121aed5b6435c29b03826f44602 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=42f04a29effdd9e8280c7aba17420ba306fc73f4 +ARG PGIS1_GEOS_CHECKOUT_SHA1=13c25a877704327db9f4f0dfd9c41d527dc8f46d +ARG PGIS1_GDAL_CHECKOUT_SHA1=099fd25145c07ff56319bc1e25764a171825fa73 +ARG PGIS1_PROJ_CHECKOUT_SHA1=21244f7db80aaf3a2f6552fb190a54744e067200 +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=07d93e2b452c4121aed5b6435c29b03826f44602 + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index 5bcbc6fd..b5f35017 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -17,11 +17,18 @@ ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git ARG PGIS1_POSTGIS_CHECKOUT=tags/3.4.0 ARG PGIS1_GEOS_CHECKOUT=tags/3.12.0 -ARG PGIS1_GDAL_CHECKOUT=tags/v3.8.0beta1 +ARG PGIS1_GDAL_CHECKOUT=tags/v3.7.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.3.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v1.5.0 ARG PGIS1_CGAL_CHECKOUT=tags/v5.6 +ARG PGIS1_POSTGIS_CHECKOUT_SHA1=0874ea342af5392e3cd9f4e6157ef08648c9d2d8 +ARG PGIS1_GEOS_CHECKOUT_SHA1=0d636b600de985a05fa84e744273c79e7d3ab57e +ARG PGIS1_GDAL_CHECKOUT_SHA1=6133cf34a78077998406c0c4045bf51f06e3f49d +ARG PGIS1_PROJ_CHECKOUT_SHA1=08f394ea303391be96f6ade46d87b7b677531afc +ARG PGIS1_SFCGAL_CHECKOUT_SHA1=cbcf0adaa6cecc80347345952b5c850a64d2db4f +ARG PGIS1_CGAL_CHECKOUT_SHA1=de4fa0d7d57b5a997012f2804161386ff4bc0d0f + ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -93,6 +100,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -108,11 +116,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -122,6 +132,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -130,6 +142,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -154,6 +168,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -162,6 +178,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -193,6 +211,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -201,6 +221,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -226,6 +248,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -235,6 +258,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -262,6 +287,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -276,12 +302,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -361,8 +390,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -379,8 +410,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -457,6 +490,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index 73a865b6..552d2734 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -14,25 +14,7 @@ LABEL maintainer="PostGIS Project - https://postgis.net" \ org.opencontainers.image.description="PostGIS ${PGIS1_POSTGIS_CHECKOUT} spatial database extension with PostgreSQL {{ .[env.variant].PG_MAJOR }} {{ env.variant }}" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -# ENV POSTGIS_VERSION {{ .[env.variant].POSTGIS_VERSION }} -# ENV POSTGIS_SHA256 {{ .[env.variant].POSTGIS_SHA256 }} - RUN set -eux \ -# && 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 \ \ ca-certificates \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 638dd519..d047c292 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -17,6 +17,13 @@ ARG PGIS1_PROJ_CHECKOUT={{ .[env.variant].PROJ_CHECKOUT }} ARG PGIS1_SFCGAL_CHECKOUT={{ .[env.variant].SFCGAL_CHECKOUT }} ARG PGIS1_CGAL_CHECKOUT={{ .[env.variant].CGAL_CHECKOUT }} +ARG PGIS1_POSTGIS_CHECKOUT_SHA1={{ .[env.variant].POSTGIS_CHECKOUT_SHA1 }} +ARG PGIS1_GEOS_CHECKOUT_SHA1={{ .[env.variant].GEOS_CHECKOUT_SHA1 }} +ARG PGIS1_GDAL_CHECKOUT_SHA1={{ .[env.variant].GDAL_CHECKOUT_SHA1 }} +ARG PGIS1_PROJ_CHECKOUT_SHA1={{ .[env.variant].PROJ_CHECKOUT_SHA1 }} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1={{ .[env.variant].SFCGAL_CHECKOUT_SHA1 }} +ARG PGIS1_CGAL_CHECKOUT_SHA1={{ .[env.variant].CGAL_CHECKOUT_SHA1 }} + ARG PGIS1_BOOST_VERSION={{ .[env.variant].BOOST_VERSION }} ARG PGIS1_CMAKE_BUILD_TYPE=Release @@ -92,6 +99,7 @@ RUN set -eux \ libkml-dev \ liblz4-dev \ liblzma-dev \ + libnetcdf-dev \ libopenjp2-7-dev \ libqhull-dev \ libwebp-dev \ @@ -107,11 +115,13 @@ ARG PGIS1_SFCGAL_REPOSITORY ENV PGIS1_SFCGAL_REPOSITORY ${PGIS1_SFCGAL_REPOSITORY} ARG PGIS1_SFCGAL_CHECKOUT ENV PGIS1_SFCGAL_CHECKOUT ${PGIS1_SFCGAL_CHECKOUT} +ARG PGIS1_SFCGAL_CHECKOUT_SHA1 ARG PGIS1_CGAL_REPOSITORY ENV PGIS1_CGAL_REPOSITORY ${PGIS1_CGAL_REPOSITORY} ARG PGIS1_CGAL_CHECKOUT ENV PGIS1_CGAL_CHECKOUT ${PGIS1_CGAL_CHECKOUT} +ARG PGIS1_CGAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -121,6 +131,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_CGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_CGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_CGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_cgal_last_commit.txt \ && cd /usr/src \ && mkdir SFCGAL \ @@ -129,6 +141,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_SFCGAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_SFCGAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_SFCGAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_sfcgal_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -153,6 +167,8 @@ ARG PGIS1_PROJ_REPOSITORY ENV PGIS1_PROJ_REPOSITORY ${PGIS1_PROJ_REPOSITORY} ARG PGIS1_PROJ_CHECKOUT ENV PGIS1_PROJ_CHECKOUT ${PGIS1_PROJ_CHECKOUT} +ARG PGIS1_PROJ_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir PROJ \ @@ -161,6 +177,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_PROJ_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_PROJ_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_PROJ_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_proj_last_commit.txt \ # check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027 && if [ -f "autogen.sh" ] ; then \ @@ -192,6 +210,8 @@ ARG PGIS1_GEOS_REPOSITORY ENV PGIS1_GEOS_REPOSITORY ${PGIS1_GEOS_REPOSITORY} ARG PGIS1_GEOS_CHECKOUT ENV PGIS1_GEOS_CHECKOUT ${PGIS1_GEOS_CHECKOUT} +ARG PGIS1_GEOS_CHECKOUT_SHA1 + RUN set -eux \ && cd /usr/src \ && mkdir geos \ @@ -200,6 +220,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GEOS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GEOS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GEOS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_geos_last_commit.txt \ && mkdir cmake-build \ && cd cmake-build \ @@ -225,6 +247,7 @@ ARG PGIS1_GDAL_REPOSITORY ENV PGIS1_GDAL_REPOSITORY ${PGIS1_GDAL_REPOSITORY} ARG PGIS1_GDAL_CHECKOUT ENV PGIS1_GDAL_CHECKOUT ${PGIS1_GDAL_CHECKOUT} +ARG PGIS1_GDAL_CHECKOUT_SHA1 RUN set -eux \ && cd /usr/src \ @@ -234,6 +257,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_GDAL_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_GDAL_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_GDAL_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_gdal_last_commit.txt \ \ # gdal project directory structure - has been changed ! @@ -261,6 +286,7 @@ RUN set -eux \ \ -DGDAL_HIDE_INTERNAL_SYMBOLS=ON \ -DRENAME_INTERNAL_TIFF_SYMBOLS=ON \ +# -DGDAL_USE_ARROW=ON \ -DGDAL_USE_BLOSC=ON \ -DGDAL_USE_CFITSIO=ON \ -DGDAL_USE_CURL=ON \ @@ -275,12 +301,15 @@ RUN set -eux \ -DGDAL_USE_LIBKML=ON \ -DGDAL_USE_LIBLZMA=ON \ -DGDAL_USE_LZ4=ON \ + -DGDAL_USE_NETCDF=ON \ -DGDAL_USE_OPENJPEG=ON \ +# -DGDAL_USE_PARQUET=ON \ -DGDAL_USE_POSTGRESQL=ON \ -DGDAL_USE_QHULL=ON \ -DGDAL_USE_SQLITE3=ON \ -DGDAL_USE_TIFF=ON \ -DGDAL_USE_WEBP=ON \ + -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZSTD=ON \ \ # OFF and Not working https://github.com/OSGeo/gdal/issues/7100 @@ -368,8 +397,10 @@ RUN set -eux \ libkmlbase1 \ libkmldom1 \ libkmlengine1 \ + libnetcdf19 \ libopenjp2-7 \ libqhull-r8.0 \ + netcdf-bin \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -386,8 +417,10 @@ ARG PGIS1_SFCGAL_CHECKOUT ARG PGIS1_SFCGAL_REPOSITORY ARG PGIS1_CGAL_REPOSITORY ARG PGIS1_CGAL_CHECKOUT + ARG PGIS1_POSTGIS_CHECKOUT ARG PGIS1_POSTGIS_REPOSITORY +ARG PGIS1_POSTGIS_CHECKOUT_SHA1 ENV PGIS1_GDAL_CHECKOUT=${PGIS1_GDAL_CHECKOUT} \ PGIS1_GDAL_REPOSITORY=${PGIS1_GDAL_REPOSITORY} \ @@ -464,6 +497,8 @@ RUN set -eux \ && git remote add origin ${PGIS1_POSTGIS_REPOSITORY} \ && git fetch --depth 1 origin ${PGIS1_POSTGIS_CHECKOUT} \ && git checkout FETCH_HEAD \ + # Verify that the commit hash matches the known good one + && if [ "$(git rev-parse HEAD)" != "$PGIS1_POSTGIS_CHECKOUT_SHA1" ]; then exit 1; fi \ && git log -1 > /_pgis_last_commit.txt \ && ./autogen.sh \ # configure options taken from: diff --git a/README.md b/README.md index 6a3266f3..65b16699 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,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-11-02) +## Versions (2023-11-04) We provide multi-platform image support for the following architectures: diff --git a/versions.json b/versions.json index 3a9dff73..7ed099b8 100644 --- a/versions.json +++ b/versions.json @@ -162,8 +162,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2", "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349", "POSTGIS_MAJOR": "3", @@ -222,8 +222,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1", "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e", "POSTGIS_MAJOR": "3", @@ -239,18 +239,18 @@ "PG_DOCKER": "15", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", - "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", - "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", + "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", + "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", + "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" } }, @@ -267,8 +267,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0beta1", - "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", + "GDAL_CHECKOUT": "tags/v3.7.3", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", @@ -330,8 +330,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.13.0-dev1", - "TIMESCALEDB_CHECKOUT_SHA1": "98623ea1d97be06106a6ce593296253c1c5f38c1", + "TIMESCALEDB_CHECKOUT": "tags/2.12.2", + "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0", "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9", "POSTGIS_MAJOR": "3", @@ -347,18 +347,18 @@ "PG_DOCKER": "16", "arch": "amd64 arm64", "template": "Dockerfile.master.template", - "POSTGIS_CHECKOUT": "6adb29e43b5514be567c4f91b43c635ad9163948", - "POSTGIS_CHECKOUT_SHA1": "6adb29e43b5514be567c4f91b43c635ad9163948", + "POSTGIS_CHECKOUT": "42f04a29effdd9e8280c7aba17420ba306fc73f4", + "POSTGIS_CHECKOUT_SHA1": "42f04a29effdd9e8280c7aba17420ba306fc73f4", "CGAL_CHECKOUT": "07d93e2b452c4121aed5b6435c29b03826f44602", "CGAL_CHECKOUT_SHA1": "07d93e2b452c4121aed5b6435c29b03826f44602", "SFCGAL_CHECKOUT": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", "SFCGAL_CHECKOUT_SHA1": "cbcf0adaa6cecc80347345952b5c850a64d2db4f", - "PROJ_CHECKOUT": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "PROJ_CHECKOUT_SHA1": "576fbc42fd7412fd68e802376f3e629ebb84d961", - "GDAL_CHECKOUT": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GDAL_CHECKOUT_SHA1": "33d6db38db8fc4a9f7028f5a5c9e0a5e749553d9", - "GEOS_CHECKOUT": "a7a12f54371ddefee4e468ef89677ba9305719b1", - "GEOS_CHECKOUT_SHA1": "a7a12f54371ddefee4e468ef89677ba9305719b1", + "PROJ_CHECKOUT": "21244f7db80aaf3a2f6552fb190a54744e067200", + "PROJ_CHECKOUT_SHA1": "21244f7db80aaf3a2f6552fb190a54744e067200", + "GDAL_CHECKOUT": "099fd25145c07ff56319bc1e25764a171825fa73", + "GDAL_CHECKOUT_SHA1": "099fd25145c07ff56319bc1e25764a171825fa73", + "GEOS_CHECKOUT": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", + "GEOS_CHECKOUT_SHA1": "13c25a877704327db9f4f0dfd9c41d527dc8f46d", "BOOST_VERSION": "1.74.0" } }, @@ -375,8 +375,8 @@ "POSTGIS_CHECKOUT_SHA1": "0874ea342af5392e3cd9f4e6157ef08648c9d2d8", "PROJ_CHECKOUT": "tags/9.3.0", "PROJ_CHECKOUT_SHA1": "08f394ea303391be96f6ade46d87b7b677531afc", - "GDAL_CHECKOUT": "tags/v3.8.0beta1", - "GDAL_CHECKOUT_SHA1": "ff68a2c40d19367807b51cf2899e537d983b1ee4", + "GDAL_CHECKOUT": "tags/v3.7.3", + "GDAL_CHECKOUT_SHA1": "6133cf34a78077998406c0c4045bf51f06e3f49d", "GEOS_CHECKOUT": "tags/3.12.0", "GEOS_CHECKOUT_SHA1": "0d636b600de985a05fa84e744273c79e7d3ab57e", "SFCGAL_CHECKOUT": "tags/v1.5.0", diff --git a/versions.sh b/versions.sh index d99f3dff..fe28150b 100755 --- a/versions.sh +++ b/versions.sh @@ -33,6 +33,7 @@ declare -A postgisDebPkgNameVersionSuffixes=( [3.2]='3' [3.3]='3' [3.4]='3' + [3.5]='3' ) declare -A boostVersion=( @@ -156,16 +157,24 @@ get_latest_version_and_hash() { local repo_url="$1" # Argument 2: Repository identifier local repo_id="$2" + # development version .. witj --pre + local repo_development="${3:-}" # Argumnet 3: tag filter - optional - local repo_only="${3:-}" + local repo_only="${4:-}" echo "[+] Checking lastversion : $repo_id - $repo_url" # Fetch the latest version tag using the lastversion command + if [[ "${repo_development}" == "pre-releases" ]]; then + repo_development=" --pre " + else + repo_development="" + fi + if [ -z "$repo_only" ]; then - eval "lastversion_${repo_id}=$(lastversion --format tag --pre "${repo_url}")" + eval "lastversion_${repo_id}=$(lastversion ${repo_development} --format tag "${repo_url}")" else - eval "lastversion_${repo_id}${repo_only}=$(lastversion --format tag --pre --only "${repo_only}" "${repo_url}")" + eval "lastversion_${repo_id}${repo_only}=$(lastversion ${repo_development} --format tag --only "${repo_only}" "${repo_url}")" fi # Intermediary step to resolve the variable name @@ -194,22 +203,22 @@ get_latest_version_and_hash() { fi } -get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" -get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" -get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" - -get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" -get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" -get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" -get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" -get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" -get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" - -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL16 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL15 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL14 -get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL13 +get_latest_version_and_hash "https://github.com/MobilityDB/MobilityDB" "mobilitydb" pre-releases +get_latest_version_and_hash "https://github.com/pramsey/pgsql-http" "pgsql_http" releases +get_latest_version_and_hash "https://github.com/pramsey/pgsql-gzip" "pgsql_gzip" releases +get_latest_version_and_hash "https://github.com/timescale/timescaledb" "timescaledb" releases + +get_latest_version_and_hash "https://github.com/postgis/postgis" "postgis" releases +get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal" releases +get_latest_version_and_hash "https://github.com/libgeos/geos" "geos" releases +get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal" releases +get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj" releases +get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal" releases + +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL16 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL15 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL14 +get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" releases REL13 #-------------------------------------------