diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3946d63df..10e611f85 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: make-docker-images: strategy: matrix: - postgres: [9.6, 10, 11, 12, 13, '14rc1'] + postgres: [9.6, 10, 11, 12, 13, 14] postgis: ['2.5', '3.1'] variant: [default, alpine] exclude: @@ -23,13 +23,13 @@ jobs: postgis: '2.5' - postgres: 13 postgis: '2.5' - - postgres: '14rc1' + - postgres: 14 postgis: '2.5' include: - postgres: 13 postgis: master variant: default - - postgres: 14rc1 + - postgres: 14 postgis: master variant: default name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} diff --git a/13-master/Dockerfile b/13-master/Dockerfile index 642c1c5c6..bd2ee0003 100644 --- a/13-master/Dockerfile +++ b/13-master/Dockerfile @@ -81,7 +81,7 @@ RUN set -ex \ # proj ENV PROJ_VERSION master -ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f +ENV PROJ_GIT_HASH ef5c77acb2a6286f856b9ad6940f78013f6b3c54 RUN set -ex \ && cd /usr/src \ @@ -97,7 +97,7 @@ RUN set -ex \ # geos ENV GEOS_VERSION master -ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b +ENV GEOS_GIT_HASH 79f75266db60f5c69f5ae48ebc8680b2b26c9f01 RUN set -ex \ && cd /usr/src \ @@ -114,7 +114,7 @@ RUN set -ex \ # gdal ENV GDAL_VERSION master -ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38 +ENV GDAL_GIT_HASH e9fd8ce797a07df68a12298b9fd3db9ff959932d RUN set -ex \ && cd /usr/src \ @@ -172,9 +172,9 @@ RUN set -ex \ COPY --from=builder /usr/local /usr/local #ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1 -ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f -ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b -ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38 +ENV PROJ_GIT_HASH ef5c77acb2a6286f856b9ad6940f78013f6b3c54 +ENV GEOS_GIT_HASH 79f75266db60f5c69f5ae48ebc8680b2b26c9f01 +ENV GDAL_GIT_HASH e9fd8ce797a07df68a12298b9fd3db9ff959932d # Minimal command line test. RUN set -ex \ @@ -188,7 +188,7 @@ RUN set -ex \ # install postgis ENV POSTGIS_VERSION master -ENV POSTGIS_GIT_HASH 0568b9c6c628ac55c643cd017c8edb5315718d7c +ENV POSTGIS_GIT_HASH 21c3f2351e2f8ab0ca3a95ad6fbba04378f4aece RUN set -ex \ && apt-get update \ diff --git a/14rc1-3.1/Dockerfile b/14-3.1/Dockerfile similarity index 87% rename from 14rc1-3.1/Dockerfile rename to 14-3.1/Dockerfile index 242c58dba..186514420 100644 --- a/14rc1-3.1/Dockerfile +++ b/14-3.1/Dockerfile @@ -1,9 +1,9 @@ -FROM postgres:14rc1-bullseye +FROM postgres:14-bullseye LABEL maintainer="PostGIS Project - https://postgis.net" ENV POSTGIS_MAJOR 3 -ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg110+1+b1 +ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg110+1 RUN apt-get update \ && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ diff --git a/14rc1-3.1/README.md b/14-3.1/README.md similarity index 100% rename from 14rc1-3.1/README.md rename to 14-3.1/README.md diff --git a/14rc1-3.1/alpine/Dockerfile b/14-3.1/alpine/Dockerfile similarity index 95% rename from 14rc1-3.1/alpine/Dockerfile rename to 14-3.1/alpine/Dockerfile index 2940ef0f9..c65d65342 100644 --- a/14rc1-3.1/alpine/Dockerfile +++ b/14-3.1/alpine/Dockerfile @@ -1,9 +1,9 @@ -FROM postgres:14rc1-alpine +FROM postgres:14-alpine LABEL maintainer="PostGIS Project - https://postgis.net" -ENV POSTGIS_VERSION 3.1.3 -ENV POSTGIS_SHA256 885e11b26d8385aff49e605d33749a83e711180a3b1996395564ddf6346f3bb4 +ENV POSTGIS_VERSION 3.1.4 +ENV POSTGIS_SHA256 dfcbad0c6090c80bc59d3ea77d1adc4b3ade533a403761b4af6d9a44be1a6e48 #Temporary fix: # for PostGIS 2.* - building a special geos diff --git a/14rc1-3.1/alpine/initdb-postgis.sh b/14-3.1/alpine/initdb-postgis.sh similarity index 100% rename from 14rc1-3.1/alpine/initdb-postgis.sh rename to 14-3.1/alpine/initdb-postgis.sh diff --git a/14rc1-3.1/alpine/update-postgis.sh b/14-3.1/alpine/update-postgis.sh similarity index 100% rename from 14rc1-3.1/alpine/update-postgis.sh rename to 14-3.1/alpine/update-postgis.sh diff --git a/14rc1-3.1/initdb-postgis.sh b/14-3.1/initdb-postgis.sh similarity index 100% rename from 14rc1-3.1/initdb-postgis.sh rename to 14-3.1/initdb-postgis.sh diff --git a/14rc1-3.1/update-postgis.sh b/14-3.1/update-postgis.sh similarity index 100% rename from 14rc1-3.1/update-postgis.sh rename to 14-3.1/update-postgis.sh diff --git a/14rc1-master/Dockerfile b/14-master/Dockerfile similarity index 93% rename from 14rc1-master/Dockerfile rename to 14-master/Dockerfile index 3c0d0cbcf..110b54ecf 100644 --- a/14rc1-master/Dockerfile +++ b/14-master/Dockerfile @@ -1,6 +1,6 @@ # "experimental" ; only for testing! # multi-stage dockerfile; minimal docker version >= 17.05 -FROM postgres:14rc1-bullseye as builder +FROM postgres:14-bullseye as builder LABEL maintainer="PostGIS Project - https://postgis.net" @@ -81,7 +81,7 @@ RUN set -ex \ # proj ENV PROJ_VERSION master -ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f +ENV PROJ_GIT_HASH ef5c77acb2a6286f856b9ad6940f78013f6b3c54 RUN set -ex \ && cd /usr/src \ @@ -97,7 +97,7 @@ RUN set -ex \ # geos ENV GEOS_VERSION master -ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b +ENV GEOS_GIT_HASH 79f75266db60f5c69f5ae48ebc8680b2b26c9f01 RUN set -ex \ && cd /usr/src \ @@ -114,7 +114,7 @@ RUN set -ex \ # gdal ENV GDAL_VERSION master -ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38 +ENV GDAL_GIT_HASH e9fd8ce797a07df68a12298b9fd3db9ff959932d RUN set -ex \ && cd /usr/src \ @@ -140,7 +140,7 @@ RUN set -ex \ && sfcgal-config --version \ && pcre-config --version -FROM postgres:14rc1-bullseye +FROM postgres:14-bullseye RUN set -ex \ && apt-get update \ @@ -172,9 +172,9 @@ RUN set -ex \ COPY --from=builder /usr/local /usr/local #ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1 -ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f -ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b -ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38 +ENV PROJ_GIT_HASH ef5c77acb2a6286f856b9ad6940f78013f6b3c54 +ENV GEOS_GIT_HASH 79f75266db60f5c69f5ae48ebc8680b2b26c9f01 +ENV GDAL_GIT_HASH e9fd8ce797a07df68a12298b9fd3db9ff959932d # Minimal command line test. RUN set -ex \ @@ -188,7 +188,7 @@ RUN set -ex \ # install postgis ENV POSTGIS_VERSION master -ENV POSTGIS_GIT_HASH 0568b9c6c628ac55c643cd017c8edb5315718d7c +ENV POSTGIS_GIT_HASH 21c3f2351e2f8ab0ca3a95ad6fbba04378f4aece RUN set -ex \ && apt-get update \ diff --git a/14rc1-master/README.md b/14-master/README.md similarity index 100% rename from 14rc1-master/README.md rename to 14-master/README.md diff --git a/14rc1-master/initdb-postgis.sh b/14-master/initdb-postgis.sh similarity index 100% rename from 14rc1-master/initdb-postgis.sh rename to 14-master/initdb-postgis.sh diff --git a/14rc1-master/update-postgis.sh b/14-master/update-postgis.sh similarity index 100% rename from 14rc1-master/update-postgis.sh rename to 14-master/update-postgis.sh diff --git a/update.sh b/update.sh index e69ab7def..d0e7f1211 100755 --- a/update.sh +++ b/update.sh @@ -22,7 +22,6 @@ declare -A debianSuite=( [12]='bullseye-slim' [13]='bullseye-slim' [14]='bullseye-slim' - [14rc1]='bullseye-slim' ) defaultPostgisDebPkgNameVersionSuffix='3'