Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
19 changes: 1 addition & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
runner-platform: ['ubuntu-24.04', 'ubuntu-24.04-arm']
postgres: [14, 15, 16, 17, 18, 19rc1]
postgis: ['3.6']
postgis: ['3.7']
variant: [default, alpine]
include:
- postgres: 16
Expand Down Expand Up @@ -52,23 +52,6 @@ jobs:
postgis: master
variant: default
runner-platform: 'ubuntu-24.04-arm'
- postgres: 19rc1
postgis: '3.7.0rc3'
variant: alpine
runner-platform: 'ubuntu-24.04'
- postgres: 19rc1
postgis: '3.7.0rc3'
variant: alpine
runner-platform: 'ubuntu-24.04-arm'

- postgres: 18
postgis: '3.7.0rc3'
variant: alpine
runner-platform: 'ubuntu-24.04'
- postgres: 18
postgis: '3.7.0rc3'
variant: alpine
runner-platform: 'ubuntu-24.04-arm'

name: ${{ matrix.postgres }}-${{ matrix.postgis }}-${{ matrix.variant }} ${{ matrix.runner-platform }} - Build Docker image
runs-on: ${{ matrix.runner-platform }}
Expand Down
4 changes: 2 additions & 2 deletions 14-3.6/Dockerfile → 14-3.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM docker.io/postgres:14-trixie

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 14 trixie" \
org.opencontainers.image.description="PostGIS 3.7.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 14 trixie" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.6.4+dfsg-2.pgdg13+1
ENV POSTGIS_VERSION=3.7.0+dfsg-1.pgdg13+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
8 changes: 4 additions & 4 deletions 14-3.6/alpine/Dockerfile → 14-3.7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ FROM ${BASE_IMAGE}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4 spatial database extension with PostgreSQL 14 Alpine" \
org.opencontainers.image.description="PostGIS 3.7.0 spatial database extension with PostgreSQL 14 Alpine" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_VERSION=3.6.4
ENV POSTGIS_SHA256=4f80e1a4d227f088ae818f79180debd5894c075615823e0f556f73479cf1f200
ENV POSTGIS_VERSION=3.7.0
ENV POSTGIS_SHA256=306d68a115b88c59d9ffbd134b28fd1b0eccb7b0dabcbb5df2dc0b009d9de848

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN set -eux \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \
# Optional extensions: create them only if they are available.
# Since PostGIS 3.7.0rc, some builds may not include them.
# Since PostGIS 3.7, some builds may not include them.
# PostGIS 3.6.x still includes them.
# See: https://lists.osgeo.org/pipermail/postgis-devel/2026-February/030730.html
&& su postgres -c "psql -v ON_ERROR_STOP=1 -c \" \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions 15-3.6/Dockerfile → 15-3.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM docker.io/postgres:15-trixie

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 15 trixie" \
org.opencontainers.image.description="PostGIS 3.7.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 15 trixie" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.6.4+dfsg-2.pgdg13+1
ENV POSTGIS_VERSION=3.7.0+dfsg-1.pgdg13+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
8 changes: 4 additions & 4 deletions 15-3.6/alpine/Dockerfile → 15-3.7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ FROM ${BASE_IMAGE}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4 spatial database extension with PostgreSQL 15 Alpine" \
org.opencontainers.image.description="PostGIS 3.7.0 spatial database extension with PostgreSQL 15 Alpine" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_VERSION=3.6.4
ENV POSTGIS_SHA256=4f80e1a4d227f088ae818f79180debd5894c075615823e0f556f73479cf1f200
ENV POSTGIS_VERSION=3.7.0
ENV POSTGIS_SHA256=306d68a115b88c59d9ffbd134b28fd1b0eccb7b0dabcbb5df2dc0b009d9de848

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN set -eux \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \
# Optional extensions: create them only if they are available.
# Since PostGIS 3.7.0rc, some builds may not include them.
# Since PostGIS 3.7, some builds may not include them.
# PostGIS 3.6.x still includes them.
# See: https://lists.osgeo.org/pipermail/postgis-devel/2026-February/030730.html
&& su postgres -c "psql -v ON_ERROR_STOP=1 -c \" \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions 16-3.6/Dockerfile → 16-3.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM docker.io/postgres:16-trixie

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 16 trixie" \
org.opencontainers.image.description="PostGIS 3.7.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 16 trixie" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.6.4+dfsg-2.pgdg13+1
ENV POSTGIS_VERSION=3.7.0+dfsg-1.pgdg13+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
8 changes: 4 additions & 4 deletions 16-3.6/alpine/Dockerfile → 16-3.7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ FROM ${BASE_IMAGE}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4 spatial database extension with PostgreSQL 16 Alpine" \
org.opencontainers.image.description="PostGIS 3.7.0 spatial database extension with PostgreSQL 16 Alpine" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_VERSION=3.6.4
ENV POSTGIS_SHA256=4f80e1a4d227f088ae818f79180debd5894c075615823e0f556f73479cf1f200
ENV POSTGIS_VERSION=3.7.0
ENV POSTGIS_SHA256=306d68a115b88c59d9ffbd134b28fd1b0eccb7b0dabcbb5df2dc0b009d9de848

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN set -eux \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \
# Optional extensions: create them only if they are available.
# Since PostGIS 3.7.0rc, some builds may not include them.
# Since PostGIS 3.7, some builds may not include them.
# PostGIS 3.6.x still includes them.
# See: https://lists.osgeo.org/pipermail/postgis-devel/2026-February/030730.html
&& su postgres -c "psql -v ON_ERROR_STOP=1 -c \" \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions 16-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ RUN set -ex \
# CGAL and SFCGAL.
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH=e13f4e9be9def5a9f670adfa799463948796091c
ENV CGAL_GIT_HASH=653712bb5c1507b24a65677c931eda50c1f9b726
ENV SFCGAL_GIT_HASH=ac4942f2ef2ea201533586e4efe47b04afc64f77
RUN set -ex \
&& mkdir -p /usr/src \
Expand Down Expand Up @@ -182,7 +182,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# GEOS.
ENV GEOS_GIT_HASH=283e82726fbd5ecc45397f182e12e056a65b2dd7
ENV GEOS_GIT_HASH=2289bad7aac673a1bffcbbdd96944fcc57405a9c
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -198,7 +198,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# GDAL.
ENV GDAL_GIT_HASH=940f7198429fc578694b108631dfe5afd77efd2f
ENV GDAL_GIT_HASH=5d190fda3d58bee3e39176693b1deed7ec6238d4
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -345,11 +345,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH=e13f4e9be9def5a9f670adfa799463948796091c
ENV CGAL_GIT_HASH=653712bb5c1507b24a65677c931eda50c1f9b726
ENV SFCGAL_GIT_HASH=ac4942f2ef2ea201533586e4efe47b04afc64f77
ENV PROJ_GIT_HASH=5fa31c29f0a806568ed7bc76c1a557604db4a804
ENV GEOS_GIT_HASH=283e82726fbd5ecc45397f182e12e056a65b2dd7
ENV GDAL_GIT_HASH=940f7198429fc578694b108631dfe5afd77efd2f
ENV GEOS_GIT_HASH=2289bad7aac673a1bffcbbdd96944fcc57405a9c
ENV GDAL_GIT_HASH=5d190fda3d58bee3e39176693b1deed7ec6238d4

