Skip to content

Commit c580901

Browse files
ImreSamuImreSamu
authored
Dockerfile.master: remove (proj|geos) version lock + make update (#231)
* remove master (proj|geos) version lock * make update * Add SFCGAL|PROJ|GEOS|GDAL GIT HASH to the final image * sorting multi-line arguments alphanumerically (Dockerfile-best-practice) * make update
1 parent 27f716f commit c580901

File tree

3 files changed

+49
-61
lines changed

3 files changed

+49
-61
lines changed

‎12-master/Dockerfile

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ RUN set -ex \
4040
build-essential \
4141
ca-certificates \
4242
cmake \
43-
git \
4443
g++ \
44+
git \
4545
libboost-all-dev \
4646
libcgal-dev \
4747
libcurl4-gnutls-dev \
4848
libgmp-dev \
4949
libjson-c-dev \
5050
libmpfr-dev \
51+
libpcre3-dev \
5152
libprotobuf-c-dev \
5253
libsqlite3-dev \
5354
libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
5657
make \
5758
pkg-config \
5859
protobuf-c-compiler \
59-
xsltproc \
60-
libpcre3-dev
60+
xsltproc
6161

6262
# sfcgal
6363
ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
7878
&& rm -fr /usr/src/SFCGAL
7979

8080
# proj
81-
###ENV PROJ_VERSION master
82-
###ENV PROJ_GIT_HASH db2950e56ea26a0949b71378d73559a16fc40f26
83-
84-
### Issue with proj v8 not being compatible
85-
### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
86-
### Below is a temp fix
87-
ENV PROJ_VERSION 7.2.1
88-
ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
81+
ENV PROJ_VERSION master
82+
ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
8983

9084
RUN set -ex \
9185
&& cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
10195

10296
# geos
10397
ENV GEOS_VERSION master
104-
###ENV GEOS_GIT_HASH 17ab55a55aeed3e5a0a83b05428463bf1646471f
105-
### lock Commits on Jan 19, 2021
106-
### temp fix, see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
107-
ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
98+
ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
10899

109100
RUN set -ex \
110101
&& cd /usr/src \
@@ -121,7 +112,7 @@ RUN set -ex \
121112

122113
# gdal
123114
ENV GDAL_VERSION master
124-
ENV GDAL_GIT_HASH ae1531a20a4079fc0739676a3c01c760f674bbf6
115+
ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
125116

126117
RUN set -ex \
127118
&& cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
170161
libgmpxx4ldbl \
171162
libjson-c3 \
172163
libmpfr6 \
164+
libpcre3 \
173165
libprotobuf-c1 \
174166
libtiff5 \
175167
libxml2 \
176168
sqlite3 \
177-
libpcre3 \
178169
&& rm -rf /var/lib/apt/lists/*
179170

180171
COPY --from=builder /usr/local /usr/local
181172

173+
ENV SFCGAL_GIT_HASH e1e67b58abf0e51dcce3bbb0ebd2429cca36c945
174+
ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
175+
ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
176+
ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
177+
182178
# Minimal command line test.
183179
RUN set -ex \
184180
&& ldconfig \
@@ -191,7 +187,7 @@ RUN set -ex \
191187

192188
# install postgis
193189
ENV POSTGIS_VERSION master
194-
ENV POSTGIS_GIT_HASH 52f942583b5b9c975799bf8eefadc756a5f56215
190+
ENV POSTGIS_GIT_HASH d5f7a2adc923869ebe17b5fd0a6fa299d5b9c20c
195191

196192
RUN set -ex \
197193
&& apt-get update \
@@ -203,8 +199,8 @@ RUN set -ex \
203199
build-essential \
204200
ca-certificates \
205201
cmake \
206-
git \
207202
g++ \
203+
git \
208204
libboost-all-dev \
209205
libcgal-dev \
210206
libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
258254
build-essential \
259255
ca-certificates \
260256
cmake \
261-
git \
262257
g++ \
258+
git \
263259
libboost-all-dev \
264260
libcgal-dev \
265261
libcurl4-gnutls-dev \
266262
libgmp-dev \
267263
libjson-c-dev \
268264
libmpfr-dev \
265+
libpcre3-dev \
269266
libprotobuf-c-dev \
270267
libsqlite3-dev \
271268
libtiff-dev \
272269
libtool \
273270
libxml2-dev \
274-
libpcre3-dev \
275271
make \
276272
pkg-config \
277273
postgresql-server-dev-$PG_MAJOR \

‎13-master/Dockerfile

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ RUN set -ex \
4040
build-essential \
4141
ca-certificates \
4242
cmake \
43-
git \
4443
g++ \
44+
git \
4545
libboost-all-dev \
4646
libcgal-dev \
4747
libcurl4-gnutls-dev \
4848
libgmp-dev \
4949
libjson-c-dev \
5050
libmpfr-dev \
51+
libpcre3-dev \
5152
libprotobuf-c-dev \
5253
libsqlite3-dev \
5354
libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
5657
make \
5758
pkg-config \
5859
protobuf-c-compiler \
59-
xsltproc \
60-
libpcre3-dev
60+
xsltproc
6161

6262
# sfcgal
6363
ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
7878
&& rm -fr /usr/src/SFCGAL
7979

8080
# proj
81-
###ENV PROJ_VERSION master
82-
###ENV PROJ_GIT_HASH db2950e56ea26a0949b71378d73559a16fc40f26
83-
84-
### Issue with proj v8 not being compatible
85-
### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
86-
### Below is a temp fix
87-
ENV PROJ_VERSION 7.2.1
88-
ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
81+
ENV PROJ_VERSION master
82+
ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
8983

9084
RUN set -ex \
9185
&& cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
10195

10296
# geos
10397
ENV GEOS_VERSION master
104-
###ENV GEOS_GIT_HASH 17ab55a55aeed3e5a0a83b05428463bf1646471f
105-
### lock Commits on Jan 19, 2021
106-
### temp fix, see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
107-
ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
98+
ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
10899

109100
RUN set -ex \
110101
&& cd /usr/src \
@@ -121,7 +112,7 @@ RUN set -ex \
121112

122113
# gdal
123114
ENV GDAL_VERSION master
124-
ENV GDAL_GIT_HASH ae1531a20a4079fc0739676a3c01c760f674bbf6
115+
ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
125116

126117
RUN set -ex \
127118
&& cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
170161
libgmpxx4ldbl \
171162
libjson-c3 \
172163
libmpfr6 \
164+
libpcre3 \
173165
libprotobuf-c1 \
174166
libtiff5 \
175167
libxml2 \
176168
sqlite3 \
177-
libpcre3 \
178169
&& rm -rf /var/lib/apt/lists/*
179170

180171
COPY --from=builder /usr/local /usr/local
181172

173+
ENV SFCGAL_GIT_HASH e1e67b58abf0e51dcce3bbb0ebd2429cca36c945
174+
ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
175+
ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
176+
ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
177+
182178
# Minimal command line test.
183179
RUN set -ex \
184180
&& ldconfig \
@@ -191,7 +187,7 @@ RUN set -ex \
191187

192188
# install postgis
193189
ENV POSTGIS_VERSION master
194-
ENV POSTGIS_GIT_HASH 52f942583b5b9c975799bf8eefadc756a5f56215
190+
ENV POSTGIS_GIT_HASH d5f7a2adc923869ebe17b5fd0a6fa299d5b9c20c
195191

196192
RUN set -ex \
197193
&& apt-get update \
@@ -203,8 +199,8 @@ RUN set -ex \
203199
build-essential \
204200
ca-certificates \
205201
cmake \
206-
git \
207202
g++ \
203+
git \
208204
libboost-all-dev \
209205
libcgal-dev \
210206
libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
258254
build-essential \
259255
ca-certificates \
260256
cmake \
261-
git \
262257
g++ \
258+
git \
263259
libboost-all-dev \
264260
libcgal-dev \
265261
libcurl4-gnutls-dev \
266262
libgmp-dev \
267263
libjson-c-dev \
268264
libmpfr-dev \
265+
libpcre3-dev \
269266
libprotobuf-c-dev \
270267
libsqlite3-dev \
271268
libtiff-dev \
272269
libtool \
273270
libxml2-dev \
274-
libpcre3-dev \
275271
make \
276272
pkg-config \
277273
postgresql-server-dev-$PG_MAJOR \

‎Dockerfile.master.template

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ RUN set -ex \
4040
build-essential \
4141
ca-certificates \
4242
cmake \
43-
git \
4443
g++ \
44+
git \
4545
libboost-all-dev \
4646
libcgal-dev \
4747
libcurl4-gnutls-dev \
4848
libgmp-dev \
4949
libjson-c-dev \
5050
libmpfr-dev \
51+
libpcre3-dev \
5152
libprotobuf-c-dev \
5253
libsqlite3-dev \
5354
libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
5657
make \
5758
pkg-config \
5859
protobuf-c-compiler \
59-
xsltproc \
60-
libpcre3-dev
60+
xsltproc
6161

6262
# sfcgal
6363
ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
7878
&& rm -fr /usr/src/SFCGAL
7979

8080
# proj
81-
###ENV PROJ_VERSION master
82-
###ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
83-
84-
### Issue with proj v8 not being compatible
85-
### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
86-
### Below is a temp fix
87-
ENV PROJ_VERSION 7.2.1
88-
ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
81+
ENV PROJ_VERSION master
82+
ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
8983

9084
RUN set -ex \
9185
&& cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
10195

10296
# geos
10397
ENV GEOS_VERSION master
104-
###ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
105-
### lock Commits on Jan 19, 2021
106-
### temp fix, see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
107-
ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
98+
ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
10899

109100
RUN set -ex \
110101
&& cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
170161
libgmpxx4ldbl \
171162
libjson-c3 \
172163
libmpfr6 \
164+
libpcre3 \
173165
libprotobuf-c1 \
174166
libtiff5 \
175167
libxml2 \
176168
sqlite3 \
177-
libpcre3 \
178169
&& rm -rf /var/lib/apt/lists/*
179170

180171
COPY --from=builder /usr/local /usr/local
181172

173+
ENV SFCGAL_GIT_HASH %%SFCGAL_GIT_HASH%%
174+
ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
175+
ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
176+
ENV GDAL_GIT_HASH %%GDAL_GIT_HASH%%
177+
182178
# Minimal command line test.
183179
RUN set -ex \
184180
&& ldconfig \
@@ -203,8 +199,8 @@ RUN set -ex \
203199
build-essential \
204200
ca-certificates \
205201
cmake \
206-
git \
207202
g++ \
203+
git \
208204
libboost-all-dev \
209205
libcgal-dev \
210206
libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
258254
build-essential \
259255
ca-certificates \
260256
cmake \
261-
git \
262257
g++ \
258+
git \
263259
libboost-all-dev \
264260
libcgal-dev \
265261
libcurl4-gnutls-dev \
266262
libgmp-dev \
267263
libjson-c-dev \
268264
libmpfr-dev \
265+
libpcre3-dev \
269266
libprotobuf-c-dev \
270267
libsqlite3-dev \
271268
libtiff-dev \
272269
libtool \
273270
libxml2-dev \
274-
libpcre3-dev \
275271
make \
276272
pkg-config \
277273
postgresql-server-dev-$PG_MAJOR \

0 commit comments

Comments
 (0)