Skip to content

Commit 734a176

Browse files
ImreSamuImreSamu
authored
Postgres 16beta3, Postgis 3.4.0rc2 update (#354)
* Postgres 16beta3, Postgis 3.4.0rc2 update Other Changes - alpine, master regression testing improvements * update workflow
1 parent cca48f8 commit 734a176

28 files changed

+72
-59
lines changed

‎.github/workflows/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [11, 12, 13, 14, 15, 16beta2]
18+
postgres: [11, 12, 13, 14, 15, 16beta3]
1919
postgis: ['3.3']
2020
variant: [default, alpine]
2121
include:
@@ -25,14 +25,14 @@ jobs:
2525
- postgres: 15
2626
postgis: master
2727
variant: default
28-
- postgres: 16beta2
28+
- postgres: 16beta3
2929
postgis: master
3030
variant: default
3131
- postgres: 15
32-
postgis: 3.4.0rc1
32+
postgis: 3.4.0rc2
3333
variant: alpine
34-
- postgres: 16beta2
35-
postgis: 3.4.0rc1
34+
- postgres: 16beta3
35+
postgis: 3.4.0rc2
3636
variant: alpine
3737

3838
name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}

‎11-3.3/alpine/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎12-3.3/alpine/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎13-3.3/alpine/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎14-3.3/alpine/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎14-master/Dockerfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ RUN set -ex \
122122
&& rm -fr /usr/src/cgal
123123

124124
# proj
125-
ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
125+
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
126126
RUN set -ex \
127127
&& cd /usr/src \
128128
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
152152
&& rm -fr /usr/src/PROJ
153153

154154
# geos
155-
ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76
155+
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
156156
RUN set -ex \
157157
&& cd /usr/src \
158158
&& git clone https://github.com/libgeos/geos.git \
@@ -168,7 +168,7 @@ RUN set -ex \
168168
&& rm -fr /usr/src/geos
169169

170170
# gdal
171-
ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0
171+
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
172172
RUN set -ex \
173173
&& cd /usr/src \
174174
&& git clone https://github.com/OSGeo/gdal.git \
@@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH
303303
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
304304
ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306-
ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
307-
ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76
308-
ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0
306+
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
307+
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
308+
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
309309

310310
# Minimal command line test ( fail fast )
311311
RUN set -ex \
@@ -324,7 +324,7 @@ RUN set -ex \
324324
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
325325

326326
# install postgis
327-
ENV POSTGIS_GIT_HASH 111e4a133b3e036cf634826ab05e7217ebc81cbf
327+
ENV POSTGIS_GIT_HASH 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
328328

329329
RUN set -ex \
330330
&& apt-get update \
@@ -378,7 +378,7 @@ RUN set -ex \
378378
&& mkdir /tempdb \
379379
&& chown -R postgres:postgres /tempdb \
380380
&& su postgres -c 'pg_ctl -D /tempdb init' \
381-
&& su postgres -c 'pg_ctl -D /tempdb start' \
381+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
382382
&& ldconfig \
383383
&& cd regress \
384384
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
@@ -397,6 +397,7 @@ RUN set -ex \
397397
\
398398
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
399399
&& rm -rf /tempdb \
400+
&& rm -rf /tmp/logfile \
400401
&& rm -rf /tmp/pgis_reg \
401402
# clean
402403
&& cd / \

‎15-3.3/alpine/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎15-3.4.0rc1/Dockerfile renamed to ‎15-3.4.0rc2/Dockerfile

File renamed without changes.

‎15-3.4.0rc1/alpine/Dockerfile renamed to ‎15-3.4.0rc2/alpine/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.18
55
FROM ${BASE_IMAGE}
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 15 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0rc2 spatial database extension with PostgreSQL 15 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.4.0rc1
12-
ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58
11+
ENV POSTGIS_VERSION 3.4.0rc2
12+
ENV POSTGIS_SHA256 546239b4ce901f734f6daa1e9f607696792213eeab1e9e8827582bbea24ac219
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎15-3.4.0rc1/alpine/initdb-postgis.sh renamed to ‎15-3.4.0rc2/alpine/initdb-postgis.sh

File renamed without changes.

‎15-3.4.0rc1/alpine/update-postgis.sh renamed to ‎15-3.4.0rc2/alpine/update-postgis.sh

File renamed without changes.

‎15-master/Dockerfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ RUN set -ex \
122122
&& rm -fr /usr/src/cgal
123123

124124
# proj
125-
ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
125+
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
126126
RUN set -ex \
127127
&& cd /usr/src \
128128
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -152,7 +152,7 @@ RUN set -ex \
152152
&& rm -fr /usr/src/PROJ
153153

154154
# geos
155-
ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76
155+
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
156156
RUN set -ex \
157157
&& cd /usr/src \
158158
&& git clone https://github.com/libgeos/geos.git \
@@ -168,7 +168,7 @@ RUN set -ex \
168168
&& rm -fr /usr/src/geos
169169

