Skip to content

Commit 0af2742

Browse files
ImreSamuImreSamu
committed
- big update in README.md ; warnings, breaking changes;
- improve update.sh - with automatic README.md update. ( add new tool apply-readme.md )
1 parent 7e3bcac commit 0af2742

File tree

5 files changed

+162
-92
lines changed

5 files changed

+162
-92
lines changed

‎16-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
8989
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
90-
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
90+
ENV SFCGAL_GIT_HASH=cc408a34af9c3443a2cfb0f559b778a54a3702ab
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=8574ee2b3319a7ebb547dc4ce97a40ca8b60239b
123+
ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
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=69cce6b85195d4010e5b066f62a4c1137da92173
153+
ENV GEOS_GIT_HASH=16f53573f6bef38551801c2d449d4782775267bc
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=6d198cce293685b23615d8d0fd4529e661320530
169+
ENV GDAL_GIT_HASH=ca7a2d38893a8d6cdc03653b47712f4442d99d65
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -300,10 +300,10 @@ COPY --from=builder /usr/local /usr/local
300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302302
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
303-
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
304-
ENV PROJ_GIT_HASH=8574ee2b3319a7ebb547dc4ce97a40ca8b60239b
305-
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
306-
ENV GDAL_GIT_HASH=6d198cce293685b23615d8d0fd4529e661320530
303+
ENV SFCGAL_GIT_HASH=cc408a34af9c3443a2cfb0f559b778a54a3702ab
304+
ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
305+
ENV GEOS_GIT_HASH=16f53573f6bef38551801c2d449d4782775267bc
306+
ENV GDAL_GIT_HASH=ca7a2d38893a8d6cdc03653b47712f4442d99d65
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=f6ab40874a85b0c7cbaa419a47029b1ea8428f2e
325+
ENV POSTGIS_GIT_HASH=598acb6241df31b6f77f115b7af796e1226424ab
326326

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

‎17-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
8989
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
90-
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
90+
ENV SFCGAL_GIT_HASH=cc408a34af9c3443a2cfb0f559b778a54a3702ab
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=8574ee2b3319a7ebb547dc4ce97a40ca8b60239b
123+
ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
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=69cce6b85195d4010e5b066f62a4c1137da92173
153+
ENV GEOS_GIT_HASH=16f53573f6bef38551801c2d449d4782775267bc
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=6d198cce293685b23615d8d0fd4529e661320530
169+
ENV GDAL_GIT_HASH=ca7a2d38893a8d6cdc03653b47712f4442d99d65
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -300,10 +300,10 @@ COPY --from=builder /usr/local /usr/local
300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302302
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
303-
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
304-
ENV PROJ_GIT_HASH=8574ee2b3319a7ebb547dc4ce97a40ca8b60239b
305-
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
306-
ENV GDAL_GIT_HASH=6d198cce293685b23615d8d0fd4529e661320530
303+
ENV SFCGAL_GIT_HASH=cc408a34af9c3443a2cfb0f559b778a54a3702ab
304+
ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
305+
ENV GEOS_GIT_HASH=16f53573f6bef38551801c2d449d4782775267bc
306+
ENV GDAL_GIT_HASH=ca7a2d38893a8d6cdc03653b47712f4442d99d65
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=f6ab40874a85b0c7cbaa419a47029b1ea8428f2e
325+
ENV POSTGIS_GIT_HASH=598acb6241df31b6f77f115b7af796e1226424ab
326326

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

0 commit comments

Comments
 (0)