Skip to content

Commit c1fda75

Browse files
thomasboussekeythomasboussekey
authored
Switch from 17-3.6.0alpha1 to 17-3.6.0beta1 (#425)
1 parent 922031f commit c1fda75

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
variant: default
3838
runner-platform: 'ubuntu-24.04-arm'
3939
- postgres: 17
40-
postgis: '3.6.0alpha1'
40+
postgis: '3.6.0beta1'
4141
variant: alpine
4242
runner-platform: 'ubuntu-24.04'
4343
- postgres: 17
44-
postgis: '3.6.0alpha1'
44+
postgis: '3.6.0beta1'
4545
variant: alpine
4646
runner-platform: 'ubuntu-24.04-arm'
4747

‎16-master/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8686
# cgal & sfcgal
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
89-
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
90-
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
89+
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
90+
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
9191
RUN set -ex \
9292
&& mkdir -p /usr/src \
9393
&& cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
120120
&& rm -fr /usr/src/cgal
121121

122122
# proj
123-
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
123+
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
124124
RUN set -ex \
125125
&& cd /usr/src \
126126
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
150150
&& rm -fr /usr/src/PROJ
151151

152152
# geos
153-
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
153+
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
154154
RUN set -ex \
155155
&& cd /usr/src \
156156
&& git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
166166
&& rm -fr /usr/src/geos
167167

168168
# gdal
169-
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
169+
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
299299

300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302-
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
303-
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
304-
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
305-
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
306-
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
302+
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
303+
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
304+
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
305+
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
306+
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
307307

308308
# Minimal command line test ( fail fast )
309309
RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
322322
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
323323

324324
# install postgis
325-
ENV POSTGIS_GIT_HASH 60b0e880d24ffcdf2d17ab22bc8109549f69fd16
325+
ENV POSTGIS_GIT_HASH 7c8cfe07df65efa1c5a715ad69fbdec06413ed2f
326326

327327
RUN set -ex \
328328
&& apt-get update \

‎17-3.6.0alpha1/Dockerfile‎ renamed to ‎17-3.6.0beta1/Dockerfile‎

File renamed without changes.

‎17-3.6.0alpha1/alpine/Dockerfile‎ renamed to ‎17-3.6.0beta1/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:17-alpine3.22
55
FROM ${BASE_IMAGE}
66

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

11-
ENV POSTGIS_VERSION 3.6.0alpha1
12-
ENV POSTGIS_SHA256 9f1981716001afff2e4ec75e4107cb64e8d3d9d26ad2abf573444038db0830eb
11+
ENV POSTGIS_VERSION 3.6.0beta1
12+
ENV POSTGIS_SHA256 fb38afeae97455202b81312245a82809a16787ee379e5e497ce813fa2c878ade
1313

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

‎17-3.6.0alpha1/alpine/initdb-postgis.sh‎ renamed to ‎17-3.6.0beta1/alpine/initdb-postgis.sh‎

File renamed without changes.

‎17-3.6.0alpha1/alpine/update-postgis.sh‎ renamed to ‎17-3.6.0beta1/alpine/update-postgis.sh‎

File renamed without changes.

‎17-master/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8686
# cgal & sfcgal
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
89-
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
90-
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
89+
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
90+
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
9191
RUN set -ex \
9292
&& mkdir -p /usr/src \
9393
&& cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
120120
&& rm -fr /usr/src/cgal
121121

122122
# proj
123-
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
123+
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
124124
RUN set -ex \
125125
&& cd /usr/src \
126126
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
150150
&& rm -fr /usr/src/PROJ
151151

152152
# geos
153-
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
153+
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
154154
RUN set -ex \
155155
&& cd /usr/src \
156156
&& git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
166166
&& rm -fr /usr/src/geos
167167

168168
# gdal
169-
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
169+
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
299299

300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302-
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
303-
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
304-
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
305-
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
306-
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
302+
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
303+
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
304+
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
305+
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
306+
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
307307

308308
# Minimal command line test ( fail fast )
309309
RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
322322
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
323323

324324
# install postgis
325-
ENV POSTGIS_GIT_HASH 60b0e880d24ffcdf2d17ab22bc8109549f69fd16
325+
ENV POSTGIS_GIT_HASH 7c8cfe07df65efa1c5a715ad69fbdec06413ed2f
326326

327327
RUN set -ex \
328328
&& apt-get update \

0 commit comments

Comments
 (0)