Skip to content

Commit a6a9f02

Browse files
ImreSamuImreSamu
authored
pg15beta3|postgis3.3.0rc2|postgis3.2.3|master gdal fix (#309)
* upgrade to pg 15beta3 and pgis 3.3.0rc2 ( + master ) * fix master gdal install * update to PostGIS 3.2.3
1 parent 9c0b038 commit a6a9f02

32 files changed

+130
-78
lines changed

‎.github/workflows/main.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [10, 11, 12, 13, 14, 15beta2]
18+
postgres: [10, 11, 12, 13, 14, 15beta3]
1919
postgis: ['2.5', '3.2']
2020
variant: [default, alpine]
2121
exclude:
@@ -25,7 +25,7 @@ jobs:
2525
postgis: '2.5'
2626
- postgres: 14
2727
postgis: '2.5'
28-
- postgres: 15beta2
28+
- postgres: 15beta3
2929
postgis: '2.5'
3030
include:
3131
- postgres: 13
@@ -35,12 +35,12 @@ jobs:
3535
postgis: master
3636
variant: default
3737
- postgres: 14
38-
postgis: '3.3.0rc1'
38+
postgis: '3.3.0rc2'
3939
variant: alpine
40-
- postgres: '15beta2'
41-
postgis: '3.3.0rc1'
40+
- postgres: '15beta3'
41+
postgis: '3.3.0rc2'
4242
variant: alpine
43-
- postgres: '15beta2'
43+
- postgres: '15beta3'
4444
postgis: master
4545
variant: default
4646

‎10-3.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:10-bullseye
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎10-3.2/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:10-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎11-3.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:11-bullseye
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎11-3.2/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:11-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎12-3.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:12-bullseye
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎12-3.2/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:12-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎13-3.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:13-bullseye
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎13-3.2/alpine/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM postgres:13-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎13-master/Dockerfile

+22-9
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 68fa2def43265466d70b336a2f2be70f7e19a0de
85+
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
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 fee735849e822b3b50564736546e5fe9470bbc5d
117+
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
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 76dfdcc0574a09fb7cb00e207b92be5177ee7c91
134+
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -147,8 +147,21 @@ RUN set -ex \
147147
echo "Directory 'gdal' does not exists! Newer version! " ; \
148148
fi \
149149
\
150-
&& ./autogen.sh \
151-
&& ./configure --disable-static \
150+
&& if [ -f "./autogen.sh:" ]; then \
151+
# Building with autoconf ( old/deprecated )
152+
set -eux \
153+
&& ./autogen.sh \
154+
&& ./configure --disable-static \
155+
; \
156+
else \
157+
# Building with cmake
158+
set -eux \
159+
&& mkdir build \
160+
&& cd build \
161+
&& cmake -DCMAKE_BUILD_TYPE=Release .. \
162+
; \
163+
fi \
164+
\
152165
&& make -j$(nproc) \
153166
&& make install \
154167
&& cd / \
@@ -197,9 +210,9 @@ RUN set -ex \
197210
COPY --from=builder /usr/local /usr/local
198211

199212
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200-
ENV PROJ_GIT_HASH 68fa2def43265466d70b336a2f2be70f7e19a0de
201-
ENV GEOS_GIT_HASH fee735849e822b3b50564736546e5fe9470bbc5d
202-
ENV GDAL_GIT_HASH 76dfdcc0574a09fb7cb00e207b92be5177ee7c91
213+
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
214+
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
215+
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
203216

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

218231
# install postgis
219232
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH f62924fafaa7b32cab0bf425837249bc123b10d0
233+
ENV POSTGIS_GIT_HASH 2fca9d65ced41fe2cbe36d0f9d05d109b39d70db
221234

222235
RUN set -ex \
223236
&& apt-get update \

‎14-3.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM postgres:14-bullseye
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎14-3.2/alpine/Dockerfile

+2-2
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.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎14-3.3.0rc1/Dockerfile renamed to ‎14-3.3.0rc2/Dockerfile

File renamed without changes.

‎14-3.3.0rc1/alpine/Dockerfile renamed to ‎14-3.3.0rc2/alpine/Dockerfile

+2-2
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.0rc1
6-
ENV POSTGIS_SHA256 624e13b5da7c0a8d1def882b724d06e7715a579ea5587ecce76408aaafb8775f
5+
ENV POSTGIS_VERSION 3.3.0rc2
6+
ENV POSTGIS_SHA256 ce153264f9f9f7b52cccff8b85599455ae93f9997198f9050a2f85365c136dcd
77

88
RUN set -eux \
99
\

‎14-3.3.0rc1/alpine/initdb-postgis.sh renamed to ‎14-3.3.0rc2/alpine/initdb-postgis.sh

File renamed without changes.

‎14-3.3.0rc1/alpine/update-postgis.sh renamed to ‎14-3.3.0rc2/alpine/update-postgis.sh

File renamed without changes.

‎14-master/Dockerfile

+22-9
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 68fa2def43265466d70b336a2f2be70f7e19a0de
85+
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
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 fee735849e822b3b50564736546e5fe9470bbc5d
117+
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
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 76dfdcc0574a09fb7cb00e207b92be5177ee7c91
134+
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -147,8 +147,21 @@ RUN set -ex \
147147
echo "Directory 'gdal' does not exists! Newer version! " ; \
148148
fi \
149149
\
150-
&& ./autogen.sh \
151-
&& ./configure --disable-static \
150+
&& if [ -f "./autogen.sh:" ]; then \
151+
# Building with autoconf ( old/deprecated )
152+
set -eux \
153+
&& ./autogen.sh \
154+
&& ./configure --disable-static \
155+
; \
156+
else \
157+
# Building with cmake
158+
set -eux \
159+
&& mkdir build \
160+
&& cd build \
161+
&& cmake -DCMAKE_BUILD_TYPE=Release .. \
162+
; \
163+
fi \
164+
\
152165
&& make -j$(nproc) \
153166
&& make install \
154167
&& cd / \
@@ -197,9 +210,9 @@ RUN set -ex \
197210
COPY --from=builder /usr/local /usr/local
198211

199212
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
200-
ENV PROJ_GIT_HASH 68fa2def43265466d70b336a2f2be70f7e19a0de
201-
ENV GEOS_GIT_HASH fee735849e822b3b50564736546e5fe9470bbc5d
202-
ENV GDAL_GIT_HASH 76dfdcc0574a09fb7cb00e207b92be5177ee7c91
213+
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
214+
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
215+
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
203216

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

218231
# install postgis
219232
ENV POSTGIS_VERSION master
220-
ENV POSTGIS_GIT_HASH f62924fafaa7b32cab0bf425837249bc123b10d0
233+
ENV POSTGIS_GIT_HASH 2fca9d65ced41fe2cbe36d0f9d05d109b39d70db
221234

222235
RUN set -ex \
223236
&& apt-get update \

‎15beta2-3.2/Dockerfile renamed to ‎15beta3-3.2/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:15beta2-bullseye
1+
FROM postgres:15beta3-bullseye
22

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

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.2.2+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎15beta2-3.2/alpine/Dockerfile renamed to ‎15beta3-3.2/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:15beta2-alpine3.16
1+
FROM postgres:15beta3-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.2.2
6-
ENV POSTGIS_SHA256 160685951b87ca07adf887fa25836f995ca41f269e75f14c2139334a52a16a9b
5+
ENV POSTGIS_VERSION 3.2.3
6+
ENV POSTGIS_SHA256 085aadf3fe6504a9aed0fed915d4b3c748bbbf3d0ad859b3795d055257790e11
77

88
RUN set -eux \
99
\

‎15beta2-3.2/alpine/initdb-postgis.sh renamed to ‎15beta3-3.2/alpine/initdb-postgis.sh

File renamed without changes.

‎15beta2-3.2/alpine/update-postgis.sh renamed to ‎15beta3-3.2/alpine/update-postgis.sh

File renamed without changes.

‎15beta2-3.2/initdb-postgis.sh renamed to ‎15beta3-3.2/initdb-postgis.sh

File renamed without changes.

‎15beta2-3.2/update-postgis.sh renamed to ‎15beta3-3.2/update-postgis.sh

File renamed without changes.

‎15beta2-3.3.0rc1/Dockerfile renamed to ‎15beta3-3.3.0rc2/Dockerfile

File renamed without changes.

‎15beta2-3.3.0rc1/alpine/Dockerfile renamed to ‎15beta3-3.3.0rc2/alpine/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:15beta2-alpine3.16
1+
FROM postgres:15beta3-alpine3.16
22

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

5-
ENV POSTGIS_VERSION 3.3.0rc1
6-
ENV POSTGIS_SHA256 624e13b5da7c0a8d1def882b724d06e7715a579ea5587ecce76408aaafb8775f
5+
ENV POSTGIS_VERSION 3.3.0rc2
6+
ENV POSTGIS_SHA256 ce153264f9f9f7b52cccff8b85599455ae93f9997198f9050a2f85365c136dcd
77

88
RUN set -eux \
99
\

‎15beta2-3.3.0rc1/alpine/initdb-postgis.sh renamed to ‎15beta3-3.3.0rc2/alpine/initdb-postgis.sh

File renamed without changes.

‎15beta2-3.3.0rc1/alpine/update-postgis.sh renamed to ‎15beta3-3.3.0rc2/alpine/update-postgis.sh

File renamed without changes.

0 commit comments

Comments
 (0)