Skip to content

Commit 3e5eda6

Browse files
ImreSamuImreSamu
authored
Lock alpine3.14 ( temporary fix for alpine 3.15 newer geos ) (#272)
* lock alpine 3.14 for older geos (temp fix) * make update - regenerate templates
1 parent 09b3f86 commit 3e5eda6

File tree

12 files changed

+28
-28
lines changed

12 files changed

+28
-28
lines changed

‎10-2.5/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:10-alpine
1+
FROM postgres:10-alpine3.14
22

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

‎10-3.1/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:10-alpine
1+
FROM postgres:10-alpine3.14
22

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

‎11-2.5/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11-alpine
1+
FROM postgres:11-alpine3.14
22

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

‎11-3.1/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11-alpine
1+
FROM postgres:11-alpine3.14
22

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

‎12-3.1/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:12-alpine
1+
FROM postgres:12-alpine3.14
22

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

‎13-3.1/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:13-alpine
1+
FROM postgres:13-alpine3.14
22

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

‎13-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -ex \
6161
# sfcgal
6262
ENV SFCGAL_VERSION master
6363
#current:
64-
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
64+
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
6565
#reverted for the last working version
6666
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6767

@@ -81,7 +81,7 @@ RUN set -ex \
8181

8282
# proj
8383
ENV PROJ_VERSION master
84-
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
84+
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
8585

8686
RUN set -ex \
8787
&& cd /usr/src \
@@ -97,7 +97,7 @@ RUN set -ex \
9797

9898
# geos
9999
ENV GEOS_VERSION master
100-
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
100+
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
101101

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

115115
# gdal
116116
ENV GDAL_VERSION master
117-
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
117+
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -179,10 +179,10 @@ RUN set -ex \
179179

180180
COPY --from=builder /usr/local /usr/local
181181

182-
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
183-
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
184-
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
185-
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
182+
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
183+
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
184+
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
185+
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f
186186

187187
# Minimal command line test.
188188
RUN set -ex \
@@ -196,7 +196,7 @@ RUN set -ex \
196196

197197
# install postgis
198198
ENV POSTGIS_VERSION master
199-
ENV POSTGIS_GIT_HASH 530f7c88cbebf8357650ad7f337a46f61c0dd214
199+
ENV POSTGIS_GIT_HASH 27f44ecf69ac576c95ff649b2fb23aa3e1cce5c1
200200

201201
RUN set -ex \
202202
&& apt-get update \

‎14-3.1/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:14-alpine
1+
FROM postgres:14-alpine3.14
22

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

‎14-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN set -ex \
6161
# sfcgal
6262
ENV SFCGAL_VERSION master
6363
#current:
64-
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
64+
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
6565
#reverted for the last working version
6666
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6767

@@ -81,7 +81,7 @@ RUN set -ex \
8181

8282
# proj
8383
ENV PROJ_VERSION master
84-
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
84+
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
8585

8686
RUN set -ex \
8787
&& cd /usr/src \
@@ -97,7 +97,7 @@ RUN set -ex \
9797

9898
# geos
9999
ENV GEOS_VERSION master
100-
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
100+
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
101101

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

115115
# gdal
116116
ENV GDAL_VERSION master
117-
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
117+
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -179,10 +179,10 @@ RUN set -ex \
179179

180180
COPY --from=builder /usr/local /usr/local
181181

182-
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
183-
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
184-
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
185-
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
182+
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
183+
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
184+
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
185+
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f
186186

187187
# Minimal command line test.
188188
RUN set -ex \
@@ -196,7 +196,7 @@ RUN set -ex \
196196

197197
# install postgis
198198
ENV POSTGIS_VERSION master
199-
ENV POSTGIS_GIT_HASH 530f7c88cbebf8357650ad7f337a46f61c0dd214
199+
ENV POSTGIS_GIT_HASH 27f44ecf69ac576c95ff649b2fb23aa3e1cce5c1
200200

201201
RUN set -ex \
202202
&& apt-get update \

‎9.6-2.5/alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:9.6-alpine
1+
FROM postgres:9.6-alpine3.14
22

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

0 commit comments

Comments
 (0)