Skip to content

Commit 25fa2c1

Browse files
ImreSamuImreSamu
authored
update to postgres 15rc2 (#315)
1 parent 0543fb8 commit 25fa2c1

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [11, 12, 13, 14, '15rc1']
18+
postgres: [11, 12, 13, 14, '15rc2']
1919
postgis: ['3.3']
2020
variant: [default, alpine]
2121
include:
@@ -32,7 +32,7 @@ jobs:
3232
- postgres: 14
3333
postgis: master
3434
variant: default
35-
- postgres: '15rc1'
35+
- postgres: '15rc2'
3636
postgis: master
3737
variant: default
3838

‎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 46762f88160e26f3a93295325177360429053388
85+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
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 fc0bf2056f0dcd3babe73d025b43946024a52e7f
117+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
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 ca1c5c4d25238192ec04f8a9abcf622534b24082
134+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH 46762f88160e26f3a93295325177360429053388
214-
ENV GEOS_GIT_HASH fc0bf2056f0dcd3babe73d025b43946024a52e7f
215-
ENV GDAL_GIT_HASH ca1c5c4d25238192ec04f8a9abcf622534b24082
213+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
214+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
215+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
216216

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

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH b8d78a0dc8694c06dafcb6d8fed95bc6cb4e6cf8
233+
ENV POSTGIS_GIT_HASH c7c8f05d8f397cc92b9f61c76eb19c13939fc1fa
234234

235235
RUN set -ex \
236236
&& 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 46762f88160e26f3a93295325177360429053388
85+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
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 fc0bf2056f0dcd3babe73d025b43946024a52e7f
117+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
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 ca1c5c4d25238192ec04f8a9abcf622534b24082
134+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH 46762f88160e26f3a93295325177360429053388
214-
ENV GEOS_GIT_HASH fc0bf2056f0dcd3babe73d025b43946024a52e7f
215-
ENV GDAL_GIT_HASH ca1c5c4d25238192ec04f8a9abcf622534b24082
213+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
214+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
215+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
216216

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

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH b8d78a0dc8694c06dafcb6d8fed95bc6cb4e6cf8
233+
ENV POSTGIS_GIT_HASH c7c8f05d8f397cc92b9f61c76eb19c13939fc1fa
234234

235235
RUN set -ex \
236236
&& apt-get update \

‎15rc1-3.3/Dockerfile renamed to ‎15rc2-3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:15rc1-bullseye
1+
FROM postgres:15rc2-bullseye
22

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

‎15rc1-3.3/alpine/Dockerfile renamed to ‎15rc2-3.3/alpine/Dockerfile

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

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

‎15rc1-3.3/alpine/initdb-postgis.sh renamed to ‎15rc2-3.3/alpine/initdb-postgis.sh

File renamed without changes.

‎15rc1-3.3/alpine/update-postgis.sh renamed to ‎15rc2-3.3/alpine/update-postgis.sh

File renamed without changes.

‎15rc1-3.3/initdb-postgis.sh renamed to ‎15rc2-3.3/initdb-postgis.sh

File renamed without changes.

‎15rc1-3.3/update-postgis.sh renamed to ‎15rc2-3.3/update-postgis.sh

File renamed without changes.

‎15rc1-master/Dockerfile renamed to ‎15rc2-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:15rc1-bullseye as builder
3+
FROM postgres:15rc2-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 46762f88160e26f3a93295325177360429053388
85+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
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 fc0bf2056f0dcd3babe73d025b43946024a52e7f
117+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
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 ca1c5c4d25238192ec04f8a9abcf622534b24082
134+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -178,7 +178,7 @@ RUN set -ex \
178178
&& sfcgal-config --version \
179179
&& pcre-config --version
180180

181-
FROM postgres:15rc1-bullseye
181+
FROM postgres:15rc2-bullseye
182182

183183
RUN set -ex \
184184
&& apt-get update \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH 46762f88160e26f3a93295325177360429053388
214-
ENV GEOS_GIT_HASH fc0bf2056f0dcd3babe73d025b43946024a52e7f
215-
ENV GDAL_GIT_HASH ca1c5c4d25238192ec04f8a9abcf622534b24082
213+
ENV PROJ_GIT_HASH a0373e762e443e0bf77b6c5968762f9b6b545a9d
214+
ENV GEOS_GIT_HASH b16166c318e83fdb4cc89573f0672c8b40beb5bc
215+
ENV GDAL_GIT_HASH 0ee692724c5717a633e9f14314c06b9811ac1618
216216

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

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH b8d78a0dc8694c06dafcb6d8fed95bc6cb4e6cf8
233+
ENV POSTGIS_GIT_HASH c7c8f05d8f397cc92b9f61c76eb19c13939fc1fa
234234

235235
RUN set -ex \
236236
&& apt-get update \

0 commit comments

Comments
 (0)