Skip to content

Commit 11a65d7

Browse files
ImreSamuphillipross
ImreSamu
authored and
phillipross
committed
upgrade to postgres17rc1
steps: - git mv 17beta3-master 17rc1-master - git mv 17beta3-3.5.0alpha2 17rc1-3.5.0alpha2 - run: ./update.sh - .github/workflows/main.yml: replace 17beta3 to 17rc1 - README.md : updated test image info
1 parent 979f475 commit 11a65d7

File tree

11 files changed

+46
-46
lines changed

11 files changed

+46
-46
lines changed

‎.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
- postgres: 16
2626
postgis: master
2727
variant: default
28-
- postgres: 17beta3
28+
- postgres: 17rc1
2929
postgis: master
3030
variant: default
3131
- postgres: 16
3232
postgis: 3.5.0alpha2
3333
variant: alpine
34-
- postgres: 17beta3
34+
- postgres: 17rc1
3535
postgis: 3.5.0alpha2
3636
variant: alpine
3737

‎15-master/Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
92-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
91+
ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
92+
ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
125+
ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
126126
RUN set -ex \
127127
&& cd /usr/src \
128128
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
151151
\
152152
&& rm -fr /usr/src/PROJ
153153

154-
# geos - lock 3.12 branch
155-
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
154+
# geos
155+
ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
171+
ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
305-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
306-
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
307-
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
308-
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
304+
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
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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
327+
ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
328328

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

‎16-master/Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
92-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
91+
ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
92+
ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
125+
ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
126126
RUN set -ex \
127127
&& cd /usr/src \
128128
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
151151
\
152152
&& rm -fr /usr/src/PROJ
153153

154-
# geos - lock 3.12 branch
155-
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
154+
# geos
155+
ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
171+
ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
305-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
306-
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
307-
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
308-
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
304+
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
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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
327+
ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
328328

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

‎17beta3-3.5.0alpha2/Dockerfile renamed to ‎17rc1-3.5.0alpha2/Dockerfile

File renamed without changes.

‎17beta3-3.5.0alpha2/alpine/Dockerfile renamed to ‎17rc1-3.5.0alpha2/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:17beta3-alpine3.20
4+
ARG BASE_IMAGE=postgres:17rc1-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 17beta3 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.5.0alpha2 spatial database extension with PostgreSQL 17rc1 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_VERSION 3.5.0alpha2

‎17beta3-3.5.0alpha2/alpine/initdb-postgis.sh renamed to ‎17rc1-3.5.0alpha2/alpine/initdb-postgis.sh

File renamed without changes.

‎17beta3-3.5.0alpha2/alpine/update-postgis.sh renamed to ‎17rc1-3.5.0alpha2/alpine/update-postgis.sh

File renamed without changes.

‎17beta3-master/Dockerfile renamed to ‎17rc1-master/Dockerfile

+15-15
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:17beta3-bullseye as builder
10+
FROM postgres:17rc1-bullseye as builder
1111

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

1616
WORKDIR /
@@ -88,8 +88,8 @@ 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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
92-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
91+
ENV CGAL5X_GIT_HASH f1af52edeb741a05f86d959984ed943f25f5fcd4
92+
ENV SFCGAL_GIT_HASH 3a493846b779ded5ac87b8a7b37e8c119d4208c2
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 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
125+
ENV PROJ_GIT_HASH 0a407325fbb5bf42407a7dc5d4f948be9707e302
126126
RUN set -ex \
127127
&& cd /usr/src \
128128
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -151,8 +151,8 @@ RUN set -ex \
151151
\
152152
&& rm -fr /usr/src/PROJ
153153

154-
# geos - lock 3.12 branch
155-
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
154+
# geos
155+
ENV GEOS_GIT_HASH 701c868fa9ad8e82a3aa43f0bd19ec2003722f45
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 27a73be049c244ff3483d05a1a2a5b9779f30d2e
171+
ENV GDAL_GIT_HASH 6a5ab0e588d17b8cc9ee16c212407c0bd3f05a9b
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:17beta3-bullseye
255+
FROM postgres:17rc1-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 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
305-
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
306-
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
307-
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
308-
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
304+
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
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 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1
327+
ENV POSTGIS_GIT_HASH 8349e1670aa4f273dd68813813a1a37b59c12a8c
328328

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

‎17beta3-master/initdb-postgis.sh renamed to ‎17rc1-master/initdb-postgis.sh

File renamed without changes.

‎17beta3-master/update-postgis.sh renamed to ‎17rc1-master/update-postgis.sh

File renamed without changes.

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This image ensures that the default database created by the parent `postgres` im
1818

1919
Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
2020

21-
# Versions (2024-08-20)
21+
# Versions (2024-09-14)
2222

2323
Supported architecture: `amd64` (also known as X86-64)"
2424

@@ -65,8 +65,8 @@ Recommended version for new users: `postgis/postgis:16-3.4`
6565
| [postgis/postgis:15-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/Dockerfile) | debian:bullseye | 15 | development: postgis, geos, proj, gdal |
6666
| [postgis/postgis:16-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 16 | 3.5.0alpha2 |
6767
| [postgis/postgis:16-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-master/Dockerfile) | debian:bullseye | 16 | development: postgis, geos, proj, gdal |
68-
| [postgis/postgis:17beta3-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17beta3 | 3.5.0alpha2 |
69-
| [postgis/postgis:17beta3-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-master/Dockerfile) | debian:bullseye | 17beta3 | development: postgis, geos, proj, gdal |
68+
| [postgis/postgis:17rc1-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17rc1-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17rc1-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17rc1 | 3.5.0alpha2 |
69+
| [postgis/postgis:17rc1-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17rc1-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17rc1-master/Dockerfile) | debian:bullseye | 17rc1 | development: postgis, geos, proj, gdal |
7070

7171
## Usage
7272

0 commit comments

Comments
 (0)