Skip to content

Commit 81a0b55

Browse files
ImreSamuImreSamu
authored
update to PostGIS 3.2.1! (#285)
* update to PostGIS 3.2.1! * fix proj build: autotools vs. cmake
1 parent a71c9a0 commit 81a0b55

File tree

13 files changed

+93
-45
lines changed

13 files changed

+93
-45
lines changed

‎10-3.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.0+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.1+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‎

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

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

5-
ENV POSTGIS_VERSION 3.2.0
6-
ENV POSTGIS_SHA256 c725d1be6d57ad199bbb6393cc3546defb70de1c78fe1787f7ccef2d51c3647b
5+
ENV POSTGIS_VERSION 3.2.1
6+
ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
77

88
RUN set -eux \
99
\

‎11-3.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.0+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.1+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‎

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

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

5-
ENV POSTGIS_VERSION 3.2.0
6-
ENV POSTGIS_SHA256 c725d1be6d57ad199bbb6393cc3546defb70de1c78fe1787f7ccef2d51c3647b
5+
ENV POSTGIS_VERSION 3.2.1
6+
ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
77

88
RUN set -eux \
99
\

‎12-3.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.0+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.1+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‎

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

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

5-
ENV POSTGIS_VERSION 3.2.0
6-
ENV POSTGIS_SHA256 c725d1be6d57ad199bbb6393cc3546defb70de1c78fe1787f7ccef2d51c3647b
5+
ENV POSTGIS_VERSION 3.2.1
6+
ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
77

88
RUN set -eux \
99
\

‎13-3.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.0+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.1+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‎

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

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

5-
ENV POSTGIS_VERSION 3.2.0
6-
ENV POSTGIS_SHA256 c725d1be6d57ad199bbb6393cc3546defb70de1c78fe1787f7ccef2d51c3647b
5+
ENV POSTGIS_VERSION 3.2.1
6+
ENV POSTGIS_SHA256 1e9cc4c4f390e4c3be4f5c125a72f39dfa847412332952429952cbd731ac9ba3
77

88
RUN set -eux \
99
\

‎13-master/Dockerfile‎

Lines changed: 29 additions & 13 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 cf03cf7869778f69f8baddfbd73415bf99499663
65+
#ENV SFCGAL_GIT_HASH b547721ba083e98252101431e7df0015631784b0
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,23 +82,39 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 4ecb0abb8c3d3f5efcdd79643bc3302aa9bc6d1e
85+
ENV PROJ_GIT_HASH d4deb549982a16c0b7b324739af781d2779f2324
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
8989
&& git clone https://github.com/OSGeo/PROJ.git \
9090
&& cd PROJ \
9191
&& git checkout ${PROJ_GIT_HASH} \
92-
&& ./autogen.sh \
93-
&& ./configure --disable-static \
94-
&& make -j$(nproc) \
95-
&& make install \
92+
# check the autotools exist? https://github.com/OSGeo/PROJ/pull/3027
93+
&& if [ -f "autogen.sh" ] ; then \
94+
set -eux \
95+
&& echo "autotools version: 'autogen.sh' exists! Older version!" \
96+
&& ./autogen.sh \
97+
&& ./configure --disable-static \
98+
&& make -j$(nproc) \
99+
&& make install \
100+
; \
101+
else \
102+
set -eux \
103+
&& echo "cmake version: 'autogen.sh' does not exists! Newer version!" \
104+
&& mkdir build \
105+
&& cd build \
106+
&& cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
107+
&& make -j$(nproc) \
108+
&& make install \
109+
; \
110+
fi \
111+
\
96112
&& cd / \
97113
&& rm -fr /usr/src/PROJ
98114

99115
# geos
100116
ENV GEOS_VERSION master
101-
ENV GEOS_GIT_HASH 70d2111bd66ea848809e5738896256199d9a7cba
117+
ENV GEOS_GIT_HASH 0d9bdb0e33333d0a025874c9f257dee1c760ef25
102118

103119
RUN set -ex \
104120
&& cd /usr/src \
@@ -115,7 +131,7 @@ RUN set -ex \
115131

116132
# gdal
117133
ENV GDAL_VERSION master
118-
ENV GDAL_GIT_HASH 642888ff9f9e1814f962d4cff5082257a47e84fd
134+
ENV GDAL_GIT_HASH bcf71b709183846869e64fdfccbea4b435cf463e
119135

120136
RUN set -ex \
121137
&& cd /usr/src \
@@ -180,10 +196,10 @@ RUN set -ex \
180196

181197
COPY --from=builder /usr/local /usr/local
182198

183-
#ENV SFCGAL_GIT_HASH cf03cf7869778f69f8baddfbd73415bf99499663
184-
ENV PROJ_GIT_HASH 4ecb0abb8c3d3f5efcdd79643bc3302aa9bc6d1e
185-
ENV GEOS_GIT_HASH 70d2111bd66ea848809e5738896256199d9a7cba
186-
ENV GDAL_GIT_HASH 642888ff9f9e1814f962d4cff5082257a47e84fd
199+
#ENV SFCGAL_GIT_HASH b547721ba083e98252101431e7df0015631784b0
200+
ENV PROJ_GIT_HASH d4deb549982a16c0b7b324739af781d2779f2324
201+
ENV GEOS_GIT_HASH 0d9bdb0e33333d0a025874c9f257dee1c760ef25
202+
ENV GDAL_GIT_HASH bcf71b709183846869e64fdfccbea4b435cf463e
187203

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

202218
# install postgis
203219
ENV POSTGIS_VERSION master
204-
ENV POSTGIS_GIT_HASH 4fa57df0b3bd726346e1fd272921a29ab888b55f
220+
ENV POSTGIS_GIT_HASH b044ad843deecbb704651835b4b71f7b1ac48277
205221

206222
RUN set -ex \
207223
&& apt-get update \

‎14-3.2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
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.0+dfsg-1.pgdg110+1
6+
ENV POSTGIS_VERSION 3.2.1+dfsg-1.pgdg110+1
77

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

0 commit comments

Comments
 (0)