Skip to content

Commit 8fe5f5c

Browse files
ImreSamuImreSamu
authored
alpine3.16 / pg15beta1 / postgis3.3.0alpha1 / improved README.md (#295)
* Remove Postgres 9.6 (EOL) * update alpine to alpine:3.16 * update latest tag to 14-3.2 * refactoring update.sh * update alpine,master dockerfiles * add new test images * update github workflow : remove 9.6, add new test images * update README files * remove 15beta1-3.2.1 test version (not working) * refactor update.sh
1 parent f34a818 commit 8fe5f5c

File tree

27 files changed

+986
-91
lines changed

27 files changed

+986
-91
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Dockerfile
22
.git
3+
_*

‎.github/workflows/main.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ jobs:
3232
- postgres: 14
3333
postgis: master
3434
variant: default
35+
- postgres: 14
36+
postgis: '3.3.0alpha1'
37+
variant: alpine
38+
- postgres: '15beta1'
39+
postgis: '3.3.0alpha1'
40+
variant: alpine
41+
- postgres: '15beta1'
42+
postgis: master
43+
variant: default
44+
3545
name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
3646
runs-on: ubuntu-20.04
3747
continue-on-error: ${{ matrix.postgis == 'master' }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_*

‎10-2.5/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:10-alpine3.15
1+
FROM postgres:10-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎10-3.2/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:10-alpine3.15
1+
FROM postgres:10-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎11-2.5/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11-alpine3.15
1+
FROM postgres:11-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎11-3.2/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11-alpine3.15
1+
FROM postgres:11-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎12-3.2/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:12-alpine3.15
1+
FROM postgres:12-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎13-3.2/alpine/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:13-alpine3.15
1+
FROM postgres:13-alpine3.16
22

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

@@ -10,14 +10,14 @@ RUN set -eux \
1010
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
1111
set -eux ; \
1212
#
13-
# using only v3.15
13+
# using only v3.16
1414
#
15-
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
15+
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
1616
export GEOS_ALPINE_VER=3.10 ; \
17-
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
18-
export GDAL_ALPINE_VER=3.4 ; \
19-
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
20-
export PROJ_ALPINE_VER=8.2 ; \
17+
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
18+
export GDAL_ALPINE_VER=3.5 ; \
19+
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
20+
export PROJ_ALPINE_VER=9.0 ; \
2121
#
2222
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
2323
set -eux ; \

‎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 54b78af7b42f0f348f34879616a5da480b8e4974
65+
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
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 9f89c7288e44c64ba234a299b1d5528a54d9d61e
85+
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
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 2a82afc1ac2327966f56bdf35a6d88aaadb81330
117+
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
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 e1f2b40558cb61dc9ecd3de3282da7115c129c4f
134+
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b
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 54b78af7b42f0f348f34879616a5da480b8e4974
200-
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
201-
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
202-
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
199+
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
200+
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
201+
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
202+
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b
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 6febe57e76d2239ea9779c489eff376f3ed76e72
220+
ENV POSTGIS_GIT_HASH 7c69026c8c40d7c1144824098059c9f1f0216167
221221

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

0 commit comments

Comments
 (0)