Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

alpine3.16 / pg15beta1 / postgis3.3.0alpha1 / improved README.md #295

Merged
merged 11 commits into from
Jun 22, 2022
Merged

alpine3.16 / pg15beta1 / postgis3.3.0alpha1 / improved README.md #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e15ec44
Remove Postgres 9.6 (EOL)
ImreSamu May 28, 2022
498b1a1
update alpine to alpine:3.16
ImreSamu May 28, 2022
3f5f209
update latest tag to 14-3.2
ImreSamu May 28, 2022
b322b65
refactoring update.sh
ImreSamu May 28, 2022
5321458
update alpine,master dockerfiles
ImreSamu May 28, 2022
4c93132
add new test images
ImreSamu May 28, 2022
cbed9c5
update github workflow : remove 9.6, add new test images
ImreSamu May 28, 2022
fdf0b05
update README files
ImreSamu May 28, 2022
89fae44
remove 15beta1-3.2.1 test version (not working)
ImreSamu May 28, 2022
331f94d
refactor update.sh
ImreSamu Jun 22, 2022
fd8d907
update README
ImreSamu Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Dockerfile
.git
_*
10 changes: 10 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ jobs:
- postgres: 14
postgis: master
variant: default
- postgres: 14
postgis: '3.3.0alpha1'
variant: alpine
- postgres: '15beta1'
postgis: '3.3.0alpha1'
variant: alpine
- postgres: '15beta1'
postgis: master
variant: default

name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.postgis == 'master' }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_*
14 changes: 7 additions & 7 deletions 10-2.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10-alpine3.15
FROM postgres:10-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
14 changes: 7 additions & 7 deletions 10-3.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10-alpine3.15
FROM postgres:10-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
14 changes: 7 additions & 7 deletions 11-2.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:11-alpine3.15
FROM postgres:11-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
14 changes: 7 additions & 7 deletions 11-3.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:11-alpine3.15
FROM postgres:11-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
14 changes: 7 additions & 7 deletions 12-3.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:12-alpine3.15
FROM postgres:12-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
14 changes: 7 additions & 7 deletions 13-3.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:13-alpine3.15
FROM postgres:13-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
18 changes: 9 additions & 9 deletions 13-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN set -ex \
# sfcgal
ENV SFCGAL_VERSION master
#current:
#ENV SFCGAL_GIT_HASH 54b78af7b42f0f348f34879616a5da480b8e4974
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
#reverted for the last working version
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

Expand All @@ -82,7 +82,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -114,7 +114,7 @@ RUN set -ex \

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3

RUN set -ex \
&& cd /usr/src \
Expand All @@ -131,7 +131,7 @@ RUN set -ex \

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -196,10 +196,10 @@ RUN set -ex \

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

#ENV SFCGAL_GIT_HASH 54b78af7b42f0f348f34879616a5da480b8e4974
ENV PROJ_GIT_HASH 9f89c7288e44c64ba234a299b1d5528a54d9d61e
ENV GEOS_GIT_HASH 2a82afc1ac2327966f56bdf35a6d88aaadb81330
ENV GDAL_GIT_HASH e1f2b40558cb61dc9ecd3de3282da7115c129c4f
#ENV SFCGAL_GIT_HASH cc4e1c1b2ac1be65fd738685137eb0d417a1599d
ENV PROJ_GIT_HASH 2aa8bc64abc5d10a47fad206fbdcc96c5e75d1d1
ENV GEOS_GIT_HASH ed025b64ecbba7b97e843ad8bb3e2ee06e9e90e3
ENV GDAL_GIT_HASH e690ffaab9f0e349f722decd3ed15a1a5b59316b

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

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 6febe57e76d2239ea9779c489eff376f3ed76e72
ENV POSTGIS_GIT_HASH 7c69026c8c40d7c1144824098059c9f1f0216167

RUN set -ex \
&& apt-get update \
Expand Down
14 changes: 7 additions & 7 deletions 14-3.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:14-alpine3.15
FROM postgres:14-alpine3.16

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

Expand All @@ -10,14 +10,14 @@ RUN set -eux \
&& if [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
set -eux ; \
#
# using only v3.15
# using only v3.16
#
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.15 \
#GEOS: https://pkgs.alpinelinux.org/packages?name=geos&branch=v3.16 \
export GEOS_ALPINE_VER=3.10 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.15 \
export GDAL_ALPINE_VER=3.4 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.15 \
export PROJ_ALPINE_VER=8.2 ; \
#GDAL: https://pkgs.alpinelinux.org/packages?name=gdal&branch=v3.16 \
export GDAL_ALPINE_VER=3.5 ; \
#PROJ: https://pkgs.alpinelinux.org/packages?name=proj&branch=v3.16 \
export PROJ_ALPINE_VER=9.0 ; \
#
elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
set -eux ; \
Expand Down
3 changes: 3 additions & 0 deletions 14-3.3.0alpha1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# placeholder Dockerfile
# Debian version of postgis is not detected!
# This is an autogenerated message of ./update.sh
Loading