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
postgis · Sep 17, 2023 · 98bbfd0 · 98bbfd0
1 parent 36375f7
commit 98bbfd0
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 548 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,17 +15,14 @@ jobs:
   make-docker-images:
     strategy:
       matrix:
-        postgres: [12, 13, 14, 15, 16rc1]
+        postgres: [12, 13, 14, 15, 16]
         postgis: ['3.4']
         variant: [default, alpine]
         include:
-          - postgres: 14
-            postgis: master
-            variant: default
           - postgres: 15
             postgis: master
             variant: default
-          - postgres: 16rc1
+          - postgres: 16
             postgis: master
             variant: default
           - postgres: 11

diff --git a/15-master/Dockerfile b/15-master/Dockerfile
@@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # one can benefit from the latest CGAL patches while avoiding compatibility issues.
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
 ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
 RUN set -ex \
     && mkdir -p /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
+ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
 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 15185e65b3e7bc671cf693c97cf103125fb4a171
+ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
 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 7dec7e98b6be558ef76e1c17262994610a532573
+ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
 ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
-ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
-ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
-ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
+ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
+ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
+ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
 
 # 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 cc7a8ca0871ae2114e920aa7472c639ec80abe7d
+ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892
 
 RUN set -ex \
     && apt-get update \
@@ -336,6 +336,8 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
+      docbook-xml \
+      docbook5-xml \
       g++ \
       git \
       libboost-all-dev \
@@ -350,6 +352,7 @@ RUN set -ex \
       libtiff-dev \
       libtool \
       libxml2-dev \
+      libxml2-utils \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \
@@ -409,6 +412,8 @@ RUN set -ex \
       bison \
       build-essential \
       cmake \
+      docbook-xml \
+      docbook5-xml \
       g++ \
       git \
       libboost-all-dev \
@@ -422,6 +427,7 @@ RUN set -ex \
       libtiff-dev \
       libtool \
       libxml2-dev \
+      libxml2-utils \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \

diff --git a/16rc1-3.4/Dockerfile → 16-3.4/Dockerfile b/16rc1-3.4/Dockerfile → 16-3.4/Dockerfile
@@ -2,10 +2,10 @@
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM postgres:16rc1-bullseye
+FROM postgres:16-bullseye
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16rc1 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR 3

diff --git a/16rc1-3.4/alpine/Dockerfile → 16-3.4/alpine/Dockerfile b/16rc1-3.4/alpine/Dockerfile → 16-3.4/alpine/Dockerfile
@@ -1,11 +1,11 @@
 #
 # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
 #
-ARG BASE_IMAGE=postgres:16rc1-alpine3.18
+ARG BASE_IMAGE=postgres:16-alpine3.18
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16rc1 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 16 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_VERSION 3.4.0

diff --git a/14-master/initdb-postgis.sh → 16-3.4/alpine/initdb-postgis.sh b/14-master/initdb-postgis.sh → 16-3.4/alpine/initdb-postgis.sh
diff --git a/14-master/update-postgis.sh → 16-3.4/alpine/update-postgis.sh b/14-master/update-postgis.sh → 16-3.4/alpine/update-postgis.sh
diff --git a/16rc1-3.4/alpine/initdb-postgis.sh → 16-3.4/initdb-postgis.sh b/16rc1-3.4/alpine/initdb-postgis.sh → 16-3.4/initdb-postgis.sh
diff --git a/16rc1-3.4/alpine/update-postgis.sh → 16-3.4/update-postgis.sh b/16rc1-3.4/alpine/update-postgis.sh → 16-3.4/update-postgis.sh
diff --git a/14-master/Dockerfile → 16-master/Dockerfile b/14-master/Dockerfile → 16-master/Dockerfile
@@ -7,10 +7,10 @@
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
 ARG CGAL_GIT_BRANCH=5.6.x-branch
-FROM postgres:14-bullseye as builder
+FROM postgres:16-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 14 bullseye" \
+      org.opencontainers.image.description="PostGIS - master  spatial database extension with PostgreSQL 16 bullseye" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 WORKDIR /
@@ -88,7 +88,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 # one can benefit from the latest CGAL patches while avoiding compatibility issues.
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
 ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
 RUN set -ex \
     && mkdir -p /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
+ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
 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 15185e65b3e7bc671cf693c97cf103125fb4a171
+ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
 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 7dec7e98b6be558ef76e1c17262994610a532573
+ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
 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:14-bullseye
+FROM postgres:16-bullseye
 
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
@@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL5X_GIT_HASH 9c9a2690fb4916c249342f3c2dcd08ccd99b7ac8
+ENV CGAL5X_GIT_HASH 3c8e2053721271119499506ea1d8a49dee89e30c
 ENV SFCGAL_GIT_HASH fc4dc5640e402c8b00426b5a3562324226725df9
-ENV PROJ_GIT_HASH 4a14240a606e5d2ba091a922f52cd3f38dba258c
-ENV GEOS_GIT_HASH 15185e65b3e7bc671cf693c97cf103125fb4a171
-ENV GDAL_GIT_HASH 7dec7e98b6be558ef76e1c17262994610a532573
+ENV PROJ_GIT_HASH d4ebd920c1e1ecd0e192790ab4fdb98c7b982176
+ENV GEOS_GIT_HASH 1033161eca3684e0d9479daeafd35a4e0fb1800e
+ENV GDAL_GIT_HASH 43e51bc48e7d48795ae60731ddc1414611ec5d3e
 
 # 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 cc7a8ca0871ae2114e920aa7472c639ec80abe7d
+ENV POSTGIS_GIT_HASH d7b58458ea7cf8157d09f59e955820d3a4321892
 
 RUN set -ex \
     && apt-get update \
@@ -336,6 +336,8 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
+      docbook-xml \
+      docbook5-xml \
       g++ \
       git \
       libboost-all-dev \
@@ -350,6 +352,7 @@ RUN set -ex \
       libtiff-dev \
       libtool \
       libxml2-dev \
+      libxml2-utils \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \
@@ -409,6 +412,8 @@ RUN set -ex \
       bison \
       build-essential \
       cmake \
+      docbook-xml \
+      docbook5-xml \
       g++ \
       git \
       libboost-all-dev \
@@ -422,6 +427,7 @@ RUN set -ex \
       libtiff-dev \
       libtool \
       libxml2-dev \
+      libxml2-utils \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \

diff --git a/16rc1-3.4/initdb-postgis.sh → 16-master/initdb-postgis.sh b/16rc1-3.4/initdb-postgis.sh → 16-master/initdb-postgis.sh
diff --git a/16rc1-3.4/update-postgis.sh → 16-master/update-postgis.sh b/16rc1-3.4/update-postgis.sh → 16-master/update-postgis.sh