Skip to content

Commit

Permalink
Merge pull request #369 from ImreSamu/update_postgis341_improve_doc
Browse files Browse the repository at this point in the history
update postgis 3.4.1, improve README
  • Loading branch information
ImreSamu authored Dec 4, 2023
2 parents 3160658 + 05d285c commit e99af59
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 61 deletions.
4 changes: 2 additions & 2 deletions 12-3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM postgres:12-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 12 bullseye" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR 3
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
6 changes: 3 additions & 3 deletions 12-3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:12-alpine3.18
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.4.0
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
ENV POSTGIS_VERSION 3.4.1
ENV POSTGIS_SHA256 473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down
4 changes: 2 additions & 2 deletions 13-3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM postgres:13-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 13 bullseye" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR 3
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
6 changes: 3 additions & 3 deletions 13-3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:13-alpine3.18
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.4.0
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
ENV POSTGIS_VERSION 3.4.1
ENV POSTGIS_SHA256 473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down
4 changes: 2 additions & 2 deletions 14-3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM postgres:14-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 14 bullseye" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR 3
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
6 changes: 3 additions & 3 deletions 14-3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:14-alpine3.18
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.4.0
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
ENV POSTGIS_VERSION 3.4.1
ENV POSTGIS_SHA256 473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down
4 changes: 2 additions & 2 deletions 15-3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM postgres:15-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 15 bullseye" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR 3
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
6 changes: 3 additions & 3 deletions 15-3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.18
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.4.0
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
ENV POSTGIS_VERSION 3.4.1
ENV POSTGIS_SHA256 473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down
22 changes: 11 additions & 11 deletions 15-master/Dockerfile
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 b6d9c444f887f4c03edb05d5ee3bd75b35d67130
ENV SFCGAL_GIT_HASH 919eb1442515e4c5cd0fb03f0803beb548d24d60
ENV CGAL5X_GIT_HASH d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5
ENV SFCGAL_GIT_HASH aa1194bb946460b6ec5a29d31d6a19e9694b3df7
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 15389b39c7eeeae4cf3849f9b4d9e8481520642f
ENV PROJ_GIT_HASH 167e99d2b9f12178de6e2038e86a553f6130aea8
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -152,7 +152,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH dcde8ad8a15eabdafd3a7c3ef78d6cf20cf800de
ENV GEOS_GIT_HASH b3d6d20a94fdbe6a8401d176668a6d7d76465673
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 4e44aebda11a828211085a8ff0405966989e872e
ENV GDAL_GIT_HASH 187217953752a7ba4e39c9ad37b5f37cdfa77989
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 b6d9c444f887f4c03edb05d5ee3bd75b35d67130
ENV SFCGAL_GIT_HASH 919eb1442515e4c5cd0fb03f0803beb548d24d60
ENV PROJ_GIT_HASH 15389b39c7eeeae4cf3849f9b4d9e8481520642f
ENV GEOS_GIT_HASH dcde8ad8a15eabdafd3a7c3ef78d6cf20cf800de
ENV GDAL_GIT_HASH 4e44aebda11a828211085a8ff0405966989e872e
ENV CGAL5X_GIT_HASH d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5
ENV SFCGAL_GIT_HASH aa1194bb946460b6ec5a29d31d6a19e9694b3df7
ENV PROJ_GIT_HASH 167e99d2b9f12178de6e2038e86a553f6130aea8
ENV GEOS_GIT_HASH b3d6d20a94fdbe6a8401d176668a6d7d76465673
ENV GDAL_GIT_HASH 187217953752a7ba4e39c9ad37b5f37cdfa77989

# 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 86e698565bd5cf13a95fc70199f7e3d51a92c769
ENV POSTGIS_GIT_HASH 4338f0b59c47d651347564c74003598b4c55b8c1

RUN set -ex \
&& apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions 16-3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM postgres:16-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.4.0+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
org.opencontainers.image.description="PostGIS 3.4.1+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 16 bullseye" \
org.opencontainers.image.source="https://github.com/postgis/docker-postgis"

ENV POSTGIS_MAJOR 3
ENV POSTGIS_VERSION 3.4.0+dfsg-1.pgdg110+1
ENV POSTGIS_VERSION 3.4.1+dfsg-1.pgdg110+1

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
6 changes: 3 additions & 3 deletions 16-3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:16-alpine3.18
FROM ${BASE_IMAGE}

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

ENV POSTGIS_VERSION 3.4.0
ENV POSTGIS_SHA256 3acdf303adfd58d73543a70e6ebe99af29301262c56cf32220d42caa3efab024
ENV POSTGIS_VERSION 3.4.1
ENV POSTGIS_SHA256 473c09cbeb68c6e39c882c35e716994d2f8c1e614611162ef3d2a54716cbb74c

RUN set -eux \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down
22 changes: 11 additions & 11 deletions 16-master/Dockerfile
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 b6d9c444f887f4c03edb05d5ee3bd75b35d67130
ENV SFCGAL_GIT_HASH 919eb1442515e4c5cd0fb03f0803beb548d24d60
ENV CGAL5X_GIT_HASH d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5
ENV SFCGAL_GIT_HASH aa1194bb946460b6ec5a29d31d6a19e9694b3df7
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 15389b39c7eeeae4cf3849f9b4d9e8481520642f
ENV PROJ_GIT_HASH 167e99d2b9f12178de6e2038e86a553f6130aea8
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -152,7 +152,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH dcde8ad8a15eabdafd3a7c3ef78d6cf20cf800de
ENV GEOS_GIT_HASH b3d6d20a94fdbe6a8401d176668a6d7d76465673
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 4e44aebda11a828211085a8ff0405966989e872e
ENV GDAL_GIT_HASH 187217953752a7ba4e39c9ad37b5f37cdfa77989
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 b6d9c444f887f4c03edb05d5ee3bd75b35d67130
ENV SFCGAL_GIT_HASH 919eb1442515e4c5cd0fb03f0803beb548d24d60
ENV PROJ_GIT_HASH 15389b39c7eeeae4cf3849f9b4d9e8481520642f
ENV GEOS_GIT_HASH dcde8ad8a15eabdafd3a7c3ef78d6cf20cf800de
ENV GDAL_GIT_HASH 4e44aebda11a828211085a8ff0405966989e872e
ENV CGAL5X_GIT_HASH d314e31e9e08879cd5fbbb49343bb1d8c76dd4e5
ENV SFCGAL_GIT_HASH aa1194bb946460b6ec5a29d31d6a19e9694b3df7
ENV PROJ_GIT_HASH 167e99d2b9f12178de6e2038e86a553f6130aea8
ENV GEOS_GIT_HASH b3d6d20a94fdbe6a8401d176668a6d7d76465673
ENV GDAL_GIT_HASH 187217953752a7ba4e39c9ad37b5f37cdfa77989

# 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 86e698565bd5cf13a95fc70199f7e3d51a92c769
ENV POSTGIS_GIT_HASH 4338f0b59c47d651347564c74003598b4c55b8c1

RUN set -ex \
&& apt-get update \
Expand Down
Loading

0 comments on commit e99af59

Please sign in to comment.