Skip to content

Commit ad2a7bb

Browse files
authored
make update - 2021Sep08 - Postgis 3.1.4 (#255)
* make update - 2021Sep08 - update to Postgis 3.1.4 - update 12/13-master * revert SFCGAL
1 parent 6f35269 commit ad2a7bb

File tree

12 files changed

+31
-31
lines changed

12 files changed

+31
-31
lines changed

10-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:10
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

10-3.1/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:10-alpine
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

5-
ENV POSTGIS_VERSION 3.1.3
6-
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
5+
ENV POSTGIS_VERSION 3.1.4
6+
ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48
77

88
#Temporary fix:
99
# for PostGIS 2.* - building a special geos

11-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:11
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

11-3.1/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:11-alpine
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

5-
ENV POSTGIS_VERSION 3.1.3
6-
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
5+
ENV POSTGIS_VERSION 3.1.4
6+
ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48
77

88
#Temporary fix:
99
# for PostGIS 2.* - building a special geos

12-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:12
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg100+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

12-3.1/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:12-alpine
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

5-
ENV POSTGIS_VERSION 3.1.3
6-
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
5+
ENV POSTGIS_VERSION 3.1.4
6+
ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48
77

88
#Temporary fix:
99
# for PostGIS 2.* - building a special geos

12-master/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
82+
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
8383

8484
RUN set -ex \
8585
&& cd /usr/src \
@@ -95,7 +95,7 @@ RUN set -ex \
9595

9696
# geos
9797
ENV GEOS_VERSION master
98-
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
98+
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
9999

100100
RUN set -ex \
101101
&& cd /usr/src \
@@ -112,7 +112,7 @@ RUN set -ex \
112112

113113
# gdal
114114
ENV GDAL_VERSION master
115-
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
115+
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
116116

117117
RUN set -ex \
118118
&& cd /usr/src \
@@ -170,10 +170,10 @@ RUN set -ex \
170170

171171
COPY --from=builder /usr/local /usr/local
172172

173-
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174-
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
175-
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
176-
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
173+
ENV SFCGAL_GIT_HASH 495719bb7969973f322fea7de1c0982c4ebbdec8
174+
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
175+
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
176+
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
177177

178178
# Minimal command line test.
179179
RUN set -ex \
@@ -187,7 +187,7 @@ RUN set -ex \
187187

188188
# install postgis
189189
ENV POSTGIS_VERSION master
190-
ENV POSTGIS_GIT_HASH 86a8a59791431b279e4d6511c96af0d3e45332d5
190+
ENV POSTGIS_GIT_HASH 6f9f76b7395f5c27c69c2136c53608e44ba0d38f
191191

192192
RUN set -ex \
193193
&& apt-get update \

13-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:13
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg100+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

13-3.1/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:13-alpine
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

5-
ENV POSTGIS_VERSION 3.1.3
6-
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
5+
ENV POSTGIS_VERSION 3.1.4
6+
ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48
77

88
#Temporary fix:
99
# for PostGIS 2.* - building a special geos

13-master/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
82+
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
8383

8484
RUN set -ex \
8585
&& cd /usr/src \
@@ -95,7 +95,7 @@ RUN set -ex \
9595

9696
# geos
9797
ENV GEOS_VERSION master
98-
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
98+
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
9999

100100
RUN set -ex \
101101
&& cd /usr/src \
@@ -112,7 +112,7 @@ RUN set -ex \
112112

113113
# gdal
114114
ENV GDAL_VERSION master
115-
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
115+
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
116116

117117
RUN set -ex \
118118
&& cd /usr/src \
@@ -170,10 +170,10 @@ RUN set -ex \
170170

171171
COPY --from=builder /usr/local /usr/local
172172

173-
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174-
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
175-
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
176-
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
173+
ENV SFCGAL_GIT_HASH 495719bb7969973f322fea7de1c0982c4ebbdec8
174+
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
175+
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
176+
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
177177

178178
# Minimal command line test.
179179
RUN set -ex \
@@ -187,7 +187,7 @@ RUN set -ex \
187187

188188
# install postgis
189189
ENV POSTGIS_VERSION master
190-
ENV POSTGIS_GIT_HASH 86a8a59791431b279e4d6511c96af0d3e45332d5
190+
ENV POSTGIS_GIT_HASH 6f9f76b7395f5c27c69c2136c53608e44ba0d38f
191191

192192
RUN set -ex \
193193
&& apt-get update \

9.6-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:9.6
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

9.6-3.1/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:9.6-alpine
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

5-
ENV POSTGIS_VERSION 3.1.3
6-
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
5+
ENV POSTGIS_VERSION 3.1.4
6+
ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48
77

88
#Temporary fix:
99
# for PostGIS 2.* - building a special geos

0 commit comments

Comments
 (0)