# Minimal command-line smoke test (fail fast).
RUN set -ex \
Expand All @@ -368,7 +368,7 @@ RUN set -ex \
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1

# Install PostGIS and companion development extensions.
ENV POSTGIS_GIT_HASH=4db4d8050012b7a84e70ed11629bbc71daa20b6e
ENV POSTGIS_GIT_HASH=358ee965988ba72ecd47601205c99b9e91cc037e
ENV H3_PG_GIT_HASH=f960a574eab6aebd186dedff6204711c21742f12
ENV ADDRESS_STANDARDIZER_GIT_HASH=ba9a26a013f23908657bb26574ae436b11d4b811

Expand Down
4 changes: 2 additions & 2 deletions 17-3.6/Dockerfile → 17-3.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM docker.io/postgres:17-trixie

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 17 trixie" \
org.opencontainers.image.description="PostGIS 3.7.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 17 trixie" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR=3
ENV POSTGIS_VERSION=3.6.4+dfsg-2.pgdg13+1
ENV POSTGIS_VERSION=3.7.0+dfsg-1.pgdg13+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
8 changes: 4 additions & 4 deletions 17-3.6/alpine/Dockerfile → 17-3.7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ FROM ${BASE_IMAGE}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.4 spatial database extension with PostgreSQL 17 Alpine" \
org.opencontainers.image.description="PostGIS 3.7.0 spatial database extension with PostgreSQL 17 Alpine" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_VERSION=3.6.4
ENV POSTGIS_SHA256=4f80e1a4d227f088ae818f79180debd5894c075615823e0f556f73479cf1f200
ENV POSTGIS_VERSION=3.7.0
ENV POSTGIS_SHA256=306d68a115b88c59d9ffbd134b28fd1b0eccb7b0dabcbb5df2dc0b009d9de848

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN set -eux \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; --needed for postgis_tiger_geocoder "' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \
# Optional extensions: create them only if they are available.
# Since PostGIS 3.7.0rc, some builds may not include them.
# Since PostGIS 3.7, some builds may not include them.
# PostGIS 3.6.x still includes them.
# See: https://lists.osgeo.org/pipermail/postgis-devel/2026-February/030730.html
&& su postgres -c "psql -v ON_ERROR_STOP=1 -c \" \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions 17-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ RUN set -ex \
# CGAL and SFCGAL.
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH=e13f4e9be9def5a9f670adfa799463948796091c
ENV CGAL_GIT_HASH=653712bb5c1507b24a65677c931eda50c1f9b726
ENV SFCGAL_GIT_HASH=ac4942f2ef2ea201533586e4efe47b04afc64f77
RUN set -ex \
&& mkdir -p /usr/src \
Expand Down Expand Up @@ -182,7 +182,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# GEOS.
ENV GEOS_GIT_HASH=283e82726fbd5ecc45397f182e12e056a65b2dd7
ENV GEOS_GIT_HASH=2289bad7aac673a1bffcbbdd96944fcc57405a9c
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -198,7 +198,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# GDAL.
ENV GDAL_GIT_HASH=940f7198429fc578694b108631dfe5afd77efd2f
ENV GDAL_GIT_HASH=5d190fda3d58bee3e39176693b1deed7ec6238d4
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -345,11 +345,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH=e13f4e9be9def5a9f670adfa799463948796091c
ENV CGAL_GIT_HASH=653712bb5c1507b24a65677c931eda50c1f9b726
ENV SFCGAL_GIT_HASH=ac4942f2ef2ea201533586e4efe47b04afc64f77
ENV PROJ_GIT_HASH=5fa31c29f0a806568ed7bc76c1a557604db4a804
ENV GEOS_GIT_HASH=283e82726fbd5ecc45397f182e12e056a65b2dd7
ENV GDAL_GIT_HASH=940f7198429fc578694b108631dfe5afd77efd2f
ENV GEOS_GIT_HASH=2289bad7aac673a1bffcbbdd96944fcc57405a9c
ENV GDAL_GIT_HASH=5d190fda3d58bee3e39176693b1deed7ec6238d4

# Minimal command-line smoke test (fail fast).
RUN set -ex \
Expand All @@ -368,7 +368,7 @@ RUN set -ex \
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1

# Install PostGIS and companion development extensions.
ENV POSTGIS_GIT_HASH=4db4d8050012b7a84e70ed11629bbc71daa20b6e
ENV POSTGIS_GIT_HASH=358ee965988ba72ecd47601205c99b9e91cc037e
ENV H3_PG_GIT_HASH=f960a574eab6aebd186dedff6204711c21742f12
ENV ADDRESS_STANDARDIZER_GIT_HASH=ba9a26a013f23908657bb26574ae436b11d4b811

Expand Down
3 changes: 0 additions & 3 deletions 18-3.7.0rc3/Dockerfile

This file was deleted.

Loading