Skip to content

Commit

Permalink
Postgres 16beta3, Postgis 3.4.0rc2 update (#354)
Browse files Browse the repository at this point in the history 
* Postgres 16beta3, Postgis 3.4.0rc2 update

Other Changes
- alpine, master regression testing improvements

* update workflow
  • Loading branch information
@ImreSamu
ImreSamu authored Aug 13, 2023
1 parent cca48f8 commit 734a176
Show file tree
Hide file tree
Showing 28 changed files with 72 additions and 59 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
make-docker-images:
strategy:
matrix:
postgres: [11, 12, 13, 14, 15, 16beta2]
postgres: [11, 12, 13, 14, 15, 16beta3]
postgis: ['3.3']
variant: [default, alpine]
include:
Expand All @@ -25,14 +25,14 @@ jobs:
- postgres: 15
postgis: master
variant: default
- postgres: 16beta2
- postgres: 16beta3
postgis: master
variant: default
- postgres: 15
postgis: 3.4.0rc1
postgis: 3.4.0rc2
variant: alpine
- postgres: 16beta2
postgis: 3.4.0rc1
- postgres: 16beta3
postgis: 3.4.0rc2
variant: alpine

name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
Expand Down
3 changes: 2 additions & 1 deletion 11-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 12-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 13-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 14-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
17 changes: 9 additions & 8 deletions 14-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 / \
Expand Down
3 changes: 2 additions & 1 deletion 15-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
0 15-3.4.0rc1/Dockerfile → 15-3.4.0rc2/Dockerfile
View file
File renamed without changes.
9 changes: 5 additions & 4 deletions 15-3.4.0rc1/alpine/Dockerfile → 15-3.4.0rc2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
0 15-3.4.0rc1/alpine/initdb-postgis.sh → 15-3.4.0rc2/alpine/initdb-postgis.sh
View file
File renamed without changes.
0 15-3.4.0rc1/alpine/update-postgis.sh → 15-3.4.0rc2/alpine/update-postgis.sh
View file
File renamed without changes.
17 changes: 9 additions & 8 deletions 15-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 / \
Expand Down
4 changes: 2 additions & 2 deletions 16beta2-3.3/Dockerfile → 16beta3-3.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions 16beta2-3.3/alpine/Dockerfile → 16beta3-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
0 16beta2-3.3/alpine/initdb-postgis.sh → 16beta3-3.3/alpine/initdb-postgis.sh
View file
File renamed without changes.
0 16beta2-3.3/alpine/update-postgis.sh → 16beta3-3.3/alpine/update-postgis.sh
View file
File renamed without changes.
0 16beta2-3.3/initdb-postgis.sh → 16beta3-3.3/initdb-postgis.sh
View file
File renamed without changes.
0 16beta2-3.3/update-postgis.sh → 16beta3-3.3/update-postgis.sh
View file
File renamed without changes.
0 16beta2-3.4.0rc1/Dockerfile → 16beta3-3.4.0rc2/Dockerfile
View file
File renamed without changes.
11 changes: 6 additions & 5 deletions 16beta2-3.4.0rc1/alpine/Dockerfile → 16beta3-3.4.0rc2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
0 16beta2-3.4.0rc1/alpine/initdb-postgis.sh → 16beta3-3.4.0rc2/alpine/initdb-postgis.sh
View file
File renamed without changes.
0 16beta2-3.4.0rc1/alpine/update-postgis.sh → 16beta3-3.4.0rc2/alpine/update-postgis.sh
View file
File renamed without changes.
Loading

0 comments on commit 734a176

Please sign in to comment.