Skip to content

Commit 813d944

Browse files
ImreSamuImreSamu
authored
postgresql update - 2021-08-12 (#252)
* rename 14beta2-3.1 --> 14beta3-3.1 ; make update * update workflow matrix: 14beta2 -> 14beta3 * update.sh 14beta2->14beta3 * manually update alpine postgis to 3.1.3 ( debian is still 3.1.2)
1 parent dabd4d3 commit 813d944

File tree

16 files changed

+33
-33
lines changed

16 files changed

+33
-33
lines changed

‎.github/workflows/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [9.6, 10, 11, 12, 13, '14beta2']
18+
postgres: [9.6, 10, 11, 12, 13, '14beta3']
1919
postgis: ['2.5', '3.1']
2020
variant: [default, alpine]
2121
exclude:
2222
- postgres: 13
2323
postgis: '2.5'
24-
- postgres: '14beta2'
24+
- postgres: '14beta3'
2525
postgis: '2.5'
2626
include:
2727
- postgres: 12

‎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.2
6-
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
5+
ENV POSTGIS_VERSION 3.1.3
6+
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
77

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

‎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.2
6-
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
5+
ENV POSTGIS_VERSION 3.1.3
6+
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
77

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

‎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.2
6-
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
5+
ENV POSTGIS_VERSION 3.1.3
6+
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
77

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

‎12-master/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -ex \
6161

6262
# sfcgal
6363
ENV SFCGAL_VERSION master
64-
ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
64+
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6565

6666
RUN set -ex \
6767
&& mkdir -p /usr/src \
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
82+
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
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 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
98+
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
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 51e564e9364243be48da5e264c0507d7a9c546d8
115+
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
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 e4fcf6b2e166a862db568a0419fe100849d3f447
174-
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
175-
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
176-
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
173+
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174+
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
175+
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
176+
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
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 54a0c748dbb165847c1d0fe3abbe22dd48b8237a
190+
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504
191191

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

‎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.2
6-
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
5+
ENV POSTGIS_VERSION 3.1.3
6+
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
77

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

‎13-master/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -ex \
6161

6262
# sfcgal
6363
ENV SFCGAL_VERSION master
64-
ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
64+
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6565

6666
RUN set -ex \
6767
&& mkdir -p /usr/src \
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
82+
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
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 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
98+
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
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 51e564e9364243be48da5e264c0507d7a9c546d8
115+
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
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 e4fcf6b2e166a862db568a0419fe100849d3f447
174-
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
175-
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
176-
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
173+
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174+
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
175+
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
176+
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
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 54a0c748dbb165847c1d0fe3abbe22dd48b8237a
190+
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504
191191

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

‎14beta2-3.1/Dockerfile renamed to ‎14beta3-3.1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:14beta2
1+
FROM postgres:14beta3
22

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

‎14beta2-3.1/README.md renamed to ‎14beta3-3.1/README.md

File renamed without changes.

‎14beta2-3.1/alpine/Dockerfile renamed to ‎14beta3-3.1/alpine/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:14beta2-alpine
1+
FROM postgres:14beta3-alpine
22

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

‎14beta2-3.1/alpine/initdb-postgis.sh renamed to ‎14beta3-3.1/alpine/initdb-postgis.sh

File renamed without changes.

‎14beta2-3.1/alpine/update-postgis.sh renamed to ‎14beta3-3.1/alpine/update-postgis.sh

File renamed without changes.

‎14beta2-3.1/initdb-postgis.sh renamed to ‎14beta3-3.1/initdb-postgis.sh

File renamed without changes.

‎14beta2-3.1/update-postgis.sh renamed to ‎14beta3-3.1/update-postgis.sh

File renamed without changes.

‎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.2
6-
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
5+
ENV POSTGIS_VERSION 3.1.3
6+
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4
77

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

‎update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ declare -A debianSuite=(
2222
[12]='buster-slim'
2323
[13]='buster-slim'
2424
[14]='buster-slim'
25-
[14beta2]='buster-slim'
25+
[14beta3]='buster-slim'
2626
)
2727

2828
defaultPostgisDebPkgNameVersionSuffix='3'

0 commit comments

Comments
 (0)