-
Notifications
You must be signed in to change notification settings - Fork 487
feat: Add pg18rc1 container, using debian-trixie #426
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
Merged
Merged
Changes from 24 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
d3b1986
feat: Add pg18beta3 container
thomasboussekey 5214678
rename 18 folder
thomasboussekey 8eb6e32
bump to postgis 3.6.0rc1'
thomasboussekey 5cff4dc
refresh images
thomasboussekey bb126c5
Merge branch 'master' into add_pg18beta2
thomasboussekey 02b0176
Update .github/workflows/main.yml
thomasboussekey b684706
manual build of 18beta3-3.5/Dockerfile
thomasboussekey 29467b5
Update .github/workflows/main.yml
thomasboussekey c3fceb7
Add manual Dockerfile for PG 18beta3
thomasboussekey 6be617a
refresh README Versions date
thomasboussekey af64000
add 18beta3-3.6.0rc1
thomasboussekey 6ac281f
add missing tests
thomasboussekey 25676be
add trixie libbost version
thomasboussekey 114f9eb
update images
thomasboussekey 6cbed5b
removed 18beta3-3.6.0rc1
thomasboussekey ac7cf42
use manual Dockerfile for 18beta3-3.5
thomasboussekey 258c476
Fix update on 18beta3 and remove Dockerfile.manual logic
thomasboussekey af2661b
remove previous version from doc
thomasboussekey 53506a4
try minimistic matrix.include entry for workflow
thomasboussekey 1e38c9e
Revert "try minimistic matrix.include entry for workflow"
thomasboussekey ba5f62c
removing include for 18beta3
thomasboussekey 6b979fb
update to 17-3.6.0rc2 ( alpine )
ImreSamu 428a442
add 18beta3-3.6.0rc2/alpine
ImreSamu 6149fe5
update (17, 18beta3) to postgis 3.6 ( alpine )
ImreSamu 693280c
remove 18beta3-3.5 ; add 18beta3-3.6 debian trixie
ImreSamu 59f2557
Merge branch 'postgis:master' into add_pg18beta2
thomasboussekey 90d4355
improve README.md
thomasboussekey fde17f9
update to 18rc1 and refresh SHA256 tags
thomasboussekey 3451186
update README.md version
ImreSamu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # | ||
| # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. | ||
| # | ||
|
|
||
| FROM postgres:18beta3-trixie | ||
|
|
||
| LABEL maintainer="PostGIS Project - https://postgis.net" \ | ||
| org.opencontainers.image.description="PostGIS 3.5.3+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 18beta3 trixie" \ | ||
| org.opencontainers.image.source="https://github.com/postgis/docker-postgis" | ||
|
|
||
| ENV POSTGIS_MAJOR 3 | ||
| ENV POSTGIS_VERSION 3.5.3+dfsg-2.pgdg13+1 | ||
ImreSamu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| RUN apt-get update \ | ||
| && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \ | ||
| && apt-get install -y --no-install-recommends \ | ||
| # ca-certificates: for accessing remote raster files; | ||
| # fix: https://github.com/postgis/docker-postgis/issues/307 | ||
| ca-certificates \ | ||
| \ | ||
| postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \ | ||
| postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN mkdir -p /docker-entrypoint-initdb.d | ||
| COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh | ||
| COPY ./update-postgis.sh /usr/local/bin | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| # | ||
| # NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY. | ||
| # | ||
| ARG BASE_IMAGE=postgres:18beta3-alpine3.22 | ||
| FROM ${BASE_IMAGE} | ||
|
|
||
| LABEL maintainer="PostGIS Project - https://postgis.net" \ | ||
| org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 18beta3 Alpine" \ | ||
| org.opencontainers.image.source="https://github.com/postgis/docker-postgis" | ||
|
|
||
| ENV POSTGIS_VERSION 3.5.3 | ||
| ENV POSTGIS_SHA256 44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437 | ||
|
|
||
| RUN set -eux \ | ||
| && apk add --no-cache --virtual .fetch-deps \ | ||
| ca-certificates \ | ||
| openssl \ | ||
| tar \ | ||
| \ | ||
| && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ | ||
| && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \ | ||
| && mkdir -p /usr/src/postgis \ | ||
| && tar \ | ||
| --extract \ | ||
| --file postgis.tar.gz \ | ||
| --directory /usr/src/postgis \ | ||
| --strip-components 1 \ | ||
| && rm postgis.tar.gz \ | ||
| \ | ||
| && apk add --no-cache --virtual .build-deps \ | ||
| \ | ||
| gdal-dev \ | ||
| geos-dev \ | ||
| proj-dev \ | ||
| proj-util \ | ||
| sfcgal-dev \ | ||
| \ | ||
| # The upstream variable, '$DOCKER_PG_LLVM_DEPS' contains | ||
| # the correct versions of 'llvm-dev' and 'clang' for the current version of PostgreSQL. | ||
| # This improvement has been discussed in https://github.com/docker-library/postgres/pull/1077 | ||
| $DOCKER_PG_LLVM_DEPS \ | ||
| \ | ||
| autoconf \ | ||
| automake \ | ||
| cunit-dev \ | ||
| file \ | ||
| g++ \ | ||
| gcc \ | ||
| gettext-dev \ | ||
| git \ | ||
| json-c-dev \ | ||
| libtool \ | ||
| libxml2-dev \ | ||
| make \ | ||
| pcre2-dev \ | ||
| perl \ | ||
| protobuf-c-dev \ | ||
| \ | ||
| # build PostGIS - with Link Time Optimization (LTO) enabled | ||
| && cd /usr/src/postgis \ | ||
| && gettextize \ | ||
| && ./autogen.sh \ | ||
| && ./configure \ | ||
| --enable-lto \ | ||
| && make -j$(nproc) \ | ||
| && make install \ | ||
| \ | ||
| # This section is for refreshing the proj data for the regression tests. | ||
| # It serves as a workaround for an issue documented at https://trac.osgeo.org/postgis/ticket/5316 | ||
| # This increases the Docker image size by about 1 MB. | ||
| && projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \ | ||
| && projsync --system-directory --file us_noaa_eshpgn \ | ||
| && projsync --system-directory --file us_noaa_prvi \ | ||
| && projsync --system-directory --file us_noaa_wmhpgn \ | ||
| # This section performs a regression check. | ||
| && mkdir /tempdb \ | ||
| && chown -R postgres:postgres /tempdb \ | ||
| && su postgres -c 'pg_ctl -D /tempdb init' \ | ||
| && su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \ | ||
| && cd regress \ | ||
| && make -j$(nproc) check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \ | ||
| \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"' \ | ||
| && 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 address_standardizer;"' \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS address_standardizer_data_us;"' \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;"' \ | ||
| && su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_topology;"' \ | ||
| && su postgres -c 'psql -t -c "SELECT version();"' >> /_pgis_full_version.txt \ | ||
| && su postgres -c 'psql -t -c "SELECT PostGIS_Full_Version();"' >> /_pgis_full_version.txt \ | ||
| && su postgres -c 'psql -t -c "\dx"' >> /_pgis_full_version.txt \ | ||
| \ | ||
| && su postgres -c 'pg_ctl -D /tempdb --mode=immediate stop' \ | ||
| && rm -rf /tempdb \ | ||
| && rm -rf /tmp/logfile \ | ||
| && rm -rf /tmp/pgis_reg \ | ||
| # add .postgis-rundeps | ||
| && apk add --no-cache --virtual .postgis-rundeps \ | ||
| \ | ||
| gdal \ | ||
| geos \ | ||
| proj \ | ||
| sfcgal \ | ||
| \ | ||
| json-c \ | ||
| libstdc++ \ | ||
| pcre2 \ | ||
| protobuf-c \ | ||
| \ | ||
| # ca-certificates: for accessing remote raster files | ||
| # fix https://github.com/postgis/docker-postgis/issues/307 | ||
| ca-certificates \ | ||
| # clean | ||
| && cd / \ | ||
| && rm -rf /usr/src/postgis \ | ||
| && apk del .fetch-deps .build-deps \ | ||
| # At the end of the build, we print the collected information | ||
| # from the '/_pgis_full_version.txt' file. This is for experimental and internal purposes. | ||
| && cat /_pgis_full_version.txt | ||
|
|
||
| COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh | ||
| COPY ./update-postgis.sh /usr/local/bin |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| # Perform all actions as $POSTGRES_USER | ||
| export PGUSER="$POSTGRES_USER" | ||
|
|
||
| # Create the 'template_postgis' template db | ||
| "${psql[@]}" <<- 'EOSQL' | ||
| CREATE DATABASE template_postgis IS_TEMPLATE true; | ||
| EOSQL | ||
|
|
||
| # Load PostGIS into both template_database and $POSTGRES_DB | ||
| for DB in template_postgis "$POSTGRES_DB"; do | ||
| echo "Loading PostGIS extensions into $DB" | ||
| "${psql[@]}" --dbname="$DB" <<-'EOSQL' | ||
| CREATE EXTENSION IF NOT EXISTS postgis; | ||
| CREATE EXTENSION IF NOT EXISTS postgis_topology; | ||
| -- Reconnect to update pg_setting.resetval | ||
| -- See https://github.com/postgis/docker-postgis/issues/288 | ||
| \c | ||
| CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; | ||
| CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder; | ||
| EOSQL | ||
| done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| # Perform all actions as $POSTGRES_USER | ||
| export PGUSER="$POSTGRES_USER" | ||
|
|
||
| POSTGIS_VERSION="${POSTGIS_VERSION%%+*}" | ||
|
|
||
| # Load PostGIS into both template_database and $POSTGRES_DB | ||
| for DB in template_postgis "$POSTGRES_DB" "${@}"; do | ||
| echo "Updating PostGIS extensions '$DB' to $POSTGIS_VERSION" | ||
| psql --dbname="$DB" -c " | ||
| -- Upgrade PostGIS (includes raster) | ||
| CREATE EXTENSION IF NOT EXISTS postgis VERSION '$POSTGIS_VERSION'; | ||
| ALTER EXTENSION postgis UPDATE TO '$POSTGIS_VERSION'; | ||
| -- Upgrade Topology | ||
| CREATE EXTENSION IF NOT EXISTS postgis_topology VERSION '$POSTGIS_VERSION'; | ||
| ALTER EXTENSION postgis_topology UPDATE TO '$POSTGIS_VERSION'; | ||
| -- Install Tiger dependencies in case not already installed | ||
| CREATE EXTENSION IF NOT EXISTS fuzzystrmatch; | ||
| -- Upgrade US Tiger Geocoder | ||
| CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder VERSION '$POSTGIS_VERSION'; | ||
| ALTER EXTENSION postgis_tiger_geocoder UPDATE TO '$POSTGIS_VERSION'; | ||
| " | ||
| done |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.