Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update PgSQL 17.2 16.6 15.10 14.15 13.18 12.22 #397

Merged
merged 2 commits into from
Nov 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
22 changes: 11 additions & 11 deletions 16-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
# cgal & sfcgal
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633
ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29
ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b
ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b
RUN set -ex \
&& mkdir -p /usr/src \
&& cd /usr/src \
Expand Down Expand Up @@ -120,7 +120,7 @@ RUN set -ex \
&& rm -fr /usr/src/cgal

# proj
ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4
ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6
ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -166,7 +166,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# gdal
ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990
ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633
ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29
ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4
ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6
ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990
ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b
ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b
ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094
ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2
ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba

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

# install postgis
ENV POSTGIS_GIT_HASH 77bcee79332a82a5b5fc7ae6ae47470939a855fa
ENV POSTGIS_GIT_HASH 78f1646214ca915fd34580a63989afd772736521

RUN set -ex \
&& apt-get update \
Expand Down
22 changes: 11 additions & 11 deletions 17-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
# cgal & sfcgal
ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633
ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29
ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b
ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b
RUN set -ex \
&& mkdir -p /usr/src \
&& cd /usr/src \
Expand Down Expand Up @@ -120,7 +120,7 @@ RUN set -ex \
&& rm -fr /usr/src/cgal

# proj
ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4
ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/PROJ.git \
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN set -ex \
&& rm -fr /usr/src/PROJ

# geos
ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6
ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/libgeos/geos.git \
Expand All @@ -166,7 +166,7 @@ RUN set -ex \
&& rm -fr /usr/src/geos

# gdal
ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990
ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba
RUN set -ex \
&& cd /usr/src \
&& git clone https://github.com/OSGeo/gdal.git \
Expand Down Expand Up @@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local

ARG CGAL_GIT_BRANCH
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
ENV CGAL_GIT_HASH a98031649b4d9bd61ea2934204b523d0d8a9e633
ENV SFCGAL_GIT_HASH c92aa736e1f22422b8fd4ac6eba2e041b74d3a29
ENV PROJ_GIT_HASH 54a7662dbc52963da70303ac8c9124966f4cf6b4
ENV GEOS_GIT_HASH d7c51c401213d11f5dafd56596295274433379b6
ENV GDAL_GIT_HASH 014581eece0d174ac283691e855c5f370a73d990
ENV CGAL_GIT_HASH da588c9f95ba1040801afb7e9304259d9359835b
ENV SFCGAL_GIT_HASH 8660a26173895e6d298a024a9f10fd6e27d43d8b
ENV PROJ_GIT_HASH 2d430667ce01f845a8fd9768891d45c489c77094
ENV GEOS_GIT_HASH 930487a20b6b5860eba91f9719ce0881973defc2
ENV GDAL_GIT_HASH f6945319679af19f2487cd76b1f62550fdb862ba

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

# install postgis
ENV POSTGIS_GIT_HASH 77bcee79332a82a5b5fc7ae6ae47470939a855fa
ENV POSTGIS_GIT_HASH 78f1646214ca915fd34580a63989afd772736521

RUN set -ex \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion README.md
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-10-15)
# Versions (2024-11-24)

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

Expand Down