Skip to content

Commit 922031f

Browse files
philliprossphillipross
authored
CI: Update docker-ce packages to v28.3.2 / update 16/17-master Dockerfiles (#424)
* - update.sh for 16/17 master versions Signed-off-by: Phillip Ross <[email protected]> * - CI: update docker-ce package to v28.3.2 Signed-off-by: Phillip Ross <[email protected]> * update README.md Versions to (2025-07-11) Signed-off-by: Phillip Ross <[email protected]> --------- Signed-off-by: Phillip Ross <[email protected]>
1 parent 99857b2 commit 922031f

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
env:
5353
VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}
5454
VARIANT: ${{ matrix.variant }}
55-
DOCKER_APT_PKG_VER: '5:28.3.1-1~ubuntu.24.04~noble'
55+
DOCKER_APT_PKG_VER: '5:28.3.2-1~ubuntu.24.04~noble'
5656

5757
steps:
5858
- name: Install/config specific version of Docker packages

‎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 616ce1b0d7247e0d23ce03b48d51b0317da4589a
90-
ENV SFCGAL_GIT_HASH 75b69839a8022a33ef12fb6d9259582ece16af7b
89+
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
90+
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
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 8879a1aa695c235497c986759f5deb4402ceb21d
123+
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
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 b577e3056f5a3ecec7bb1ded2181591a87b06149
153+
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
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 86a6f174cd2f0df1f4ab1aeaf043057caaf19005
169+
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
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 616ce1b0d7247e0d23ce03b48d51b0317da4589a
303-
ENV SFCGAL_GIT_HASH 75b69839a8022a33ef12fb6d9259582ece16af7b
304-
ENV PROJ_GIT_HASH 8879a1aa695c235497c986759f5deb4402ceb21d
305-
ENV GEOS_GIT_HASH b577e3056f5a3ecec7bb1ded2181591a87b06149
306-
ENV GDAL_GIT_HASH 86a6f174cd2f0df1f4ab1aeaf043057caaf19005
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
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 2b6933ed2dada900b47458421113c2ff60240311
325+
ENV POSTGIS_GIT_HASH 60b0e880d24ffcdf2d17ab22bc8109549f69fd16
326326

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

‎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 616ce1b0d7247e0d23ce03b48d51b0317da4589a
90-
ENV SFCGAL_GIT_HASH 75b69839a8022a33ef12fb6d9259582ece16af7b
89+
ENV CGAL_GIT_HASH 0435766dcff95262a217c7256498abd63189b6ae
90+
ENV SFCGAL_GIT_HASH 2a5ef192adb2c7963584e83b968177103918592e
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 8879a1aa695c235497c986759f5deb4402ceb21d
123+
ENV PROJ_GIT_HASH 36ff1542f8633dca7c7d3d1648e846859dade7ed
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 b577e3056f5a3ecec7bb1ded2181591a87b06149
153+
ENV GEOS_GIT_HASH 790f14e27d734b8ed253c1238de5f3155299afcc
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 86a6f174cd2f0df1f4ab1aeaf043057caaf19005
169+
ENV GDAL_GIT_HASH 7b06d23399ec78f0a66f33bd528ab802af8ae7f3
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 616ce1b0d7247e0d23ce03b48d51b0317da4589a
303-
ENV SFCGAL_GIT_HASH 75b69839a8022a33ef12fb6d9259582ece16af7b
304-
ENV PROJ_GIT_HASH 8879a1aa695c235497c986759f5deb4402ceb21d
305-
ENV GEOS_GIT_HASH b577e3056f5a3ecec7bb1ded2181591a87b06149
306-
ENV GDAL_GIT_HASH 86a6f174cd2f0df1f4ab1aeaf043057caaf19005
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
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 2b6933ed2dada900b47458421113c2ff60240311
325+
ENV POSTGIS_GIT_HASH 60b0e880d24ffcdf2d17ab22bc8109549f69fd16
326326

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
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 (2025-06-05)
21+
# Versions (2025-07-11)
2222

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

0 commit comments

Comments
 (0)