From 14f9ad04a4b0fcb0117fdb0ee3bc27e30b2de578 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sat, 12 Aug 2023 12:21:53 +0200 Subject: [PATCH] Postgres 16beta3, Postgis 3.4.0rc2 update Other Changes - alpine, master regression testing improvements --- 11-3.3/alpine/Dockerfile | 3 ++- 12-3.3/alpine/Dockerfile | 3 ++- 13-3.3/alpine/Dockerfile | 3 ++- 14-3.3/alpine/Dockerfile | 3 ++- 14-master/Dockerfile | 17 +++++++------- 15-3.3/alpine/Dockerfile | 3 ++- {15-3.4.0rc1 => 15-3.4.0rc2}/Dockerfile | 0 .../alpine/Dockerfile | 9 ++++---- .../alpine/initdb-postgis.sh | 0 .../alpine/update-postgis.sh | 0 15-master/Dockerfile | 17 +++++++------- {16beta2-3.3 => 16beta3-3.3}/Dockerfile | 4 ++-- .../alpine/Dockerfile | 7 +++--- .../alpine/initdb-postgis.sh | 0 .../alpine/update-postgis.sh | 0 .../initdb-postgis.sh | 0 .../update-postgis.sh | 0 .../Dockerfile | 0 .../alpine/Dockerfile | 11 +++++---- .../alpine/initdb-postgis.sh | 0 .../alpine/update-postgis.sh | 0 {16beta2-master => 16beta3-master}/Dockerfile | 23 ++++++++++--------- .../initdb-postgis.sh | 0 .../update-postgis.sh | 0 Dockerfile.alpine.template | 3 ++- Dockerfile.master.template | 3 ++- README.md | 12 +++++----- 27 files changed, 67 insertions(+), 54 deletions(-) rename {15-3.4.0rc1 => 15-3.4.0rc2}/Dockerfile (100%) rename {15-3.4.0rc1 => 15-3.4.0rc2}/alpine/Dockerfile (94%) rename {15-3.4.0rc1 => 15-3.4.0rc2}/alpine/initdb-postgis.sh (100%) rename {15-3.4.0rc1 => 15-3.4.0rc2}/alpine/update-postgis.sh (100%) rename {16beta2-3.3 => 16beta3-3.3}/Dockerfile (91%) rename {16beta2-3.3 => 16beta3-3.3}/alpine/Dockerfile (95%) rename {16beta2-3.3 => 16beta3-3.3}/alpine/initdb-postgis.sh (100%) rename {16beta2-3.3 => 16beta3-3.3}/alpine/update-postgis.sh (100%) rename {16beta2-3.3 => 16beta3-3.3}/initdb-postgis.sh (100%) rename {16beta2-3.3 => 16beta3-3.3}/update-postgis.sh (100%) rename {16beta2-3.4.0rc1 => 16beta3-3.4.0rc2}/Dockerfile (100%) rename {16beta2-3.4.0rc1 => 16beta3-3.4.0rc2}/alpine/Dockerfile (91%) rename {16beta2-3.4.0rc1 => 16beta3-3.4.0rc2}/alpine/initdb-postgis.sh (100%) rename {16beta2-3.4.0rc1 => 16beta3-3.4.0rc2}/alpine/update-postgis.sh (100%) rename {16beta2-master => 16beta3-master}/Dockerfile (95%) rename {16beta2-master => 16beta3-master}/initdb-postgis.sh (100%) rename {16beta2-master => 16beta3-master}/update-postgis.sh (100%) diff --git a/11-3.3/alpine/Dockerfile b/11-3.3/alpine/Dockerfile index d3064d9a..86b94165 100644 --- a/11-3.3/alpine/Dockerfile +++ b/11-3.3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/12-3.3/alpine/Dockerfile b/12-3.3/alpine/Dockerfile index 385a7fc8..4181d2e2 100644 --- a/12-3.3/alpine/Dockerfile +++ b/12-3.3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/13-3.3/alpine/Dockerfile b/13-3.3/alpine/Dockerfile index 10b207d3..732eb5f6 100644 --- a/13-3.3/alpine/Dockerfile +++ b/13-3.3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/14-3.3/alpine/Dockerfile b/14-3.3/alpine/Dockerfile index d0504f32..3490ed2f 100644 --- a/14-3.3/alpine/Dockerfile +++ b/14-3.3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/14-master/Dockerfile b/14-master/Dockerfile index 4c1a2cff..897623eb 100644 --- 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 fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec 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 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f 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 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 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 edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 -ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 # 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 111e4a133b3e036cf634826ab05e7217ebc81cbf +ENV POSTGIS_GIT_HASH 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e RUN set -ex \ && apt-get update \ @@ -378,7 +378,7 @@ RUN set -ex \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && ldconfig \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ @@ -397,6 +397,7 @@ RUN set -ex \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean && cd / \ diff --git a/15-3.3/alpine/Dockerfile b/15-3.3/alpine/Dockerfile index 1026cde3..9aa9b4e9 100644 --- a/15-3.3/alpine/Dockerfile +++ b/15-3.3/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/15-3.4.0rc1/Dockerfile b/15-3.4.0rc2/Dockerfile similarity index 100% rename from 15-3.4.0rc1/Dockerfile rename to 15-3.4.0rc2/Dockerfile diff --git a/15-3.4.0rc1/alpine/Dockerfile b/15-3.4.0rc2/alpine/Dockerfile similarity index 94% rename from 15-3.4.0rc1/alpine/Dockerfile rename to 15-3.4.0rc2/alpine/Dockerfile index 4600026c..10597406 100644 --- a/15-3.4.0rc1/alpine/Dockerfile +++ b/15-3.4.0rc2/alpine/Dockerfile @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.18 FROM ${BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 15 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0rc2 spatial database extension with PostgreSQL 15 Alpine" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0rc1 -ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58 +ENV POSTGIS_VERSION 3.4.0rc2 +ENV POSTGIS_SHA256 546239b4ce901f734f6daa1e9f607696792213eeab1e9e8827582bbea24ac219 RUN set -eux \ && apk add --no-cache --virtual .fetch-deps \ @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/15-3.4.0rc1/alpine/initdb-postgis.sh b/15-3.4.0rc2/alpine/initdb-postgis.sh similarity index 100% rename from 15-3.4.0rc1/alpine/initdb-postgis.sh rename to 15-3.4.0rc2/alpine/initdb-postgis.sh diff --git a/15-3.4.0rc1/alpine/update-postgis.sh b/15-3.4.0rc2/alpine/update-postgis.sh similarity index 100% rename from 15-3.4.0rc1/alpine/update-postgis.sh rename to 15-3.4.0rc2/alpine/update-postgis.sh diff --git a/15-master/Dockerfile b/15-master/Dockerfile index dc88a1e7..3918bd53 100644 --- 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 fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec 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 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f 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 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 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 edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 -ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 # 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 111e4a133b3e036cf634826ab05e7217ebc81cbf +ENV POSTGIS_GIT_HASH 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e RUN set -ex \ && apt-get update \ @@ -378,7 +378,7 @@ RUN set -ex \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && ldconfig \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ @@ -397,6 +397,7 @@ RUN set -ex \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean && cd / \ diff --git a/16beta2-3.3/Dockerfile b/16beta3-3.3/Dockerfile similarity index 91% rename from 16beta2-3.3/Dockerfile rename to 16beta3-3.3/Dockerfile index 56679522..8c6c9b11 100644 --- a/16beta2-3.3/Dockerfile +++ b/16beta3-3.3/Dockerfile @@ -2,10 +2,10 @@ # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. # -FROM postgres:16beta2-bullseye +FROM postgres:16beta3-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16beta2 bullseye" \ + org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16beta3 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_MAJOR 3 diff --git a/16beta2-3.3/alpine/Dockerfile b/16beta3-3.3/alpine/Dockerfile similarity index 95% rename from 16beta2-3.3/alpine/Dockerfile rename to 16beta3-3.3/alpine/Dockerfile index 9453c73e..3f06e48f 100644 --- a/16beta2-3.3/alpine/Dockerfile +++ b/16beta3-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:16beta2-alpine3.18 +ARG BASE_IMAGE=postgres:16beta3-alpine3.18 FROM ${BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 16beta2 Alpine" \ + org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 16beta3 Alpine" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" ENV POSTGIS_VERSION 3.3.4 @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/16beta2-3.3/alpine/initdb-postgis.sh b/16beta3-3.3/alpine/initdb-postgis.sh similarity index 100% rename from 16beta2-3.3/alpine/initdb-postgis.sh rename to 16beta3-3.3/alpine/initdb-postgis.sh diff --git a/16beta2-3.3/alpine/update-postgis.sh b/16beta3-3.3/alpine/update-postgis.sh similarity index 100% rename from 16beta2-3.3/alpine/update-postgis.sh rename to 16beta3-3.3/alpine/update-postgis.sh diff --git a/16beta2-3.3/initdb-postgis.sh b/16beta3-3.3/initdb-postgis.sh similarity index 100% rename from 16beta2-3.3/initdb-postgis.sh rename to 16beta3-3.3/initdb-postgis.sh diff --git a/16beta2-3.3/update-postgis.sh b/16beta3-3.3/update-postgis.sh similarity index 100% rename from 16beta2-3.3/update-postgis.sh rename to 16beta3-3.3/update-postgis.sh diff --git a/16beta2-3.4.0rc1/Dockerfile b/16beta3-3.4.0rc2/Dockerfile similarity index 100% rename from 16beta2-3.4.0rc1/Dockerfile rename to 16beta3-3.4.0rc2/Dockerfile diff --git a/16beta2-3.4.0rc1/alpine/Dockerfile b/16beta3-3.4.0rc2/alpine/Dockerfile similarity index 91% rename from 16beta2-3.4.0rc1/alpine/Dockerfile rename to 16beta3-3.4.0rc2/alpine/Dockerfile index 78127776..95770c7b 100644 --- a/16beta2-3.4.0rc1/alpine/Dockerfile +++ b/16beta3-3.4.0rc2/alpine/Dockerfile @@ -1,15 +1,15 @@ # # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. # -ARG BASE_IMAGE=postgres:16beta2-alpine3.18 +ARG BASE_IMAGE=postgres:16beta3-alpine3.18 FROM ${BASE_IMAGE} LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 16beta2 Alpine" \ + org.opencontainers.image.description="PostGIS 3.4.0rc2 spatial database extension with PostgreSQL 16beta3 Alpine" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" -ENV POSTGIS_VERSION 3.4.0rc1 -ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58 +ENV POSTGIS_VERSION 3.4.0rc2 +ENV POSTGIS_SHA256 546239b4ce901f734f6daa1e9f607696792213eeab1e9e8827582bbea24ac219 RUN set -eux \ && apk add --no-cache --virtual .fetch-deps \ @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/16beta2-3.4.0rc1/alpine/initdb-postgis.sh b/16beta3-3.4.0rc2/alpine/initdb-postgis.sh similarity index 100% rename from 16beta2-3.4.0rc1/alpine/initdb-postgis.sh rename to 16beta3-3.4.0rc2/alpine/initdb-postgis.sh diff --git a/16beta2-3.4.0rc1/alpine/update-postgis.sh b/16beta3-3.4.0rc2/alpine/update-postgis.sh similarity index 100% rename from 16beta2-3.4.0rc1/alpine/update-postgis.sh rename to 16beta3-3.4.0rc2/alpine/update-postgis.sh diff --git a/16beta2-master/Dockerfile b/16beta3-master/Dockerfile similarity index 95% rename from 16beta2-master/Dockerfile rename to 16beta3-master/Dockerfile index a2cb4342..11fa4fa5 100644 --- a/16beta2-master/Dockerfile +++ b/16beta3-master/Dockerfile @@ -7,10 +7,10 @@ ARG DOCKER_CMAKE_BUILD_TYPE=Release ARG CGAL_GIT_BRANCH=5.6.x-branch -FROM postgres:16beta2-bullseye as builder +FROM postgres:16beta3-bullseye as builder LABEL maintainer="PostGIS Project - https://postgis.net" \ - org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16beta2 bullseye" \ + org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16beta3 bullseye" \ org.opencontainers.image.source="https://github.com/postgis/docker-postgis" WORKDIR / @@ -122,7 +122,7 @@ RUN set -ex \ && rm -fr /usr/src/cgal # proj -ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec 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 193dacad1128de3a9be032eaf13a0f4081fcae76 +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f 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 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 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:16beta2-bullseye +FROM postgres:16beta3-bullseye ARG DOCKER_CMAKE_BUILD_TYPE ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} @@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH} ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565 ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c -ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91 -ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76 -ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0 +ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec +ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f +ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755 # 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 111e4a133b3e036cf634826ab05e7217ebc81cbf +ENV POSTGIS_GIT_HASH 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e RUN set -ex \ && apt-get update \ @@ -378,7 +378,7 @@ RUN set -ex \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && ldconfig \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ @@ -397,6 +397,7 @@ RUN set -ex \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean && cd / \ diff --git a/16beta2-master/initdb-postgis.sh b/16beta3-master/initdb-postgis.sh similarity index 100% rename from 16beta2-master/initdb-postgis.sh rename to 16beta3-master/initdb-postgis.sh diff --git a/16beta2-master/update-postgis.sh b/16beta3-master/update-postgis.sh similarity index 100% rename from 16beta2-master/update-postgis.sh rename to 16beta3-master/update-postgis.sh diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template index e8868d2f..8ed94dd7 100644 --- a/Dockerfile.alpine.template +++ b/Dockerfile.alpine.template @@ -76,7 +76,7 @@ RUN set -eux \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ \ @@ -94,6 +94,7 @@ RUN set -eux \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # add .postgis-rundeps && apk add --no-cache --virtual .postgis-rundeps \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 78368408..04dd33d5 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -378,7 +378,7 @@ RUN set -ex \ && mkdir /tempdb \ && chown -R postgres:postgres /tempdb \ && su postgres -c 'pg_ctl -D /tempdb init' \ - && su postgres -c 'pg_ctl -D /tempdb start' \ + && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ && ldconfig \ && cd regress \ && make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \ @@ -397,6 +397,7 @@ RUN set -ex \ \ && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ && rm -rf /tempdb \ + && rm -rf /tmp/logfile \ && rm -rf /tmp/pgis_reg \ # clean && cd / \ diff --git a/README.md b/README.md index 5e3e47f7..ec36a789 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 (2023-08-06) +# Versions (2023-08-12) Supported architecture: `amd64` @@ -64,12 +64,12 @@ Recommended version for new users: `postgis/postgis:15-3.3` | DockerHub image | Dockerfile | OS | Postgres | PostGIS | | --------------- | ---------- | -- | -------- | ------- | | [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-3.4.0rc1-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0rc1-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4.0rc1/alpine/Dockerfile) | alpine:3.18 | 15 | 3.4.0rc1 | +| [postgis/postgis:15-3.4.0rc2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.0rc2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4.0rc2/alpine/Dockerfile) | alpine:3.18 | 15 | 3.4.0rc2 | | [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:16beta2-3.3](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.3/Dockerfile) | debian:bullseye | 16beta2 | 3.3.4 | -| [postgis/postgis:16beta2-3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.3/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.3.4 | -| [postgis/postgis:16beta2-3.4.0rc1-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta2-3.4.0rc1-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta2-3.4.0rc1/alpine/Dockerfile) | alpine:3.18 | 16beta2 | 3.4.0rc1 | -| [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 | +| [postgis/postgis:16beta3-3.3](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-3.3) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-3.3/Dockerfile) | debian:bullseye | 16beta3 | 3.3.4 | +| [postgis/postgis:16beta3-3.3-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-3.3/alpine/Dockerfile) | alpine:3.18 | 16beta3 | 3.3.4 | +| [postgis/postgis:16beta3-3.4.0rc2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-3.4.0rc2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-3.4.0rc2/alpine/Dockerfile) | alpine:3.18 | 16beta3 | 3.4.0rc2 | +| [postgis/postgis:16beta3-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16beta3-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16beta3-master/Dockerfile) | debian:bullseye | 16beta3 | development: postgis, geos, proj, gdal | ## Usage