Skip to content

Commit 8a3ed2b

Browse files
authored
make update (#341)
1 parent 9f1f1ba commit 8a3ed2b

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

14-master/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8585
# By utilizing the latest commit of the CGAL 5.5.x-branch and implementing a header-only build for SFCGAL,
8686
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
8787
ENV CGAL_GIT_BRANCH 5.5.x-branch
88-
ENV CGAL55_GIT_HASH ec00fa30b2f0d1eeb5bc7f3064e4817e9c3d6135
88+
ENV CGAL55_GIT_HASH b4c04b53e0b9479e568fc76830976e281d02c9b4
8989
ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
9090
RUN set -ex \
9191
&& mkdir -p /usr/src \
@@ -119,7 +119,7 @@ RUN set -ex \
119119
&& rm -fr /usr/src/cgal
120120

121121
# proj
122-
ENV PROJ_GIT_HASH 23a8eccf9e9feebe7bb4cc700baef58ffef59f5d
122+
ENV PROJ_GIT_HASH c31146bee252d5b8bf4dc0b35168ab5e3ddf94b9
123123
RUN set -ex \
124124
&& cd /usr/src \
125125
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -149,7 +149,7 @@ RUN set -ex \
149149
&& rm -fr /usr/src/PROJ
150150

151151
# geos
152-
ENV GEOS_GIT_HASH a36676e3a0467dc6bdbfb426a4d369ded8f677d4
152+
ENV GEOS_GIT_HASH c54752f9d4d44e35ac4015cbb8dd47ddb36611bf
153153
RUN set -ex \
154154
&& cd /usr/src \
155155
&& git clone https://github.com/libgeos/geos.git \
@@ -165,7 +165,7 @@ RUN set -ex \
165165
&& rm -fr /usr/src/geos
166166

167167
# gdal
168-
ENV GDAL_GIT_HASH a9a159afc9589b28d1d30ec010a5b9f33d389f7a
168+
ENV GDAL_GIT_HASH 67eaa768c017a21200c7acd9c208d104efea512d
169169
RUN set -ex \
170170
&& cd /usr/src \
171171
&& git clone https://github.com/OSGeo/gdal.git \
@@ -297,11 +297,11 @@ COPY --from=builder /_pgis*.* /
297297
COPY --from=builder /usr/local /usr/local
298298

299299
ENV CGAL_GIT_BRANCH 5.5.x-branch
300-
ENV CGAL55_GIT_HASH ec00fa30b2f0d1eeb5bc7f3064e4817e9c3d6135
300+
ENV CGAL55_GIT_HASH b4c04b53e0b9479e568fc76830976e281d02c9b4
301301
ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
302-
ENV PROJ_GIT_HASH 23a8eccf9e9feebe7bb4cc700baef58ffef59f5d
303-
ENV GEOS_GIT_HASH a36676e3a0467dc6bdbfb426a4d369ded8f677d4
304-
ENV GDAL_GIT_HASH a9a159afc9589b28d1d30ec010a5b9f33d389f7a
302+
ENV PROJ_GIT_HASH c31146bee252d5b8bf4dc0b35168ab5e3ddf94b9
303+
ENV GEOS_GIT_HASH c54752f9d4d44e35ac4015cbb8dd47ddb36611bf
304+
ENV GDAL_GIT_HASH 67eaa768c017a21200c7acd9c208d104efea512d
305305

306306
# Minimal command line test ( fail fast )
307307
RUN set -ex \
@@ -320,7 +320,7 @@ RUN set -ex \
320320
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
321321

322322
# install postgis
323-
ENV POSTGIS_GIT_HASH 256dd5e0e1bf8a576df6856eebf0828054d42faf
323+
ENV POSTGIS_GIT_HASH 0a7d3bc20498532464c9064a4c75912f842f565f
324324

325325
RUN set -ex \
326326
&& apt-get update \

15-master/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8585
# By utilizing the latest commit of the CGAL 5.5.x-branch and implementing a header-only build for SFCGAL,
8686
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
8787
ENV CGAL_GIT_BRANCH 5.5.x-branch
88-
ENV CGAL55_GIT_HASH ec00fa30b2f0d1eeb5bc7f3064e4817e9c3d6135
88+
ENV CGAL55_GIT_HASH b4c04b53e0b9479e568fc76830976e281d02c9b4
8989
ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
9090
RUN set -ex \
9191
&& mkdir -p /usr/src \
@@ -119,7 +119,7 @@ RUN set -ex \
119119
&& rm -fr /usr/src/cgal
120120

121121
# proj
122-
ENV PROJ_GIT_HASH 23a8eccf9e9feebe7bb4cc700baef58ffef59f5d
122+
ENV PROJ_GIT_HASH c31146bee252d5b8bf4dc0b35168ab5e3ddf94b9
123123
RUN set -ex \
124124
&& cd /usr/src \
125125
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -149,7 +149,7 @@ RUN set -ex \
149149
&& rm -fr /usr/src/PROJ
150150

151151
# geos
152-
ENV GEOS_GIT_HASH a36676e3a0467dc6bdbfb426a4d369ded8f677d4
152+
ENV GEOS_GIT_HASH c54752f9d4d44e35ac4015cbb8dd47ddb36611bf
153153
RUN set -ex \
154154
&& cd /usr/src \
155155
&& git clone https://github.com/libgeos/geos.git \
@@ -165,7 +165,7 @@ RUN set -ex \
165165
&& rm -fr /usr/src/geos
166166

167167
# gdal
168-
ENV GDAL_GIT_HASH a9a159afc9589b28d1d30ec010a5b9f33d389f7a
168+
ENV GDAL_GIT_HASH 67eaa768c017a21200c7acd9c208d104efea512d
169169
RUN set -ex \
170170
&& cd /usr/src \
171171
&& git clone https://github.com/OSGeo/gdal.git \
@@ -297,11 +297,11 @@ COPY --from=builder /_pgis*.* /
297297
COPY --from=builder /usr/local /usr/local
298298

299299
ENV CGAL_GIT_BRANCH 5.5.x-branch
300-
ENV CGAL55_GIT_HASH ec00fa30b2f0d1eeb5bc7f3064e4817e9c3d6135
300+
ENV CGAL55_GIT_HASH b4c04b53e0b9479e568fc76830976e281d02c9b4
301301
ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
302-
ENV PROJ_GIT_HASH 23a8eccf9e9feebe7bb4cc700baef58ffef59f5d
303-
ENV GEOS_GIT_HASH a36676e3a0467dc6bdbfb426a4d369ded8f677d4
304-
ENV GDAL_GIT_HASH a9a159afc9589b28d1d30ec010a5b9f33d389f7a
302+
ENV PROJ_GIT_HASH c31146bee252d5b8bf4dc0b35168ab5e3ddf94b9
303+
ENV GEOS_GIT_HASH c54752f9d4d44e35ac4015cbb8dd47ddb36611bf
304+
ENV GDAL_GIT_HASH 67eaa768c017a21200c7acd9c208d104efea512d
305305

306306
# Minimal command line test ( fail fast )
307307
RUN set -ex \
@@ -320,7 +320,7 @@ RUN set -ex \
320320
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
321321

322322
# install postgis
323-
ENV POSTGIS_GIT_HASH 256dd5e0e1bf8a576df6856eebf0828054d42faf
323+
ENV POSTGIS_GIT_HASH 0a7d3bc20498532464c9064a4c75912f842f565f
324324

325325
RUN set -ex \
326326
&& apt-get update \

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Note: As of PostGIS v3.x, raster has been factored out into a separate extension
1414

1515
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`.
1616

17-
# Versions ( 2023-02-17 )
17+
# Versions ( 2023-03-18 )
1818

1919
Recomended version for the new users: `postgis/postgis:15-3.3`
2020

0 commit comments

Comments
 (0)