diff --git a/example/images/ldap2pg/Dockerfile b/example/images/ldap2pg/Dockerfile index 6d617ed..df15171 100644 --- a/example/images/ldap2pg/Dockerfile +++ b/example/images/ldap2pg/Dockerfile @@ -12,7 +12,7 @@ RUN set -eux &&\ chown root:root ldap2pg &&\ chmod 755 ldap2pg -FROM danielberteaud/alpine:23.12-3 +FROM danielberteaud/alpine:24.1-2 MAINTAINER Daniel Berteaud ENV LANG=fr_FR.utf8 \ diff --git a/example/images/ldap2pg/root/entrypoint.d/10-createdb.sh b/example/images/ldap2pg/root/entrypoint.d/10-createdb.sh index 43b78cc..48ba79f 100755 --- a/example/images/ldap2pg/root/entrypoint.d/10-createdb.sh +++ b/example/images/ldap2pg/root/entrypoint.d/10-createdb.sh @@ -27,6 +27,7 @@ _EOSQL _EOSQL psql -d ${DB_NAME} <<_EOSQL ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON FUNCTIONS TO pg_database_owner; + ALTER SCHEMA public OWNER TO "${DB_OWNER}"; _EOSQL if [ -n "${DB_EXTENSIONS}" ]; then for EXT in $(echo ${DB_EXTENSIONS} | sed -e 's/,/\n/g'); do diff --git a/example/images/patroni/Dockerfile b/example/images/patroni/Dockerfile index 6bee32b..00aa021 100644 --- a/example/images/patroni/Dockerfile +++ b/example/images/patroni/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/postgres:15.23.12-5 +FROM danielberteaud/postgres:15.24.1-1 MAINTAINER Daniel Berteaud ARG PATRONI_VERSION=3.2.1 diff --git a/example/images/pg-upgrade/Dockerfile b/example/images/pg-upgrade/Dockerfile index c7b61e0..c3e1942 100644 --- a/example/images/pg-upgrade/Dockerfile +++ b/example/images/pg-upgrade/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alpine:23.12-3 +FROM danielberteaud/alpine:24.1-2 MAINTAINER Daniel Berteaud ARG PG_FROM= \ diff --git a/example/images/postgres-major-upgrade/Dockerfile b/example/images/postgres-major-upgrade/Dockerfile index 0792c2a..ab7e1f3 100644 --- a/example/images/postgres-major-upgrade/Dockerfile +++ b/example/images/postgres-major-upgrade/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alma:9.23.12-3 +FROM danielberteaud/alma:9.24.1-3 MAINTAINER Daniel Berteaud ENV PG_BASE_DATA=/data/db/ diff --git a/example/manage.nomad.hcl b/example/manage.nomad.hcl index f973801..4679d95 100644 --- a/example/manage.nomad.hcl +++ b/example/manage.nomad.hcl @@ -48,7 +48,7 @@ job "postgres-manage" { user = 1053 config { - image = "danielberteaud/wait-for:23.12-2" + image = "danielberteaud/wait-for:24.1-1" readonly_rootfs = true pids_limit = 20 } @@ -74,7 +74,7 @@ job "postgres-manage" { driver = "docker" config { - image = "danielberteaud/ldap2pg:6.0-6" + image = "danielberteaud/ldap2pg:6.0-7" readonly_rootfs = true pids_limit = 20 } diff --git a/images/ldap2pg/root/entrypoint.d/10-createdb.sh b/images/ldap2pg/root/entrypoint.d/10-createdb.sh index 43b78cc..48ba79f 100755 --- a/images/ldap2pg/root/entrypoint.d/10-createdb.sh +++ b/images/ldap2pg/root/entrypoint.d/10-createdb.sh @@ -27,6 +27,7 @@ _EOSQL _EOSQL psql -d ${DB_NAME} <<_EOSQL ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON FUNCTIONS TO pg_database_owner; + ALTER SCHEMA public OWNER TO "${DB_OWNER}"; _EOSQL if [ -n "${DB_EXTENSIONS}" ]; then for EXT in $(echo ${DB_EXTENSIONS} | sed -e 's/,/\n/g'); do diff --git a/variables.yml b/variables.yml index cbf6190..7e4308d 100644 --- a/variables.yml +++ b/variables.yml @@ -171,7 +171,7 @@ pg: # manage can create database, users and sync permissions from LDAP (using ldap2pg) manage: # Image to use - image: '[[ .docker.repo ]]ldap2pg:6.0-6' + image: '[[ .docker.repo ]]ldap2pg:6.0-7' # Resource allocation resources: @@ -200,6 +200,7 @@ pg: # owner: erp # encoding: UTF-8 # locale: fr_FR.utf8 + # template: template1 # extensions: # - uuid-ossp databases: []