Skip to content

Commit baa1c86

Browse files
ImreSamuImreSamu
authored
update to 16beta2 + make update (#350)
Changes to be committed: modified: .github/workflows/main.yml modified: 14-master/Dockerfile modified: 15-master/Dockerfile renamed: 16beta1-3.3.3/Dockerfile -> 16beta2-3.3.3/Dockerfile renamed: 16beta1-3.3.3/alpine/Dockerfile -> 16beta2-3.3.3/alpine/Dockerfile renamed: 16beta1-3.3.3/alpine/initdb-postgis.sh -> 16beta2-3.3.3/alpine/initdb-postgis.sh renamed: 16beta1-3.3.3/alpine/update-postgis.sh -> 16beta2-3.3.3/alpine/update-postgis.sh renamed: 16beta1-master/Dockerfile -> 16beta2-master/Dockerfile renamed: 16beta1-master/initdb-postgis.sh -> 16beta2-master/initdb-postgis.sh renamed: 16beta1-master/update-postgis.sh -> 16beta2-master/update-postgis.sh modified: README.md
1 parent 22973a5 commit baa1c86

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- postgres: 15
2626
postgis: master
2727
variant: default
28-
- postgres: 16beta1
28+
- postgres: 16beta2
2929
postgis: master
3030
variant: default
31-
- postgres: 16beta1
31+
- postgres: 16beta2
3232
postgis: 3.3.3
3333
variant: alpine
3434

‎14-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
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 ad130ba0e0603c06c2a3de887c2570b131ed206f
91+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
9292
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
125+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
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 afcb31885fb206d2e3093ead943aa320a991370a
155+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
171+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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 ad130ba0e0603c06c2a3de887c2570b131ed206f
304+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306-
ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
307-
ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
308-
ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
306+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
307+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
308+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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 e6d6be316631881e464778e958b94cda1c270348
327+
ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
328328

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

‎15-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
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 ad130ba0e0603c06c2a3de887c2570b131ed206f
91+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
9292
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
125+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
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 afcb31885fb206d2e3093ead943aa320a991370a
155+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
171+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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 ad130ba0e0603c06c2a3de887c2570b131ed206f
304+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306-
ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
307-
ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
308-
ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
306+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
307+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
308+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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 e6d6be316631881e464778e958b94cda1c270348
327+
ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
328328

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

‎16beta1-3.3.3/Dockerfile‎ renamed to ‎16beta2-3.3.3/Dockerfile‎

File renamed without changes.

‎16beta1-3.3.3/alpine/Dockerfile‎ renamed to ‎16beta2-3.3.3/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
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:16beta1-alpine3.18
4+
ARG BASE_IMAGE=postgres:16beta2-alpine3.18
55
FROM ${BASE_IMAGE}
66

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

1111
ENV POSTGIS_VERSION 3.3.3

‎16beta1-3.3.3/alpine/initdb-postgis.sh‎ renamed to ‎16beta2-3.3.3/alpine/initdb-postgis.sh‎

File renamed without changes.

‎16beta1-3.3.3/alpine/update-postgis.sh‎ renamed to ‎16beta2-3.3.3/alpine/update-postgis.sh‎

File renamed without changes.

‎16beta1-master/Dockerfile‎ renamed to ‎16beta2-master/Dockerfile‎

Lines changed: 12 additions & 12 deletions
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:16beta1-bullseye as builder
10+
FROM postgres:16beta2-bullseye as builder
1111

1212
LABEL maintainer="PostGIS Project - https://postgis.net" \
13-
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16beta1 bullseye" \
13+
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16beta2 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 ad130ba0e0603c06c2a3de887c2570b131ed206f
91+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
9292
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
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 69dea10cd6a720e5fb50f821b622ecfddf8886ac
125+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
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 afcb31885fb206d2e3093ead943aa320a991370a
155+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
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 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
171+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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:16beta1-bullseye
255+
FROM postgres:16beta2-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 ad130ba0e0603c06c2a3de887c2570b131ed206f
304+
ENV CGAL5X_GIT_HASH 9cc17545b4a80297fdbba5cc348479edea767cfb
305305
ENV SFCGAL_GIT_HASH ae0a12da1e7a32d163930789e62874ca6ff0792c
306-
ENV PROJ_GIT_HASH 69dea10cd6a720e5fb50f821b622ecfddf8886ac
307-
ENV GEOS_GIT_HASH afcb31885fb206d2e3093ead943aa320a991370a
308-
ENV GDAL_GIT_HASH 4a73dfbab5bb6f31804f1d977099eaf5aeac53c7
306+
ENV PROJ_GIT_HASH effac63ae5360e737790defa5bdc3d070d19a49b
307+
ENV GEOS_GIT_HASH 17fd3b0ffcb7dac8a79ca35b1938760f444629cd
308+
ENV GDAL_GIT_HASH f11a55b71435db4000db1665739cd65f8441cde7
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 e6d6be316631881e464778e958b94cda1c270348
327+
ENV POSTGIS_GIT_HASH 9b9a99dd0302f3a4e0b8a1c628fd00ba6f0e348d
328328

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

‎16beta1-master/initdb-postgis.sh‎ renamed to ‎16beta2-master/initdb-postgis.sh‎

File renamed without changes.

‎16beta1-master/update-postgis.sh‎ renamed to ‎16beta2-master/update-postgis.sh‎

File renamed without changes.

0 commit comments

Comments
 (0)