Skip to content

Commit 46c5548

Browse files
ImreSamuphillipross
authored andcommitted
Postgres 17, PostGIS 3.4.3 and 3.5.0, and other updates
- Improved `./update.sh`: Backported full PostGIS version detection for Alpine, used when no Debian version is available (from https://github.com/ImreSamu/docker-postgis/blob/master/update.sh). Now, `16-3.5/alpine` and `17-3.5/alpine` are automatically set up. - Removed: 15-master and added : 17-master - Updated: 17rc1 -> 17 - Updated postgis 3.4.2 -> 3.4.3 - New: 16-3.5 , 17-3.5 (only Alpine version, as no Debian PostGIS 3.5 package exists yet) - Used the ./update.sh to update Dockerfiles from the template - Updated README.md with alpine, debian, master matrix - Small manual fixes in README.md important: "Recommended versions for new users are: postgis/postgis:17-3.4, postgis/postgis:16-3.4 " ( until PostgreSQL 17.1 ) - Manually updated: ./github/workflows/main.yml
1 parent 121ba84 commit 46c5548

32 files changed

+369
-546
lines changed

.github/workflows/main.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,21 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [12, 13, 14, 15, 16]
18+
postgres: [12, 13, 14, 15, 16, 17]
1919
postgis: ['3.4']
2020
variant: [default, alpine]
2121
include:
22-
- postgres: 15
23-
postgis: master
24-
variant: default
2522
- postgres: 16
2623
postgis: master
2724
variant: default
28-
- postgres: 17rc1
25+
- postgres: 17
2926
postgis: master
3027
variant: default
3128
- postgres: 16
32-
postgis: 3.5.0alpha2
29+
postgis: 3.5
3330
variant: alpine
34-
- postgres: 17rc1
35-
postgis: 3.5.0alpha2
31+
- postgres: 17
32+
postgis: 3.5
3633
variant: alpine
3734

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

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.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.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.4.2+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
1313

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

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.20
55
FROM ${BASE_IMAGE}
66

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

11-
ENV POSTGIS_VERSION 3.4.2
12-
ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

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.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.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.4.2+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
1313

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

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.20
55
FROM ${BASE_IMAGE}
66

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

11-
ENV POSTGIS_VERSION 3.4.2
12-
ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

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.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.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.4.2+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
1313

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

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.20
55
FROM ${BASE_IMAGE}
66

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

11-
ENV POSTGIS_VERSION 3.4.2
12-
ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

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.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.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.4.2+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
1313

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

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.20
55
FROM ${BASE_IMAGE}
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.4.2 spatial database extension with PostgreSQL 15 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.4.3 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.2
12-
ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

16-3.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM postgres:16-bullseye
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.4.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.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
12-
ENV POSTGIS_VERSION 3.4.2+dfsg-1.pgdg110+1
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
1313

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

16-3.4/alpine/Dockerfile

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

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

11-
ENV POSTGIS_VERSION 3.4.2
12-
ENV POSTGIS_SHA256 17aa8760a5c4fcb9a1fdc750c1c9aca0198a35dd1e320628064c43f178eefed2
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

16-3.5.0alpha2/alpine/Dockerfile renamed to 16-3.5/alpine/Dockerfile

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

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

11-
ENV POSTGIS_VERSION 3.5.0alpha2
12-
ENV POSTGIS_SHA256 27c69b0f3d0a1329897060fb5e8345162d960f30b95f8903e98356fb3236427f
11+
ENV POSTGIS_VERSION 3.5.0
12+
ENV POSTGIS_SHA256 a47b8415ab88437390eba28e51b993cf0a2357057c277eea00378b8b76ab2316
1313

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

16-master/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8989
ARG CGAL_GIT_BRANCH
9090
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
9191
ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
92-
ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
92+
ENV SFCGAL_GIT_HASH 88ec10481fc51efb4d232fd2f45bb556120a6f4c
9393
RUN set -ex \
9494
&& mkdir -p /usr/src \
9595
&& cd /usr/src \
@@ -122,7 +122,7 @@ RUN set -ex \
122122
&& rm -fr /usr/src/cgal
123123

124124
# proj
125-
ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
125+
ENV PROJ_GIT_HASH d19ab643b9825bf4de5ff336e228b9abc06e2991
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 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
155+
ENV GEOS_GIT_HASH e142764b77f4b8d0c36ec88406300c5f876743fb
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 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
171+
ENV GDAL_GIT_HASH 91bfec36a4dc03cfba554e6197a83099d9ec122a
172172
RUN set -ex \
173173
&& cd /usr/src \
174174
&& git clone https://github.com/OSGeo/gdal.git \
@@ -302,10 +302,10 @@ COPY --from=builder /usr/local /usr/local
302302
ARG CGAL_GIT_BRANCH
303303
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
304304
ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
305-
ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
306-
ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
307-
ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
308-
ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
305+
ENV SFCGAL_GIT_HASH 88ec10481fc51efb4d232fd2f45bb556120a6f4c
306+
ENV PROJ_GIT_HASH d19ab643b9825bf4de5ff336e228b9abc06e2991
307+
ENV GEOS_GIT_HASH e142764b77f4b8d0c36ec88406300c5f876743fb
308+
ENV GDAL_GIT_HASH 91bfec36a4dc03cfba554e6197a83099d9ec122a
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 8349e1670aa4f273dd68813813a1a37b59c12a8c
327+
ENV POSTGIS_GIT_HASH b28f00c3efd772460714cb9db30b0dc9a0ff27fd
328328

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

17-3.4/Dockerfile

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
5+
FROM postgres:17-bullseye
6+
7+
LABEL maintainer="PostGIS Project - https://postgis.net" \
8+
org.opencontainers.image.description="PostGIS 3.4.3+dfsg-2.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \
9+
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
10+
11+
ENV POSTGIS_MAJOR 3
12+
ENV POSTGIS_VERSION 3.4.3+dfsg-2.pgdg110+1
13+
14+
RUN apt-get update \
15+
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
16+
&& apt-get install -y --no-install-recommends \
17+
# ca-certificates: for accessing remote raster files;
18+
# fix: https://github.com/postgis/docker-postgis/issues/307
19+
ca-certificates \
20+
\
21+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
22+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
23+
&& rm -rf /var/lib/apt/lists/*
24+
25+
RUN mkdir -p /docker-entrypoint-initdb.d
26+
COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
27+
COPY ./update-postgis.sh /usr/local/bin
28+

17rc1-3.5.0alpha2/alpine/Dockerfile renamed to 17-3.4/alpine/Dockerfile

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

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

11-
ENV POSTGIS_VERSION 3.5.0alpha2
12-
ENV POSTGIS_SHA256 27c69b0f3d0a1329897060fb5e8345162d960f30b95f8903e98356fb3236427f
11+
ENV POSTGIS_VERSION 3.4.3
12+
ENV POSTGIS_SHA256 802e1626252d12ec1d29261b95bf62930e1859587e44cad28d65b897a8d9ee6b
1313

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

0 commit comments

Comments
 (0)