Skip to content

Commit 7224d1c

Browse files
ImreSamuImreSamu
authored
update to postgis3.3.0beta2 + -master versions (#303)
1 parent 2b6d88f commit 7224d1c

File tree

13 files changed

+36
-36
lines changed

13 files changed

+36
-36
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
postgis: master
3434
variant: default
3535
- postgres: 14
36-
postgis: '3.3.0beta1'
36+
postgis: '3.3.0beta2'
3737
variant: alpine
3838
- postgres: '15beta2'
39-
postgis: '3.3.0beta1'
39+
postgis: '3.3.0beta2'
4040
variant: alpine
4141
- postgres: '15beta2'
4242
postgis: master

‎13-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
65+
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH a390c57ab5998154535d7ffbc7de04aad2a73910
85+
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
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 2544c1bed761fc235f3435a900c9e0d5b6115de8
117+
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
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 104e1747748d204e8aff1945464a24b1f8c94c90
134+
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -196,10 +196,10 @@ RUN set -ex \
196196

197197
COPY --from=builder /usr/local /usr/local
198198

199-
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200-
ENV PROJ_GIT_HASH a390c57ab5998154535d7ffbc7de04aad2a73910
201-
ENV GEOS_GIT_HASH 2544c1bed761fc235f3435a900c9e0d5b6115de8
202-
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
199+
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200+
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
201+
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
202+
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
203203

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

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH a887aab94446e935112c645ef94027cf28373056
220+
ENV POSTGIS_GIT_HASH 5cc346ae8019da12ccd6162a3b9022a9600a3167
221221

222222
RUN set -ex \
223223
&& apt-get update \

‎14-3.3.0beta1/Dockerfile‎ renamed to ‎14-3.3.0beta2/Dockerfile‎

File renamed without changes.

‎14-3.3.0beta1/alpine/Dockerfile‎ renamed to ‎14-3.3.0beta2/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:14-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.3.0beta1
6-
ENV POSTGIS_SHA256 256807c72bae89ea955b5a5d56fa01b96982608c8aaa11903ea239376b0833e8
5+
ENV POSTGIS_VERSION 3.3.0beta2
6+
ENV POSTGIS_SHA256 6134085b57ffaf9c27888534cdc4234bc8eadf3ab1ff71ee8da4c4ff1828e8fb
77

88
RUN set -eux \
99
\

‎14-3.3.0beta1/alpine/initdb-postgis.sh‎ renamed to ‎14-3.3.0beta2/alpine/initdb-postgis.sh‎

File renamed without changes.

‎14-3.3.0beta1/alpine/update-postgis.sh‎ renamed to ‎14-3.3.0beta2/alpine/update-postgis.sh‎

File renamed without changes.

‎14-master/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
65+
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH a390c57ab5998154535d7ffbc7de04aad2a73910
85+
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
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 2544c1bed761fc235f3435a900c9e0d5b6115de8
117+
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
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 104e1747748d204e8aff1945464a24b1f8c94c90
134+
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -196,10 +196,10 @@ RUN set -ex \
196196

197197
COPY --from=builder /usr/local /usr/local
198198

199-
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200-
ENV PROJ_GIT_HASH a390c57ab5998154535d7ffbc7de04aad2a73910
201-
ENV GEOS_GIT_HASH 2544c1bed761fc235f3435a900c9e0d5b6115de8
202-
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
199+
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200+
ENV PROJ_GIT_HASH 5b2d59b68f931303d73e742763309d258f9335d4
201+
ENV GEOS_GIT_HASH e3abcc8fc0f60035c7d8bda65e2417873f6da872
202+
ENV GDAL_GIT_HASH 158f473911c30d04f9694fb2e46cc3d38cd3b3f3
203203

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

218218
# install postgis
219219
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH a887aab94446e935112c645ef94027cf28373056
220+
ENV POSTGIS_GIT_HASH 5cc346ae8019da12ccd6162a3b9022a9600a3167
221221

222222
RUN set -ex \
223223
&& apt-get update \

‎15beta2-3.3.0beta1/Dockerfile‎ renamed to ‎15beta2-3.3.0beta2/Dockerfile‎

File renamed without changes.

‎15beta2-3.3.0beta1/alpine/Dockerfile‎ renamed to ‎15beta2-3.3.0beta2/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:15beta2-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.3.0beta1
6-
ENV POSTGIS_SHA256 256807c72bae89ea955b5a5d56fa01b96982608c8aaa11903ea239376b0833e8
5+
ENV POSTGIS_VERSION 3.3.0beta2
6+
ENV POSTGIS_SHA256 6134085b57ffaf9c27888534cdc4234bc8eadf3ab1ff71ee8da4c4ff1828e8fb
77

88
RUN set -eux \
99
\

‎15beta2-3.3.0beta1/alpine/initdb-postgis.sh‎ renamed to ‎15beta2-3.3.0beta2/alpine/initdb-postgis.sh‎

File renamed without changes.

0 commit comments

Comments
 (0)