170170
# gdal
171-
ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0
171+
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
172172
RUN set -ex \
173173
&& cd /usr/src \
174174
&& git clone https://github.com/OSGeo/gdal.git \
@@ -303,9 +303,9 @@ ARG CGAL_GIT_BRANCH
303303
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
304304
ENV CGAL5X_GIT_HASH edf855967dd10dff04318b0cdde980f397194565
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306-
ENV PROJ_GIT_HASH fde3d58e4af51f8e6c9cafeeb2b0299ab1218d91
307-
ENV GEOS_GIT_HASH 193dacad1128de3a9be032eaf13a0f4081fcae76
308-
ENV GDAL_GIT_HASH 3e4dc710a2d4cff1f02b70ca5c4df280a5378ae0
306+
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
307+
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
308+
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
309309

310310
# Minimal command line test ( fail fast )
311311
RUN set -ex \
@@ -324,7 +324,7 @@ RUN set -ex \
324324
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
325325

326326
# install postgis
327-
ENV POSTGIS_GIT_HASH 111e4a133b3e036cf634826ab05e7217ebc81cbf
327+
ENV POSTGIS_GIT_HASH 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
328328

329329
RUN set -ex \
330330
&& apt-get update \
@@ -378,7 +378,7 @@ RUN set -ex \
378378
&& mkdir /tempdb \
379379
&& chown -R postgres:postgres /tempdb \
380380
&& su postgres -c 'pg_ctl -D /tempdb init' \
381-
&& su postgres -c 'pg_ctl -D /tempdb start' \
381+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
382382
&& ldconfig \
383383
&& cd regress \
384384
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
@@ -397,6 +397,7 @@ RUN set -ex \
397397
\
398398
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
399399
&& rm -rf /tempdb \
400+
&& rm -rf /tmp/logfile \
400401
&& rm -rf /tmp/pgis_reg \
401402
# clean
402403
&& cd / \

‎16beta2-3.3/Dockerfile renamed to ‎16beta3-3.3/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
44

5-
FROM postgres:16beta2-bullseye
5+
FROM postgres:16beta3-bullseye
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16beta2 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.3.4+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16beta3 bullseye" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR 3

‎16beta2-3.3/alpine/Dockerfile renamed to ‎16beta3-3.3/alpine/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
4-
ARG BASE_IMAGE=postgres:16beta2-alpine3.18
4+
ARG BASE_IMAGE=postgres:16beta3-alpine3.18
55
FROM ${BASE_IMAGE}
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 16beta2 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.3.4 spatial database extension with PostgreSQL 16beta3 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_VERSION 3.3.4
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎16beta2-3.3/alpine/initdb-postgis.sh renamed to ‎16beta3-3.3/alpine/initdb-postgis.sh

File renamed without changes.

‎16beta2-3.3/alpine/update-postgis.sh renamed to ‎16beta3-3.3/alpine/update-postgis.sh

File renamed without changes.

‎16beta2-3.3/initdb-postgis.sh renamed to ‎16beta3-3.3/initdb-postgis.sh

File renamed without changes.

‎16beta2-3.3/update-postgis.sh renamed to ‎16beta3-3.3/update-postgis.sh

File renamed without changes.

‎16beta2-3.4.0rc1/Dockerfile renamed to ‎16beta3-3.4.0rc2/Dockerfile

File renamed without changes.

‎16beta2-3.4.0rc1/alpine/Dockerfile renamed to ‎16beta3-3.4.0rc2/alpine/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
4-
ARG BASE_IMAGE=postgres:16beta2-alpine3.18
4+
ARG BASE_IMAGE=postgres:16beta3-alpine3.18
55
FROM ${BASE_IMAGE}
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.4.0rc1 spatial database extension with PostgreSQL 16beta2 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0rc2 spatial database extension with PostgreSQL 16beta3 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.4.0rc1
12-
ENV POSTGIS_SHA256 113cd54983823858f958c46941c2a06219e1d8d67913e6c93e18df2b94a50c58
11+
ENV POSTGIS_VERSION 3.4.0rc2
12+
ENV POSTGIS_SHA256 546239b4ce901f734f6daa1e9f607696792213eeab1e9e8827582bbea24ac219
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \
@@ -76,7 +76,7 @@ RUN set -eux \
7676
&& mkdir /tempdb \
7777
&& chown -R postgres:postgres /tempdb \
7878
&& su postgres -c 'pg_ctl -D /tempdb init' \
79-
&& su postgres -c 'pg_ctl -D /tempdb start' \
79+
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
8080
&& cd regress \
8181
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
8282
\
@@ -94,6 +94,7 @@ RUN set -eux \
9494
\
9595
&& su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \
9696
&& rm -rf /tempdb \
97+
&& rm -rf /tmp/logfile \
9798
&& rm -rf /tmp/pgis_reg \
9899
# add .postgis-rundeps
99100
&& apk add --no-cache --virtual .postgis-rundeps \

‎16beta2-3.4.0rc1/alpine/initdb-postgis.sh renamed to ‎16beta3-3.4.0rc2/alpine/initdb-postgis.sh

File renamed without changes.

‎16beta2-3.4.0rc1/alpine/update-postgis.sh renamed to ‎16beta3-3.4.0rc2/alpine/update-postgis.sh

File renamed without changes.

0 commit comments

Comments
 (0)