Skip to content

Commit fc1a773

Browse files
thomasboussekeyImreSamu
thomasboussekey
and
ImreSamu
authored
feat: Add pg18rc1 , postgis 3.6 container (#426)
- Add pg18rc1 and postgis 3.6 - and other related changes. --------- Co-authored-by: ImreSamu <[email protected]>
1 parent 204296a commit fc1a773

27 files changed

+340
-49
lines changed

‎.github/workflows/main.yml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
runner-platform: ['ubuntu-24.04', 'ubuntu-24.04-arm']
19-
postgres: [13, 14, 15, 16, 17]
19+
postgres: [13, 14, 15, 16, 17 ]
2020
postgis: ['3.5']
2121
variant: [default, alpine]
2222
include:
@@ -37,22 +37,37 @@ jobs:
3737
variant: default
3838
runner-platform: 'ubuntu-24.04-arm'
3939
- postgres: 17
40-
postgis: '3.6.0beta1'
40+
postgis: '3.6'
4141
variant: alpine
4242
runner-platform: 'ubuntu-24.04'
4343
- postgres: 17
44-
postgis: '3.6.0beta1'
44+
postgis: '3.6'
4545
variant: alpine
4646
runner-platform: 'ubuntu-24.04-arm'
47+
- postgres: 18rc1
48+
postgis: '3.6'
49+
variant: alpine
50+
runner-platform: 'ubuntu-24.04'
51+
- postgres: 18rc1
52+
postgis: '3.6'
53+
variant: alpine
54+
runner-platform: 'ubuntu-24.04-arm'
55+
- postgres: 18rc1
56+
postgis: '3.6'
57+
variant: default
58+
runner-platform: 'ubuntu-24.04'
59+
- postgres: 18rc1
60+
postgis: '3.6'
61+
variant: default
62+
runner-platform: 'ubuntu-24.04-arm'
4763

48-
49-
name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }} on ${{ matrix.runner-platform }}
64+
name: ${{ matrix.postgres }}-${{ matrix.postgis }}-${{ matrix.variant }} ${{ matrix.runner-platform }} - Build Docker image
5065
runs-on: ${{ matrix.runner-platform }}
5166
continue-on-error: ${{ matrix.postgis == 'master' }}
5267
env:
5368
VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}
5469
VARIANT: ${{ matrix.variant }}
55-
DOCKER_APT_PKG_VER: '5:28.3.2-1~ubuntu.24.04~noble'
70+
DOCKER_APT_PKG_VER: '5:28.3.3-1~ubuntu.24.04~noble'
5671

5772
steps:
5873
- name: Install/config specific version of Docker packages

‎13-3.5/alpine/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎13-3.5/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎14-3.5/alpine/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎14-3.5/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎15-3.5/alpine/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎15-3.5/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎16-3.5/alpine/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎16-3.5/update-postgis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
1313
psql --dbname="$DB" -c "
1414
-- Upgrade PostGIS (includes raster)
1515
CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION';
16-
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
16+
ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION';
1717
1818
-- Upgrade Topology
1919
CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION';

‎16-master/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8686
# cgal & sfcgal
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
89-
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
90-
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
89+
ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
90+
ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
9191
RUN set -ex \
9292
&& mkdir -p /usr/src \
9393
&& cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
120120
&& rm -fr /usr/src/cgal
121121

122122
# proj
123-
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
123+
ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
124124
RUN set -ex \
125125
&& cd /usr/src \
126126
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
150150
&& rm -fr /usr/src/PROJ
151151

152152
# geos
153-
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
153+
ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
154154
RUN set -ex \
155155
&& cd /usr/src \
156156
&& git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
166166
&& rm -fr /usr/src/geos
167167

168168
# gdal
169-
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
169+
ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
299299

300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302-
ENV CGAL_GIT_HASH b2ba32307c065676668ec24383d54ee94ec9f402
303-
ENV SFCGAL_GIT_HASH 6b64fbd4d55b20887aa12ffafd848b05629577cc
304-
ENV PROJ_GIT_HASH 27dfb11f26cae01db9b7981da7d184cfd3a50e50
305-
ENV GEOS_GIT_HASH e308bf7a0dddb6842dc2ac73b5fd5c8a5c599263
306-
ENV GDAL_GIT_HASH 47b7f08a542c4b589b17f3a2856ded74ba421d9b
302+
ENV CGAL_GIT_HASH 47938f6851b557e04e132a3358d7f6399b897749
303+
ENV SFCGAL_GIT_HASH 12316fe0992850d696bc24890ba0b4a71c3cf941
304+
ENV PROJ_GIT_HASH 2c57ef83573872e5121004daf96d1c0bbf635471
305+
ENV GEOS_GIT_HASH 79390691cfe0d428ab75bf10448b9cb82696e917
306+
ENV GDAL_GIT_HASH 1e14117dfdbb599d7b237504599d1937eb6a7d03
307307

308308
# Minimal command line test ( fail fast )
309309
RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
322322
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
323323

324324
# install postgis
325-
ENV POSTGIS_GIT_HASH 7c8cfe07df65efa1c5a715ad69fbdec06413ed2f
325+
ENV POSTGIS_GIT_HASH ff7d11679c1851caa081a730a70fd29d7e8f84e7
326326

327327
RUN set -ex \
328328
&& apt-get update \

0 commit comments

Comments
 (0)