Skip to content

Commit c69d7b2

Browse files
authored
updating '(13|14)-master' - with 'make update' (#294)
1 parent 3f1fda3 commit c69d7b2

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

13-master/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 98e5ef0bab8bde49b2bddb71694c3b0294387e64
85+
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 8a9326ebcad93bb0807347409bb97d16ee1d0ef0
117+
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 98c9ecf8513325bb69888d368bd9a0d54b79e72b
134+
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH 54b78af7b42f0f348f34879616a5da480b8e4974
200-
ENV PROJ_GIT_HASH 98e5ef0bab8bde49b2bddb71694c3b0294387e64
201-
ENV GEOS_GIT_HASH 8a9326ebcad93bb0807347409bb97d16ee1d0ef0
202-
ENV GDAL_GIT_HASH 98c9ecf8513325bb69888d368bd9a0d54b79e72b
200+
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
201+
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
202+
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
203203

204204
# Minimal command line test.
205205
RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
217217

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH c9885d5275dd022d19b0061df256cd0425bf20dd
220+
ENV POSTGIS_GIT_HASH 6febe57e76d2239ea9779c489eff376f3ed76e72
221221

222222
RUN set -ex \
223223
&& apt-get update \

14-master/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 98e5ef0bab8bde49b2bddb71694c3b0294387e64
85+
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 8a9326ebcad93bb0807347409bb97d16ee1d0ef0
117+
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 98c9ecf8513325bb69888d368bd9a0d54b79e72b
134+
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH 54b78af7b42f0f348f34879616a5da480b8e4974
200-
ENV PROJ_GIT_HASH 98e5ef0bab8bde49b2bddb71694c3b0294387e64
201-
ENV GEOS_GIT_HASH 8a9326ebcad93bb0807347409bb97d16ee1d0ef0
202-
ENV GDAL_GIT_HASH 98c9ecf8513325bb69888d368bd9a0d54b79e72b
200+
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
201+
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
202+
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
203203

204204
# Minimal command line test.
205205
RUN set -ex \
@@ -217,7 +217,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
217217

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH c9885d5275dd022d19b0061df256cd0425bf20dd
220+
ENV POSTGIS_GIT_HASH 6febe57e76d2239ea9779c489eff376f3ed76e72
221221

222222
RUN set -ex \
223223
&& apt-get update \

0 commit comments

Comments
 (0)