From 80703b068d986e017ef878c70abbd1909572d970 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Wed, 18 Sep 2024 02:27:25 +0200 Subject: [PATCH] temporary postgis 3.5.0beta1 build -j1 workaround --- 12-3.5/alpine3.19/Dockerfile | 3 ++- 12-3.5/alpine3.20/Dockerfile | 3 ++- 13-3.5/alpine3.19/Dockerfile | 3 ++- 13-3.5/alpine3.20/Dockerfile | 3 ++- 14-3.5/alpine3.19/Dockerfile | 3 ++- 14-3.5/alpine3.20/Dockerfile | 3 ++- 14-l3.1.9gcp/bookworm/Dockerfile | 4 +++- 15-3.5/alpine3.19/Dockerfile | 3 ++- 15-3.5/alpine3.20/Dockerfile | 3 ++- 15-master/bookworm/Dockerfile | 8 ++++++-- 15-recent/bookworm/Dockerfile | 8 ++++++-- 16-3.5/alpine3.19/Dockerfile | 3 ++- 16-3.5/alpine3.20/Dockerfile | 3 ++- 16-l3.5.0beta1/bookworm/Dockerfile | 11 ++++++++--- 16-master/bookworm/Dockerfile | 8 ++++++-- 16-recent/bookworm/Dockerfile | 8 ++++++-- 17rc1-3.5/alpine3.19/Dockerfile | 3 ++- 17rc1-3.5/alpine3.20/Dockerfile | 3 ++- 17rc1-l3.5.0beta1/bookworm/Dockerfile | 11 ++++++++--- 17rc1-master/bookworm/Dockerfile | 8 ++++++-- 17rc1-recent/bookworm/Dockerfile | 8 ++++++-- Dockerfile.alpine.template | 5 +++++ Dockerfile.master.template | 13 +++++++++++-- README.md | 2 +- 24 files changed, 96 insertions(+), 34 deletions(-) diff --git a/12-3.5/alpine3.19/Dockerfile b/12-3.5/alpine3.19/Dockerfile index e2fe3752..8d710ac8 100644 --- a/12-3.5/alpine3.19/Dockerfile +++ b/12-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile index ef216df9..c390cf56 100644 --- a/12-3.5/alpine3.20/Dockerfile +++ b/12-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.19/Dockerfile b/13-3.5/alpine3.19/Dockerfile index 974b11df..742b5e42 100644 --- a/13-3.5/alpine3.19/Dockerfile +++ b/13-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile index 4425cc66..7eea8d57 100644 --- a/13-3.5/alpine3.20/Dockerfile +++ b/13-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.19/Dockerfile b/14-3.5/alpine3.19/Dockerfile index 49c0cde5..67c1f8cb 100644 --- a/14-3.5/alpine3.19/Dockerfile +++ b/14-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile index 653f48b5..e7243219 100644 --- a/14-3.5/alpine3.20/Dockerfile +++ b/14-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile index 8c085367..b944bf59 100644 --- a/14-l3.1.9gcp/bookworm/Dockerfile +++ b/14-l3.1.9gcp/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} diff --git a/15-3.5/alpine3.19/Dockerfile b/15-3.5/alpine3.19/Dockerfile index 2e4ea3b4..8d0f80ea 100644 --- a/15-3.5/alpine3.19/Dockerfile +++ b/15-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile index b870d153..24c0c533 100644 --- a/15-3.5/alpine3.20/Dockerfile +++ b/15-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile index 6f530f9b..95485e03 100644 --- a/15-master/bookworm/Dockerfile +++ b/15-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/15-recent/bookworm/Dockerfile b/15-recent/bookworm/Dockerfile index 0aba1780..ab57c7d8 100644 --- a/15-recent/bookworm/Dockerfile +++ b/15-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/16-3.5/alpine3.19/Dockerfile b/16-3.5/alpine3.19/Dockerfile index 25b66478..bec0dd3a 100644 --- a/16-3.5/alpine3.19/Dockerfile +++ b/16-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile index 4d1d9eff..9a096a97 100644 --- a/16-3.5/alpine3.20/Dockerfile +++ b/16-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/16-l3.5.0beta1/bookworm/Dockerfile b/16-l3.5.0beta1/bookworm/Dockerfile index 57dfe829..e8199658 100644 --- a/16-l3.5.0beta1/bookworm/Dockerfile +++ b/16-l3.5.0beta1/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end @@ -630,7 +634,8 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile index cd9318b1..86aec996 100644 --- a/16-master/bookworm/Dockerfile +++ b/16-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index e4b55fe7..c9ed960a 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/17rc1-3.5/alpine3.19/Dockerfile b/17rc1-3.5/alpine3.19/Dockerfile index ad8d9a28..90be5822 100644 --- a/17rc1-3.5/alpine3.19/Dockerfile +++ b/17rc1-3.5/alpine3.19/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-3.5/alpine3.20/Dockerfile b/17rc1-3.5/alpine3.20/Dockerfile index e4cb53dc..01f36a02 100644 --- a/17rc1-3.5/alpine3.20/Dockerfile +++ b/17rc1-3.5/alpine3.20/Dockerfile @@ -72,7 +72,8 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/17rc1-l3.5.0beta1/bookworm/Dockerfile b/17rc1-l3.5.0beta1/bookworm/Dockerfile index 985f1464..35e6184e 100644 --- a/17rc1-l3.5.0beta1/bookworm/Dockerfile +++ b/17rc1-l3.5.0beta1/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end @@ -630,7 +634,8 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ - && make -j$(nproc) \ + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/17rc1-master/bookworm/Dockerfile b/17rc1-master/bookworm/Dockerfile index 0a381b66..0ef1bf56 100644 --- a/17rc1-master/bookworm/Dockerfile +++ b/17rc1-master/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/17rc1-recent/bookworm/Dockerfile b/17rc1-recent/bookworm/Dockerfile index 50a9c80a..9a11abc9 100644 --- a/17rc1-recent/bookworm/Dockerfile +++ b/17rc1-recent/bookworm/Dockerfile @@ -100,7 +100,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -324,7 +326,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ## GDAL_build-end diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index d24e58ec..734375f0 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -67,7 +67,12 @@ RUN set -eux \ && ./autogen.sh \ && ./configure \ --enable-lto \ +{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ +{{ ) else ( -}} && make -j$(nproc) \ +{{ ) end -}} && make install \ \ # This section is for refreshing the proj data for the regression tests. diff --git a/Dockerfile.master.template b/Dockerfile.master.template index ab48f18e..0b2656ed 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -103,7 +103,9 @@ RUN set -eux \ liblz4-dev \ liblzma-dev \ libwebp-dev \ - libzstd-dev + libzstd-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* ARG PGIS1_CMAKE_BUILD_TYPE ENV PGIS1_CMAKE_BUILD_TYPE=${PGIS1_CMAKE_BUILD_TYPE} @@ -328,7 +330,9 @@ RUN set -eux \ libopenjp2-7-dev \ libpng-dev \ libqhull-dev \ - libspatialite-dev + libspatialite-dev \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* {{ ) else ( -}} # {{ ) end -}} @@ -653,7 +657,12 @@ RUN set -eux \ # https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie && ./configure \ --enable-lto \ +{{ if .[env.variant].POSTGIS_CHECKOUT == "tags/3.5.0beta1" then ( -}} + # postgis=3.5.0beta1 -j1 workaround activated; https://trac.osgeo.org/postgis/ticket/5779 + && make -j1 \ +{{ ) else ( -}} && make -j$(nproc) \ +{{ ) end -}} && make install \ # refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316 && if command -v projsync >/dev/null 2>&1; then \ diff --git a/README.md b/README.md index 6d29ec86..8e192379 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-09-17) +## Versions (2024-09-18) We provide multi-platform image support for the following architectures: