Skip to content

Commit

Permalink
Upgrade to 17beta3
Browse files Browse the repository at this point in the history 
Manually locking the PostGIS master GEOS hash to the 3.12 branch.
The GEOS master (3.13) has some test issues; the PostGIS regression test failed.
  • Loading branch information
@ImreSamu
ImreSamu committed Aug 20, 2024
1 parent 1cab507 commit b1f6b5c
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
- postgres: 16
postgis: master
variant: default
- postgres: 17beta2
- postgres: 17beta3
postgis: master
variant: default
- postgres: 16
postgis: 3.5.0alpha2
variant: alpine
- postgres: 17beta2
- postgres: 17beta3
postgis: 3.5.0alpha2
variant: alpine

Expand Down
24 changes: 12 additions & 12 deletions 15-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
RUN set -ex \
&& mkdir -p /usr/src \
&& cd /usr/src \
Expand Down Expand Up @@ -122,7 +122,7 @@ RUN set -ex \
&& rm -fr /usr/src/cgal

# proj
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -151,8 +151,8 @@ RUN set -ex \
\
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
# geos - lock 3.12 branch
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -168,7 +168,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# gdal
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e

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

# install postgis
ENV POSTGIS_GIT_HASH 95c525d310b783db4a52d85506ef3cc713238683
ENV POSTGIS_GIT_HASH 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1

RUN set -ex \
&& apt-get update \
Expand Down
24 changes: 12 additions & 12 deletions 16-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
RUN set -ex \
&& mkdir -p /usr/src \
&& cd /usr/src \
Expand Down Expand Up @@ -122,7 +122,7 @@ RUN set -ex \
&& rm -fr /usr/src/cgal

# proj
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -151,8 +151,8 @@ RUN set -ex \
\
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
# geos - lock 3.12 branch
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -168,7 +168,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# gdal
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e

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

# install postgis
ENV POSTGIS_GIT_HASH 95c525d310b783db4a52d85506ef3cc713238683
ENV POSTGIS_GIT_HASH 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1

RUN set -ex \
&& apt-get update \
Expand Down
0 17beta2-3.5.0alpha2/Dockerfile → 17beta3-3.5.0alpha2/Dockerfile
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions 17beta2-3.5.0alpha2/alpine/Dockerfile → 17beta3-3.5.0alpha2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#
ARG BASE_IMAGE=postgres:17beta2-alpine3.20
ARG BASE_IMAGE=postgres:17beta3-alpine3.20
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.5.0alpha2
Expand Down
0 17beta2-3.5.0alpha2/alpine/initdb-postgis.sh → 17beta3-3.5.0alpha2/alpine/initdb-postgis.sh
View file
File renamed without changes.
0 17beta2-3.5.0alpha2/alpine/update-postgis.sh → 17beta3-3.5.0alpha2/alpine/update-postgis.sh
View file
File renamed without changes.
30 changes: 15 additions & 15 deletions 17beta2-master/Dockerfile → 17beta3-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

ARG DOCKER_CMAKE_BUILD_TYPE=Release
ARG CGAL_GIT_BRANCH=5.6.x-branch
FROM postgres:17beta2-bullseye as builder
FROM postgres:17beta3-bullseye as builder

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

WORKDIR /
Expand Down Expand Up @@ -88,8 +88,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
# one can benefit from the latest CGAL patches while avoiding compatibility issues.
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
RUN set -ex \
&& mkdir -p /usr/src \
&& cd /usr/src \
Expand Down Expand Up @@ -122,7 +122,7 @@ RUN set -ex \
&& rm -fr /usr/src/cgal

# proj
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -151,8 +151,8 @@ RUN set -ex \
\
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
# geos - lock 3.12 branch
ENV GEOS_GIT_HASH 8fa289cf0146780a0be01e97501589b5a29224c4
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -168,7 +168,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# gdal
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -252,7 +252,7 @@ RUN set -ex \
# -------------------------------------------
# STAGE final
# -------------------------------------------
FROM postgres:17beta2-bullseye
FROM postgres:17beta3-bullseye

ARG DOCKER_CMAKE_BUILD_TYPE
ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
Expand Down Expand Up @@ -301,11 +301,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL5X_GIT_HASH dfa981a844c121f4407e1f83092ccc533197b932
ENV SFCGAL_GIT_HASH a976da3b52692f4d3c30c898eac80673f8507b6d
ENV PROJ_GIT_HASH cce46228bde5b7dfa6d3b9048865f43dfbbeda30
ENV GEOS_GIT_HASH 42546119c35e65aad72dea1477eb4a057ead631e
ENV GDAL_GIT_HASH 0c57764ec2040c4e53c0313844ea5afccdc00279
ENV CGAL5X_GIT_HASH 8730ff5d5592d883a091ac5eb13ee8f58c3344d5
ENV SFCGAL_GIT_HASH c03c1bdfe1c8effcde2be4879417dabb82cae615
ENV PROJ_GIT_HASH 2ce6c7a9b1ca44b8a7cfb1acca7ff10c8c616774
ENV GEOS_GIT_HASH d9422f5ef776c87c78dabd705e486ee08ca39be7
ENV GDAL_GIT_HASH 27a73be049c244ff3483d05a1a2a5b9779f30d2e

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

# install postgis
ENV POSTGIS_GIT_HASH 95c525d310b783db4a52d85506ef3cc713238683
ENV POSTGIS_GIT_HASH 0a8072199200a8323b5ddcfdcb89ed01dbd5f6b1

RUN set -ex \
&& apt-get update \
Expand Down
0 17beta2-master/initdb-postgis.sh → 17beta3-master/initdb-postgis.sh
View file
File renamed without changes.
0 17beta2-master/update-postgis.sh → 17beta3-master/update-postgis.sh
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This image ensures that the default database created by the parent `postgres` im

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`.

# Versions (2024-07-19)
# Versions (2024-08-20)

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

Expand Down Expand Up @@ -65,9 +65,9 @@ Recommended version for new users: `postgis/postgis:16-3.4`
| [postgis/postgis:15-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-master/Dockerfile) | debian:bullseye | 15 | development: postgis, geos, proj, gdal |
| [postgis/postgis:16-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 16 | 3.5.0alpha2 |
| [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 |
| [postgis/postgis:17beta2-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta2-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta2-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17beta2 | 3.5.0alpha2 |
| [postgis/postgis:17beta2-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta2-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta2-master/Dockerfile) | debian:bullseye | 17beta2 | development: postgis, geos, proj, gdal |

| [postgis/postgis:17beta3-3.5.0alpha2-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-3.5.0alpha2-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-3.5.0alpha2/alpine/Dockerfile) | alpine:3.20 | 17beta3 | 3.5.0alpha2 |
| [postgis/postgis:17beta3-master](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17beta3-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17beta3-master/Dockerfile) | debian:bullseye | 17beta3 | development: postgis, geos, proj, gdal |
## Usage

In order to run a basic container capable of serving a PostGIS-enabled database, start a container as follows:
Expand Down

0 comments on commit b1f6b5c

Please sign in to comment.