Skip to content

Commit ad03663

Browse files
ImreSamuImreSamu
authored
update 15beta2, -master (#301)
* update 15beta2, -master * update CI to 15beta2 * update README to 15beta2
1 parent 8fe5f5c commit ad03663

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
- postgres: 14
3636
postgis: '3.3.0alpha1'
3737
variant: alpine
38-
- postgres: '15beta1'
38+
- postgres: '15beta2'
3939
postgis: '3.3.0alpha1'
4040
variant: alpine
41-
- postgres: '15beta1'
41+
- postgres: '15beta2'
4242
postgis: master
4343
variant: default
4444

‎13-master/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
85+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
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 ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
117+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
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 e690ffaab9f0e349f722decd3ed15a1a5b59316b
134+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
201-
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
202-
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b
200+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
201+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
202+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
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 7c69026c8c40d7c1144824098059c9f1f0216167
220+
ENV POSTGIS_GIT_HASH 0903120772c9017f99c51c4b83b606be14e148b7
221221

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

‎14-master/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
85+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
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 ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
117+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
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 e690ffaab9f0e349f722decd3ed15a1a5b59316b
134+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
201-
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
202-
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b
200+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
201+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
202+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
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 7c69026c8c40d7c1144824098059c9f1f0216167
220+
ENV POSTGIS_GIT_HASH 0903120772c9017f99c51c4b83b606be14e148b7
221221

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

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

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:15beta1-alpine3.16
1+
FROM postgres:15beta2-alpine3.16
22

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

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# "experimental" ; only for testing!
22
# multi-stage dockerfile; minimal docker version >= 17.05
3-
FROM postgres:15beta1-bullseye as builder
3+
FROM postgres:15beta2-bullseye as builder
44

55
LABEL maintainer="PostGIS Project - https://postgis.net"
66

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

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
85+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
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 ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
117+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
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 e690ffaab9f0e349f722decd3ed15a1a5b59316b
134+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -165,7 +165,7 @@ RUN set -ex \
165165
&& sfcgal-config --version \
166166
&& pcre-config --version
167167

168-
FROM postgres:15beta1-bullseye
168+
FROM postgres:15beta2-bullseye
169169

170170
RUN set -ex \
171171
&& apt-get update \
@@ -197,9 +197,9 @@ RUN set -ex \
197197
COPY --from=builder /usr/local /usr/local
198198

199199
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200-
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
201-
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
202-
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b
200+
ENV PROJ_GIT_HASH 19058f05df14b4a747c298473d0787235c108293
201+
ENV GEOS_GIT_HASH 5c7b2b5c5ef77ee991f3637c9a70975a0c5f0ee8
202+
ENV GDAL_GIT_HASH 104e1747748d204e8aff1945464a24b1f8c94c90
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 7c69026c8c40d7c1144824098059c9f1f0216167
220+
ENV POSTGIS_GIT_HASH 0903120772c9017f99c51c4b83b606be14e148b7
221221

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

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

File renamed without changes.

‎15beta1-master/update-postgis.sh‎ renamed to ‎15beta2-master/update-postgis.sh‎

File renamed without changes.

0 commit comments

Comments
 (0)