Skip to content

postgresql update - 2021-08-12 #252

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

Merged
merged 4 commits into from
Aug 13, 2021
Merged

postgresql update - 2021-08-12 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc35dbb
rename 14beta2-3.1 --> 14beta3-3.1 ; make update
ImreSamu Aug 12, 2021
0aae997
update workflow matrix: 14beta2 -> 14beta3
ImreSamu Aug 12, 2021
2112875
update.sh 14beta2->14beta3
ImreSamu Aug 12, 2021
a9c4a18
manually update alpine postgis to 3.1.3 ( debian is still 3.1.2)
ImreSamu Aug 12, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
make-docker-images:
strategy:
matrix:
postgres: [9.6, 10, 11, 12, 13, '14beta2']
postgres: [9.6, 10, 11, 12, 13, '14beta3']
postgis: ['2.5', '3.1']
variant: [default, alpine]
exclude:
- postgres: 13
postgis: '2.5'
- postgres: '14beta2'
- postgres: '14beta3'
postgis: '2.5'
include:
- postgres: 12
Expand Down
4 changes: 2 additions & 2 deletions 10-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM postgres:10-alpine

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

ENV POSTGIS_VERSION 3.1.2
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
ENV POSTGIS_VERSION 3.1.3
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4

#Temporary fix:
# for PostGIS 2.* - building a special geos
Expand Down
4 changes: 2 additions & 2 deletions 11-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM postgres:11-alpine

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

ENV POSTGIS_VERSION 3.1.2
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
ENV POSTGIS_VERSION 3.1.3
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4

#Temporary fix:
# for PostGIS 2.* - building a special geos
Expand Down
4 changes: 2 additions & 2 deletions 12-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM postgres:12-alpine

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

ENV POSTGIS_VERSION 3.1.2
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
ENV POSTGIS_VERSION 3.1.3
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4

#Temporary fix:
# for PostGIS 2.* - building a special geos
Expand Down
18 changes: 9 additions & 9 deletions 12-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN set -ex \

# sfcgal
ENV SFCGAL_VERSION master
ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

RUN set -ex \
&& mkdir -p /usr/src \
Expand All @@ -79,7 +79,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026

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

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80

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

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

ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80

# Minimal command line test.
RUN set -ex \
Expand All @@ -187,7 +187,7 @@ RUN set -ex \

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 54a0c748dbb165847c1d0fe3abbe22dd48b8237a
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504

RUN set -ex \
&& apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions 13-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM postgres:13-alpine

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

ENV POSTGIS_VERSION 3.1.2
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
ENV POSTGIS_VERSION 3.1.3
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4

#Temporary fix:
# for PostGIS 2.* - building a special geos
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 @@ -61,7 +61,7 @@ RUN set -ex \

# sfcgal
ENV SFCGAL_VERSION master
ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

RUN set -ex \
&& mkdir -p /usr/src \
Expand All @@ -79,7 +79,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026

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

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80

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

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

ENV SFCGAL_GIT_HASH e4fcf6b2e166a862db568a0419fe100849d3f447
ENV PROJ_GIT_HASH d902272785a55e48f6b46a907a34a71a5220fccc
ENV GEOS_GIT_HASH 1bfc5b27493c552fd9a28823358a4c1f4c3b65f7
ENV GDAL_GIT_HASH 51e564e9364243be48da5e264c0507d7a9c546d8
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80

# Minimal command line test.
RUN set -ex \
Expand All @@ -187,7 +187,7 @@ RUN set -ex \

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 54a0c748dbb165847c1d0fe3abbe22dd48b8237a
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504

RUN set -ex \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion 14beta2-3.1/Dockerfile → 14beta3-3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:14beta2
FROM postgres:14beta3

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

Expand Down
0 14beta2-3.1/README.md → 14beta3-3.1/README.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 14beta2-3.1/alpine/Dockerfile → 14beta3-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:14beta2-alpine
FROM postgres:14beta3-alpine

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

Expand Down
0 14beta2-3.1/alpine/initdb-postgis.sh → 14beta3-3.1/alpine/initdb-postgis.sh
View file
Open in desktop
File renamed without changes.
0 14beta2-3.1/alpine/update-postgis.sh → 14beta3-3.1/alpine/update-postgis.sh
View file
Open in desktop
File renamed without changes.
0 14beta2-3.1/initdb-postgis.sh → 14beta3-3.1/initdb-postgis.sh
View file
Open in desktop
File renamed without changes.
0 14beta2-3.1/update-postgis.sh → 14beta3-3.1/update-postgis.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions 9.6-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM postgres:9.6-alpine

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

ENV POSTGIS_VERSION 3.1.2
ENV POSTGIS_SHA256 c49b6baa4afe4aed6cc7333399897aaf7540b40779a939a4d5a81d0725f6c9f8
ENV POSTGIS_VERSION 3.1.3
ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4

#Temporary fix:
# for PostGIS 2.* - building a special geos
Expand Down
2 changes: 1 addition & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ declare -A debianSuite=(
[12]='buster-slim'
[13]='buster-slim'
[14]='buster-slim'
[14beta2]='buster-slim'
[14beta3]='buster-slim'
)

defaultPostgisDebPkgNameVersionSuffix='3'
Expand Down