diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile index 7a24a479..68777f0d 100644 --- a/16-3.5-bundle0/bookworm/Dockerfile +++ b/16-3.5-bundle0/bookworm/Dockerfile @@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git -ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.0 -ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=43ef9b7bda813c10f845fe55f7fc6113bbd47b07 +ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.17.1 +ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=beb03d6d4c61dbd02291ef2c661c00155ddb79c9 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_1 diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile index d8cb43d8..e2438ff4 100644 --- a/16-recent/bookworm/Dockerfile +++ b/16-recent/bookworm/Dockerfile @@ -21,7 +21,7 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 -ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -30,7 +30,7 @@ ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 -ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a +ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/16-recent/bookworm/tags b/16-recent/bookworm/tags index 95b759de..24192e19 100644 --- a/16-recent/bookworm/tags +++ b/16-recent/bookworm/tags @@ -1 +1 @@ -16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent +16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile index 80414640..a410adc6 100644 --- a/17-recent/bookworm/Dockerfile +++ b/17-recent/bookworm/Dockerfile @@ -21,7 +21,7 @@ ARG PGIS1_GEOS_CHECKOUT=tags/3.13.0 ARG PGIS1_GDAL_CHECKOUT=tags/v3.9.3 ARG PGIS1_PROJ_CHECKOUT=tags/9.5.0 ARG PGIS1_SFCGAL_CHECKOUT=tags/v2.0.0 -ARG PGIS1_CGAL_CHECKOUT=tags/v6.0 +ARG PGIS1_CGAL_CHECKOUT=tags/v6.0.1 # Skip SHA1 check if PGIS1_*_CHECKOUT_SHA1 is empty or 'nocheck' # Otherwise, verify that the commit hash matches @@ -30,7 +30,7 @@ ARG PGIS1_GEOS_CHECKOUT_SHA1=d7957246c588aa9c690efe67924fd70e741a06ab ARG PGIS1_GDAL_CHECKOUT_SHA1=501754d048e07b07932ec268b6ed3c43ea0819e3 ARG PGIS1_PROJ_CHECKOUT_SHA1=0a407325fbb5bf42407a7dc5d4f948be9707e302 ARG PGIS1_SFCGAL_CHECKOUT_SHA1=5d4eb5e896c41e592534ba1e79ccc721c66d66e3 -ARG PGIS1_CGAL_CHECKOUT_SHA1=50219fc33bc53b5846e9a4257befc6baef3f395a +ARG PGIS1_CGAL_CHECKOUT_SHA1=50cfbde3b84dbeae8338268db2d78fe4fcb522de ARG PGIS1_BOOST_VERSION=1.74.0 ARG PGIS1_CMAKE_BUILD_TYPE=Release diff --git a/17-recent/bookworm/tags b/17-recent/bookworm/tags index 645dd9a4..2c9be173 100644 --- a/17-recent/bookworm/tags +++ b/17-recent/bookworm/tags @@ -1 +1 @@ -17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent +17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent diff --git a/README.md b/README.md index 371aca48..de68130d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,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-18) +## Versions (2024-10-21) We provide multi-platform image support for the following architectures: @@ -106,8 +106,8 @@ For those new to PostGIS, we recommend the following image versions: <!-- recent_begin --> | `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS | | ---- | :-: | :-: | :-: | :-: | :-: | -| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | -| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0, sfcgal=tags/v2.0.0 | +| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | +| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.0, geos=tags/3.13.0, proj=tags/9.5.0, gdal=tags/v3.9.3, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 | <!-- recent_end --> ### 🧪Debian Geo Bundle ( experimental ) diff --git a/manifest.sh b/manifest.sh index 588949d2..ea12fe03 100755 --- a/manifest.sh +++ b/manifest.sh @@ -678,11 +678,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:16-recent-bookworm \ --target ${dockername}:16-recent-bookworm || true -echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ @@ -818,11 +818,11 @@ manifest-tool push from-args \ --template ${dockername}-ARCHVARIANT:17-recent-bookworm \ --target ${dockername}:17-recent-bookworm || true -echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm" +echo "manifest: ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm" manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm \ - --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm || true + --template ${dockername}-ARCHVARIANT:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm \ + --target ${dockername}:17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm || true echo "manifest: ${dockername}:17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm" manifest-tool push from-args \ diff --git a/versions.json b/versions.json index bf59c189..cd7e0687 100644 --- a/versions.json +++ b/versions.json @@ -515,8 +515,8 @@ "PGSQL_HTTP_CHECKOUT_SHA1": "5e2bd270a9ce2b0e8e1fdf8e46b85396bd4125cd", "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0", "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49", - "TIMESCALEDB_CHECKOUT": "tags/2.17.0", - "TIMESCALEDB_CHECKOUT_SHA1": "43ef9b7bda813c10f845fe55f7fc6113bbd47b07", + "TIMESCALEDB_CHECKOUT": "tags/2.17.1", + "TIMESCALEDB_CHECKOUT_SHA1": "beb03d6d4c61dbd02291ef2c661c00155ddb79c9", "DUCKDB_CHECKOUT": "tags/v1.1.2", "DUCKDB_CHECKOUT_SHA1": "f680b7d08f56183391b581077d4baf589e1cc8bd", "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_1", @@ -553,7 +553,7 @@ }, "16-recent": { "bookworm": { - "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", + "tags": "16-recent-bookworm 16-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 16-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 16-recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "16", @@ -572,8 +572,8 @@ "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", - "CGAL_CHECKOUT": "tags/v6.0", - "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", + "CGAL_CHECKOUT": "tags/v6.0.1", + "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" } }, @@ -675,7 +675,7 @@ }, "17-recent": { "bookworm": { - "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", + "tags": "17-recent-bookworm 17-recent-postgis3.5.0-geos3.13.0-proj9.5.0-gdal3.9.3-cgal6.0.1-sfcgal2.0.0-bookworm 17-recent-postgis3.5-geos3.13-proj9.5-gdal3.9-cgal6.0-sfcgal2.0-bookworm 17-recent recent", "postgis": "recent", "readme_group": "recent", "PG_MAJOR": "17", @@ -694,8 +694,8 @@ "GEOS_CHECKOUT_SHA1": "d7957246c588aa9c690efe67924fd70e741a06ab", "SFCGAL_CHECKOUT": "tags/v2.0.0", "SFCGAL_CHECKOUT_SHA1": "5d4eb5e896c41e592534ba1e79ccc721c66d66e3", - "CGAL_CHECKOUT": "tags/v6.0", - "CGAL_CHECKOUT_SHA1": "50219fc33bc53b5846e9a4257befc6baef3f395a", + "CGAL_CHECKOUT": "tags/v6.0.1", + "CGAL_CHECKOUT_SHA1": "50cfbde3b84dbeae8338268db2d78fe4fcb522de", "BOOST_VERSION": "1.74.0" } },