Skip to content

Commit 4b53c95

Browse files
author
Alexandre Silva
authored
Fix typo in master dockerfiles (#332)
* Fix typo in master dockerfiles * Fix typo in master template * Update master dockerfiles
1 parent 4054f0a commit 4b53c95

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

14-master/Dockerfile

+8-8
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 94be2c69c2cd0d0e1db332755ec105c9c65737c5
85+
ENV PROJ_GIT_HASH 23ffb4ba179a9b3bf1debd2749e92f1862b51536
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 4f427203bcc578fee24a4d76f59adc1c086349b0
117+
ENV GEOS_GIT_HASH dd31eb17c6b5283bfee0c3c513192cd257b015cc
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 bc0948f8773feab1ecf81fb0be782c548af5f089
134+
ENV GDAL_GIT_HASH 12c1c58435d025a97ecec0dffd39bb793b332b11
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -147,7 +147,7 @@ RUN set -ex \
147147
echo "Directory 'gdal' does not exists! Newer version! " ; \
148148
fi \
149149
\
150-
&& if [ -f "./autogen.sh:" ]; then \
150+
&& if [ -f "./autogen.sh" ]; then \
151151
# Building with autoconf ( old/deprecated )
152152
set -eux \
153153
&& ./autogen.sh \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH 94be2c69c2cd0d0e1db332755ec105c9c65737c5
214-
ENV GEOS_GIT_HASH 4f427203bcc578fee24a4d76f59adc1c086349b0
215-
ENV GDAL_GIT_HASH bc0948f8773feab1ecf81fb0be782c548af5f089
213+
ENV PROJ_GIT_HASH 23ffb4ba179a9b3bf1debd2749e92f1862b51536
214+
ENV GEOS_GIT_HASH dd31eb17c6b5283bfee0c3c513192cd257b015cc
215+
ENV GDAL_GIT_HASH 12c1c58435d025a97ecec0dffd39bb793b332b11
216216

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

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH c2a0b202492a235002deaf3fd4a82cbeb659ea1a
233+
ENV POSTGIS_GIT_HASH ee06f41209c87366494b454f33179f56788cabc5
234234

235235
RUN set -ex \
236236
&& apt-get update \

15-master/Dockerfile

+8-8
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 94be2c69c2cd0d0e1db332755ec105c9c65737c5
85+
ENV PROJ_GIT_HASH 23ffb4ba179a9b3bf1debd2749e92f1862b51536
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 4f427203bcc578fee24a4d76f59adc1c086349b0
117+
ENV GEOS_GIT_HASH dd31eb17c6b5283bfee0c3c513192cd257b015cc
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 bc0948f8773feab1ecf81fb0be782c548af5f089
134+
ENV GDAL_GIT_HASH 12c1c58435d025a97ecec0dffd39bb793b332b11
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -147,7 +147,7 @@ RUN set -ex \
147147
echo "Directory 'gdal' does not exists! Newer version! " ; \
148148
fi \
149149
\
150-
&& if [ -f "./autogen.sh:" ]; then \
150+
&& if [ -f "./autogen.sh" ]; then \
151151
# Building with autoconf ( old/deprecated )
152152
set -eux \
153153
&& ./autogen.sh \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH 94be2c69c2cd0d0e1db332755ec105c9c65737c5
214-
ENV GEOS_GIT_HASH 4f427203bcc578fee24a4d76f59adc1c086349b0
215-
ENV GDAL_GIT_HASH bc0948f8773feab1ecf81fb0be782c548af5f089
213+
ENV PROJ_GIT_HASH 23ffb4ba179a9b3bf1debd2749e92f1862b51536
214+
ENV GEOS_GIT_HASH dd31eb17c6b5283bfee0c3c513192cd257b015cc
215+
ENV GDAL_GIT_HASH 12c1c58435d025a97ecec0dffd39bb793b332b11
216216

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

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH c2a0b202492a235002deaf3fd4a82cbeb659ea1a
233+
ENV POSTGIS_GIT_HASH ee06f41209c87366494b454f33179f56788cabc5
234234

235235
RUN set -ex \
236236
&& apt-get update \

Dockerfile.master.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ RUN set -ex \
147147
echo "Directory 'gdal' does not exists! Newer version! " ; \
148148
fi \
149149
\
150-
&& if [ -f "./autogen.sh:" ]; then \
150+
&& if [ -f "./autogen.sh" ]; then \
151151
# Building with autoconf ( old/deprecated )
152152
set -eux \
153153
&& ./autogen.sh \

0 commit comments

Comments
 (0)