diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65b85088c..0dcc4609b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/10-3.1/alpine/Dockerfile b/10-3.1/alpine/Dockerfile index 6a7bc7bc1..1560d3d2b 100644 --- a/10-3.1/alpine/Dockerfile +++ b/10-3.1/alpine/Dockerfile @@ -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 diff --git a/11-3.1/alpine/Dockerfile b/11-3.1/alpine/Dockerfile index 4b87e9a38..da76fa075 100644 --- a/11-3.1/alpine/Dockerfile +++ b/11-3.1/alpine/Dockerfile @@ -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 diff --git a/12-3.1/alpine/Dockerfile b/12-3.1/alpine/Dockerfile index 800314612..60263e99b 100644 --- a/12-3.1/alpine/Dockerfile +++ b/12-3.1/alpine/Dockerfile @@ -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 diff --git a/12-master/Dockerfile b/12-master/Dockerfile index c5f8685a8..0784a9f98 100644 --- a/12-master/Dockerfile +++ b/12-master/Dockerfile @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ diff --git a/13-3.1/alpine/Dockerfile b/13-3.1/alpine/Dockerfile index e8e0ed48c..ea2efb8d0 100644 --- a/13-3.1/alpine/Dockerfile +++ b/13-3.1/alpine/Dockerfile @@ -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 diff --git a/13-master/Dockerfile b/13-master/Dockerfile index 6252e04af..4d69d04b9 100644 --- a/13-master/Dockerfile +++ b/13-master/Dockerfile @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ @@ -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 \ diff --git a/14beta2-3.1/Dockerfile b/14beta3-3.1/Dockerfile similarity index 96% rename from 14beta2-3.1/Dockerfile rename to 14beta3-3.1/Dockerfile index 5a29a61bb..2d5388d9a 100644 --- a/14beta2-3.1/Dockerfile +++ b/14beta3-3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:14beta2 +FROM postgres:14beta3 LABEL maintainer="PostGIS Project - https://postgis.net" diff --git a/14beta2-3.1/README.md b/14beta3-3.1/README.md similarity index 100% rename from 14beta2-3.1/README.md rename to 14beta3-3.1/README.md diff --git a/14beta2-3.1/alpine/Dockerfile b/14beta3-3.1/alpine/Dockerfile similarity index 99% rename from 14beta2-3.1/alpine/Dockerfile rename to 14beta3-3.1/alpine/Dockerfile index 4341864df..f922f5bec 100644 --- a/14beta2-3.1/alpine/Dockerfile +++ b/14beta3-3.1/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:14beta2-alpine +FROM postgres:14beta3-alpine LABEL maintainer="PostGIS Project - https://postgis.net" diff --git a/14beta2-3.1/alpine/initdb-postgis.sh b/14beta3-3.1/alpine/initdb-postgis.sh similarity index 100% rename from 14beta2-3.1/alpine/initdb-postgis.sh rename to 14beta3-3.1/alpine/initdb-postgis.sh diff --git a/14beta2-3.1/alpine/update-postgis.sh b/14beta3-3.1/alpine/update-postgis.sh similarity index 100% rename from 14beta2-3.1/alpine/update-postgis.sh rename to 14beta3-3.1/alpine/update-postgis.sh diff --git a/14beta2-3.1/initdb-postgis.sh b/14beta3-3.1/initdb-postgis.sh similarity index 100% rename from 14beta2-3.1/initdb-postgis.sh rename to 14beta3-3.1/initdb-postgis.sh diff --git a/14beta2-3.1/update-postgis.sh b/14beta3-3.1/update-postgis.sh similarity index 100% rename from 14beta2-3.1/update-postgis.sh rename to 14beta3-3.1/update-postgis.sh diff --git a/9.6-3.1/alpine/Dockerfile b/9.6-3.1/alpine/Dockerfile index d45dacc8a..88cd78d9a 100644 --- a/9.6-3.1/alpine/Dockerfile +++ b/9.6-3.1/alpine/Dockerfile @@ -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 diff --git a/update.sh b/update.sh index 5442f0704..8eba3fa21 100755 --- a/update.sh +++ b/update.sh @@ -22,7 +22,7 @@ declare -A debianSuite=( [12]='buster-slim' [13]='buster-slim' [14]='buster-slim' - [14beta2]='buster-slim' + [14beta3]='buster-slim' ) defaultPostgisDebPkgNameVersionSuffix='3'