updates ...

.dockerignore

@@ -1,6 +1,7 @@
 .git
 _*
 .jq-template.awk
+.template-helper-functions.jq
 .vscode/
 
 .git/

.gitignore

@@ -1,3 +1,4 @@
 .jq-template.awk
+.template-helper-functions.jq
 _*
 .vscode/

Dockerfile.bundle0.template

@@ -301,7 +301,7 @@ RUN set -eux \
         pgtap \
         pgtop \
         pspg \
-        \
+        vip-manager \
         \
         postgresql-$PG_MAJOR-asn1oid \
         postgresql-$PG_MAJOR-cron \
@@ -318,8 +318,10 @@ RUN set -eux \
         postgresql-$PG_MAJOR-pg-fact-loader \
         postgresql-$PG_MAJOR-pg-failover-slots \
         postgresql-$PG_MAJOR-pg-stat-kcache \
+        postgresql-$PG_MAJOR-pg-wait-sampling \
         postgresql-$PG_MAJOR-pgaudit \
 #       postgresql-$PG_MAJOR-pgdg-pgroonga \  # todo: check
+        postgresql-$PG_MAJOR-pgl-ddl-deploy \
         postgresql-$PG_MAJOR-pglogical \
         postgresql-$PG_MAJOR-pgmp \
         postgresql-$PG_MAJOR-pgpcre \

Dockerfile.master.template

@@ -7,7 +7,7 @@ ARG PGIS1_POSTGIS_REPOSITORY=https://github.com/postgis/postgis.git
 ARG PGIS1_GEOS_REPOSITORY=https://github.com/libgeos/geos.git
 ARG PGIS1_GDAL_REPOSITORY=https://github.com/OSGeo/gdal.git
 ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git
-ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git
+ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/sfcgal/SFCGAL.git
 ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git
 
 ARG PGIS1_POSTGIS_CHECKOUT={{ .[env.variant].POSTGIS_CHECKOUT }}

apply-templates.sh

@@ -20,6 +20,13 @@ elif [ "${BASH_SOURCE[0]}" -nt "$jqt" ]; then
     wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk'
 fi
 
+jqf='.template-helper-functions.jq'
+if [ -n "${BASHBREW_SCRIPTS:-}" ]; then
+	jqf="$BASHBREW_SCRIPTS/template-helper-functions.jq"
+elif [ "$BASH_SOURCE" -nt "$jqf" ]; then
+	wget -qO "$jqf" 'https://github.com/docker-library/bashbrew/raw/master/scripts/template-helper-functions.jq'
+fi
+
 if [ "$#" -eq 0 ]; then
     versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)"
     eval "set -- $versions"

versions.sh

@@ -144,7 +144,7 @@ fi
 
 packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
 cgal5XGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/5.6.x-branch | awk '{ print $1}')"
-sfcgalGitHash="$(git ls-remote https://gitlab.com/Oslandia/SFCGAL.git heads/master | awk '{ print $1}')"
+sfcgalGitHash="$(git ls-remote https://gitlab.com/sfcgal/SFCGAL.git heads/master | awk '{ print $1}')"
 projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')"
 gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')"
 geosGitHash="$(git ls-remote https://github.com/libgeos/geos.git heads/main | awk '{ print $1}')"
@@ -204,7 +204,7 @@ get_latest_version_and_hash "https://github.com/CGAL/cgal" "cgal"
 get_latest_version_and_hash "https://github.com/libgeos/geos" "geos"
 get_latest_version_and_hash "https://github.com/OSGeo/gdal" "gdal"
 get_latest_version_and_hash "https://github.com/OSGeo/PROJ" "proj"
-get_latest_version_and_hash "https://gitlab.com/Oslandia/SFCGAL" "sfcgal"
+get_latest_version_and_hash "https://gitlab.com/sfcgal/SFCGAL" "sfcgal"
 
 get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL16
 get_latest_version_and_hash "https://github.com/ossc-db/pg_hint_plan" "pg_hint_plan" REL15