Skip to content

Commit c8f7932

Browse files
ImreSamuImreSamu
authored
upgrade to PostGIS 3.4 (#355)
* upgrade to PostGIS 3.4 * update LATEST_VERSION to 15-3.4 * add more clarity about 11-3.3 version in the README
1 parent 734a176 commit c8f7932

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+71
-430
lines changed

‎.github/workflows/main.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [11, 12, 13, 14, 15, 16beta3]
19-
postgis: ['3.3']
18+
postgres: [12, 13, 14, 15, 16beta3]
19+
postgis: ['3.4']
2020
variant: [default, alpine]
2121
include:
2222
- postgres: 14
@@ -28,11 +28,11 @@ jobs:
2828
- postgres: 16beta3
2929
postgis: master
3030
variant: default
31-
- postgres: 15
32-
postgis: 3.4.0rc2
33-
variant: alpine
34-
- postgres: 16beta3
35-
postgis: 3.4.0rc2
31+
- postgres: 11
32+
postgis: 3.3
33+
variant: default
34+
- postgres: 11
35+
postgis: 3.3
3636
variant: alpine
3737

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

‎12-3.3/Dockerfile renamed to ‎12-3.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM postgres:12-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 12 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR 3
12-
ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
1313

1414
RUN apt-get update \
1515
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎12-3.3/alpine/Dockerfile renamed to ‎12-3.4/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:12-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 12 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 12 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.3.4
12-
ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
11+
ENV POSTGIS_VERSION 3.4.0
12+
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \

‎12-3.3/alpine/initdb-postgis.sh renamed to ‎12-3.4/alpine/initdb-postgis.sh

File renamed without changes.

‎12-3.3/alpine/update-postgis.sh renamed to ‎12-3.4/alpine/update-postgis.sh

File renamed without changes.

‎12-3.3/initdb-postgis.sh renamed to ‎12-3.4/initdb-postgis.sh

File renamed without changes.

‎12-3.3/update-postgis.sh renamed to ‎12-3.4/update-postgis.sh

File renamed without changes.

‎13-3.3/Dockerfile renamed to ‎13-3.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM postgres:13-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 13 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR 3
12-
ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
1313

1414
RUN apt-get update \
1515
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎13-3.3/alpine/Dockerfile renamed to ‎13-3.4/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:13-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 13 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 13 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.3.4
12-
ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
11+
ENV POSTGIS_VERSION 3.4.0
12+
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \

‎13-3.3/alpine/initdb-postgis.sh renamed to ‎13-3.4/alpine/initdb-postgis.sh

File renamed without changes.

‎13-3.3/alpine/update-postgis.sh renamed to ‎13-3.4/alpine/update-postgis.sh

File renamed without changes.

‎13-3.3/initdb-postgis.sh renamed to ‎13-3.4/initdb-postgis.sh

File renamed without changes.

‎13-3.3/update-postgis.sh renamed to ‎13-3.4/update-postgis.sh

File renamed without changes.

‎14-3.3/Dockerfile renamed to ‎14-3.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM postgres:14-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 14 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR 3
12-
ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
1313

1414
RUN apt-get update \
1515
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎14-3.3/alpine/Dockerfile renamed to ‎14-3.4/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:14-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 14 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 14 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.3.4
12-
ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
11+
ENV POSTGIS_VERSION 3.4.0
12+
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \

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

File renamed without changes.

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

File renamed without changes.

‎14-3.3/initdb-postgis.sh renamed to ‎14-3.4/initdb-postgis.sh

File renamed without changes.

‎14-3.3/update-postgis.sh renamed to ‎14-3.4/update-postgis.sh

File renamed without changes.

‎14-master/Dockerfile

+7-7
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 edf855967dd10dff04318b0cdde980f397194565
91+
ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
9292
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
9393
RUN set -ex \
9494
&& mkdir -p /usr/src \
@@ -152,7 +152,7 @@ RUN set -ex \
152152
&& rm -fr /usr/src/PROJ
153153

154154
# geos
155-
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
155+
ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
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 949ac934a6518f0e4fe60ca55827ec5e9d29d755
171+
ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
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 edf855967dd10dff04318b0cdde980f397194565
304+
ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306306
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
307-
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
308-
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
307+
ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
308+
ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
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 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
327+
ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d
328328

329329
RUN set -ex \
330330
&& apt-get update \

‎15-3.4.0rc2/Dockerfile

-3
This file was deleted.

‎15-3.4.0rc2/alpine/Dockerfile

-124
This file was deleted.

‎15-3.3/Dockerfile renamed to ‎15-3.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM postgres:15-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 15 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR 3
12-
ENV POSTGIS_VERSION 3.3.4+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
1313

1414
RUN apt-get update \
1515
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎15-3.3/alpine/Dockerfile renamed to ‎15-3.4/alpine/Dockerfile

+3-3
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.3.4 spatial database extension with PostgreSQL 15 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.0 spatial database extension with PostgreSQL 15 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

11-
ENV POSTGIS_VERSION 3.3.4
12-
ENV POSTGIS_SHA256 68507aa4ab7f9f7218fcefdcdd989911415e5f670128eb33acbbb362a24a998e
11+
ENV POSTGIS_VERSION 3.4.0
12+
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
1313

1414
RUN set -eux \
1515
&& apk add --no-cache --virtual .fetch-deps \

‎15-3.3/alpine/initdb-postgis.sh renamed to ‎15-3.4/alpine/initdb-postgis.sh

File renamed without changes.

‎15-3.3/alpine/update-postgis.sh renamed to ‎15-3.4/alpine/update-postgis.sh

File renamed without changes.

‎15-3.3/initdb-postgis.sh renamed to ‎15-3.4/initdb-postgis.sh

File renamed without changes.

‎15-3.3/update-postgis.sh renamed to ‎15-3.4/update-postgis.sh

File renamed without changes.

‎15-master/Dockerfile

+7-7
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 edf855967dd10dff04318b0cdde980f397194565
91+
ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
9292
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
9393
RUN set -ex \
9494
&& mkdir -p /usr/src \
@@ -152,7 +152,7 @@ RUN set -ex \
152152
&& rm -fr /usr/src/PROJ
153153

154154
# geos
155-
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
155+
ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
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 949ac934a6518f0e4fe60ca55827ec5e9d29d755
171+
ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
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 edf855967dd10dff04318b0cdde980f397194565
304+
ENV CGAL5X_GIT_HASH d0b188bf41704a155c9ad72fd7635f7a709764e5
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306306
ENV PROJ_GIT_HASH c5c7e64b8a9b1416db7fcb129decc038439b96ec
307-
ENV GEOS_GIT_HASH feaa331749598866ffc47c3f2bef828eaa4eff8f
308-
ENV GDAL_GIT_HASH 949ac934a6518f0e4fe60ca55827ec5e9d29d755
307+
ENV GEOS_GIT_HASH 40da3a61338068549eabe19f68d1cf082cece853
308+
ENV GDAL_GIT_HASH 4dcb8efd45813320f8661c71da5e54c5da55edc4
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 7faeed1d4800fb9a46dc7143eebd7c785ec3fa7e
327+
ENV POSTGIS_GIT_HASH 6f6839a334a188edfc5a437ecc689621ee6c440d
328328

329329
RUN set -ex \
330330
&& apt-get update \

0 commit comments

Comments
 (0)