Skip to content

Commit 4668485

Browse files
thomasboussekeythomasboussekey
authored
feat: Add Pg18 GA (#430)
1 parent 3ff74e9 commit 4668485

File tree

11 files changed

+33
-34
lines changed

11 files changed

+33
-34
lines changed

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ jobs:
4444
postgis: '3.6'
4545
variant: alpine
4646
runner-platform: 'ubuntu-24.04-arm'
47-
- postgres: 18rc1
47+
- postgres: 18
4848
postgis: '3.6'
4949
variant: alpine
5050
runner-platform: 'ubuntu-24.04'
51-
- postgres: 18rc1
51+
- postgres: 18
5252
postgis: '3.6'
5353
variant: alpine
5454
runner-platform: 'ubuntu-24.04-arm'
55-
- postgres: 18rc1
55+
- postgres: 18
5656
postgis: '3.6'
5757
variant: default
5858
runner-platform: 'ubuntu-24.04'
59-
- postgres: 18rc1
59+
- postgres: 18
6060
postgis: '3.6'
6161
variant: default
6262
runner-platform: 'ubuntu-24.04-arm'

‎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=c02da896fb65cfb07ded49337e315b84d68c469a
90-
ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
89+
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
90+
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
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=b4c9ccbde81d8062114f174e1487b2afaa23b860
123+
ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
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=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
153+
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
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=b1958fa2e081739c187d6ed42d56884d9fb8b92d
169+
ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
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=c02da896fb65cfb07ded49337e315b84d68c469a
303-
ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
304-
ENV PROJ_GIT_HASH=b4c9ccbde81d8062114f174e1487b2afaa23b860
305-
ENV GEOS_GIT_HASH=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
306-
ENV GDAL_GIT_HASH=b1958fa2e081739c187d6ed42d56884d9fb8b92d
302+
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
303+
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
304+
ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
305+
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
306+
ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
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=a59d494dc8a08c42be167edaa0c9830e045e5412
325+
ENV POSTGIS_GIT_HASH=fda22140ee28de287fd61bb943cad155dc277ee2
326326

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

‎17-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=c02da896fb65cfb07ded49337e315b84d68c469a
90-
ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
89+
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
90+
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
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=b4c9ccbde81d8062114f174e1487b2afaa23b860
123+
ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
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=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
153+
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
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=b1958fa2e081739c187d6ed42d56884d9fb8b92d
169+
ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
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=c02da896fb65cfb07ded49337e315b84d68c469a
303-
ENV SFCGAL_GIT_HASH=74e826edb7d1df66eb8cc3f4a8da4db9efde33fc
304-
ENV PROJ_GIT_HASH=b4c9ccbde81d8062114f174e1487b2afaa23b860
305-
ENV GEOS_GIT_HASH=bccdbfa6a7bf77c0283eac6f47e2252b01a4a4ae
306-
ENV GDAL_GIT_HASH=b1958fa2e081739c187d6ed42d56884d9fb8b92d
302+
ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
303+
ENV SFCGAL_GIT_HASH=8426908ed0fc901bf90bac13603e9ffd7f632c7c
304+
ENV PROJ_GIT_HASH=1e3d0f23393b0b478ae3efc79dcd803437c23fb6
305+
ENV GEOS_GIT_HASH=69cce6b85195d4010e5b066f62a4c1137da92173
306+
ENV GDAL_GIT_HASH=c8056f4be79a5fae8c26c5d3a295bd10f83927ad
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=a59d494dc8a08c42be167edaa0c9830e045e5412
325+
ENV POSTGIS_GIT_HASH=fda22140ee28de287fd61bb943cad155dc277ee2
326326

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

‎18rc1-3.6/Dockerfile‎ renamed to ‎18-3.6/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
44

5-
FROM postgres:18rc1-trixie
5+
FROM postgres:18-trixie
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18rc1 trixie" \
8+
org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_MAJOR=3

‎18rc1-3.6/alpine/Dockerfile‎ renamed to ‎18-3.6/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
22
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
33
#
4-
ARG BASE_IMAGE=postgres:18rc1-alpine3.22
4+
ARG BASE_IMAGE=postgres:18-alpine3.22
55
FROM ${BASE_IMAGE}
66

77
LABEL maintainer="PostGIS Project - https://postgis.net" \
8-
org.opencontainers.image.description="PostGIS 3.6.0 spatial database extension with PostgreSQL 18rc1 Alpine" \
8+
org.opencontainers.image.description="PostGIS 3.6.0 spatial database extension with PostgreSQL 18 Alpine" \
99
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
1010

1111
ENV POSTGIS_VERSION=3.6.0

‎18rc1-3.6/alpine/initdb-postgis.sh‎ renamed to ‎18-3.6/alpine/initdb-postgis.sh‎

File renamed without changes.

‎18rc1-3.6/alpine/update-postgis.sh‎ renamed to ‎18-3.6/alpine/update-postgis.sh‎

File renamed without changes.

‎18rc1-3.6/initdb-postgis.sh‎ renamed to ‎18-3.6/initdb-postgis.sh‎

File renamed without changes.

‎18rc1-3.6/update-postgis.sh‎ renamed to ‎18-3.6/update-postgis.sh‎

File renamed without changes.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This image ensures that the default database created by the parent `postgres` im
1818

1919
Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
2020

21-
# Versions (2025-09-16)
21+
# Versions (2025-09-26)
2222

2323
Supported architecture: `amd64` (also known as X86-64)"
2424

@@ -48,6 +48,7 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
4848
| [postgis/postgis:15-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/Dockerfile) | debian:bullseye | 15 | 3.5.2 |
4949
| [postgis/postgis:16-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/Dockerfile) | debian:bullseye | 16 | 3.5.2 |
5050
| [postgis/postgis:17-3.5](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/Dockerfile) | debian:bullseye | 17 | 3.5.2 |
51+
| [postgis/postgis:18-3.6](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18-3.6) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18-3.6/Dockerfile) | debian:trixie | 18 | 3.6.0 |
5152

5253
### Alpine based
5354

@@ -67,6 +68,7 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
6768
| [postgis/postgis:16-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine/Dockerfile) | alpine:3.22 | 16 | 3.5.3 |
6869
| [postgis/postgis:17-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine/Dockerfile) | alpine:3.22 | 17 | 3.5.3 |
6970
| [postgis/postgis:17-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.6/alpine/Dockerfile) | alpine:3.22 | 17 | 3.6.0 |
71+
| [postgis/postgis:18-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18-3.6/alpine/Dockerfile) | alpine:3.22 | 18 | 3.6.0 |
7072

7173
### Test images
7274

@@ -77,8 +79,6 @@ Recommended versions for new users are: `postgis/postgis:17-3.5`, `postgis/postg
7779
| --------------- | ---------- | -- | -------- | ------- |
7880
| [postgis/postgis:16-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-master/Dockerfile) | debian:bullseye | 16 | development: postgis, geos, proj, gdal |
7981
| [postgis/postgis:17-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-master/Dockerfile) | debian:bullseye | 17 | development: postgis, geos, proj, gdal |
80-
| [postgis/postgis:18rc1-3.6](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18rc1-3.6) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18rc1-3.6/Dockerfile) | debian:trixie | 18rc1 | 3.6.0 |
81-
| [postgis/postgis:18rc1-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18rc1-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18rc1-3.6/alpine/Dockerfile) | alpine:3.22 | 18rc1 | 3.6.0 |
8282

8383
## Usage
8484

0 commit comments

Comments
 (0)