Skip to content

Commit 98bbfd0

Browse files
ImreSamuImreSamu
authored
upgrade to pg16 (#359)
* upgrade to pg16 remove 14-master * Revert master to stable commit from 4 days ago * revert master to "Commits on Sep 9, 2023" to avoid build error * add docbook5-xml, docbook-xml, libxml2-utils to the master build environment
1 parent 36375f7 commit 98bbfd0

17 files changed

+53
-548
lines changed

‎.github/workflows/main.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [12, 13, 14, 15, 16rc1]
18+
postgres: [12, 13, 14, 15, 16]
1919
postgis: ['3.4']
2020
variant: [default, alpine]
2121
include:
22-
- postgres: 14
23-
postgis: master
24-
variant: default
2522
- postgres: 15
2623
postgis: master
2724
variant: default
28-
- postgres: 16rc1
25+
- postgres: 16
2926
postgis: master
3027
variant: default
3128
- postgres: 11

‎15-master/Dockerfile

+15-9
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8888
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
8989
ARG CGAL_GIT_BRANCH
9090
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
91-
ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
91+
ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
9292
ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
9393
RUN set -ex \
9494
&& mkdir -p /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
122122
&& rm -fr /usr/src/cgal
123123

124124
# proj
125-
ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
125+
ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
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 15185e65b3e7bc671cf693c97cf103125fb4a171
155+
ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
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 7dec7e98b6be558ef76e1c17262994610a532573
171+
ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
172172
RUN set -ex \
173173
&& cd /usr/src \
174174
&& git clone https://github.com/OSGeo/gdal.git \
@@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local
301301

302302
ARG CGAL_GIT_BRANCH
303303
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
304-
ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
304+
ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
305305
ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
306-
ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
307-
ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
308-
ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
306+
ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
307+
ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
308+
ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
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 cc7a8ca0871ae2114e920aa7472c639ec80abe7d
327+
ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892
328328

329329
RUN set -ex \
330330
&& apt-get update \
@@ -336,6 +336,8 @@ RUN set -ex \
336336
build-essential \
337337
ca-certificates \
338338
cmake \
339+
docbook-xml \
340+
docbook5-xml \
339341
g++ \
340342
git \
341343
libboost-all-dev \
@@ -350,6 +352,7 @@ RUN set -ex \
350352
libtiff-dev \
351353
libtool \
352354
libxml2-dev \
355+
libxml2-utils \
353356
make \
354357
pkg-config \
355358
postgresql-server-dev-$PG_MAJOR \
@@ -409,6 +412,8 @@ RUN set -ex \
409412
bison \
410413
build-essential \
411414
cmake \
415+
docbook-xml \
416+
docbook5-xml \
412417
g++ \
413418
git \
414419
libboost-all-dev \
@@ -422,6 +427,7 @@ RUN set -ex \
422427
libtiff-dev \
423428
libtool \
424429
libxml2-dev \
430+
libxml2-utils \
425431
make \
426432
pkg-config \
427433
postgresql-server-dev-$PG_MAJOR \

‎16rc1-3.4/Dockerfile renamed to ‎16-3.4/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:16rc1-bullseye
5+
FROM postgres:16-bullseye
66

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

1111
ENV POSTGIS_MAJOR 3

‎16rc1-3.4/alpine/Dockerfile renamed to ‎16-3.4/alpine/Dockerfile

+2-2
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:16rc1-alpine3.18
4+
ARG BASE_IMAGE=postgres:16-alpine3.18
55
FROM ${BASE_IMAGE}
66

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

1111
ENV POSTGIS_VERSION 3.4.0

‎14-master/initdb-postgis.sh renamed to ‎16-3.4/alpine/initdb-postgis.sh

File renamed without changes.

‎14-master/update-postgis.sh renamed to ‎16-3.4/alpine/update-postgis.sh

File renamed without changes.

‎16rc1-3.4/alpine/initdb-postgis.sh renamed to ‎16-3.4/initdb-postgis.sh

File renamed without changes.

‎16rc1-3.4/alpine/update-postgis.sh renamed to ‎16-3.4/update-postgis.sh

File renamed without changes.

‎14-master/Dockerfile renamed to ‎16-master/Dockerfile

+18-12
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
ARG DOCKER_CMAKE_BUILD_TYPE=Release
99
ARG CGAL_GIT_BRANCH=5.6.x-branch
10-
FROM postgres:14-bullseye as builder
10+
FROM postgres:16-bullseye as builder
1111

1212
LABEL maintainer="PostGIS Project - https://postgis.net" \
13-
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 14 bullseye" \
13+
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16 bullseye" \
1414
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1515

1616
WORKDIR /
@@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8888
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
8989
ARG CGAL_GIT_BRANCH
9090
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
91-
ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
91+
ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
9292
ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
9393
RUN set -ex \
9494
&& mkdir -p /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
122122
&& rm -fr /usr/src/cgal
123123

124124
# proj
125-
ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
125+
ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
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 15185e65b3e7bc671cf693c97cf103125fb4a171
155+
ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
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 7dec7e98b6be558ef76e1c17262994610a532573
171+
ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
172172
RUN set -ex \
173173
&& cd /usr/src \
174174
&& git clone https://github.com/OSGeo/gdal.git \
@@ -252,7 +252,7 @@ RUN set -ex \
252252
# -------------------------------------------
253253
# STAGE final
254254
# -------------------------------------------
255-
FROM postgres:14-bullseye
255+
FROM postgres:16-bullseye
256256

257257
ARG DOCKER_CMAKE_BUILD_TYPE
258258
ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
@@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local
301301

302302
ARG CGAL_GIT_BRANCH
303303
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
304-
ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
304+
ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
305305
ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
306-
ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
307-
ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
308-
ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
306+
ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
307+
ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
308+
ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
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 cc7a8ca0871ae2114e920aa7472c639ec80abe7d
327+
ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892
328328

329329
RUN set -ex \
330330
&& apt-get update \
@@ -336,6 +336,8 @@ RUN set -ex \
336336
build-essential \
337337
ca-certificates \
338338
cmake \
339+
docbook-xml \
340+
docbook5-xml \
339341
g++ \
340342
git \
341343
libboost-all-dev \
@@ -350,6 +352,7 @@ RUN set -ex \
350352
libtiff-dev \
351353
libtool \
352354
libxml2-dev \
355+
libxml2-utils \
353356
make \
354357
pkg-config \
355358
postgresql-server-dev-$PG_MAJOR \
@@ -409,6 +412,8 @@ RUN set -ex \
409412
bison \
410413
build-essential \
411414
cmake \
415+
docbook-xml \
416+
docbook5-xml \
412417
g++ \
413418
git \
414419
libboost-all-dev \
@@ -422,6 +427,7 @@ RUN set -ex \
422427
libtiff-dev \
423428
libtool \
424429
libxml2-dev \
430+
libxml2-utils \
425431
make \
426432
pkg-config \
427433
postgresql-server-dev-$PG_MAJOR \

‎16rc1-3.4/initdb-postgis.sh renamed to ‎16-master/initdb-postgis.sh

File renamed without changes.

‎16rc1-3.4/update-postgis.sh renamed to ‎16-master/update-postgis.sh

File renamed without changes.

0 commit comments

Comments
 (0)