From 7d1e112dfc1b16f18ac8b842c71fa02def7fac1f Mon Sep 17 00:00:00 2001 From: Jens Willmer Date: Tue, 8 Jun 2021 22:10:58 +0200 Subject: [PATCH] Fix for issue #14 - Use db_name in query As pointed out by @wglambert the db_name needs to be specified when POSTGRES_DB was set: https://github.com/docker-library/postgres/issues/854#issuecomment-856877311 --- .../etc/services.available/10-db-backup/run | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run index 1e52233..03632d9 100755 --- a/install/etc/services.available/10-db-backup/run +++ b/install/etc/services.available/10-db-backup/run @@ -203,7 +203,9 @@ backup_mysql() { backup_pgsql() { if var_true $SPLIT_DB ; then export PGPASSWORD=${dbpass} - DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' ) + authdb=${DB_USER} + [ -n "${DB_NAME}" ] && authdb=${DB_NAME} + DATABASES=$(psql -h $dbhost -U $dbuser -p ${dbport} -d ${authdb} -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' ) for db in $DATABASES; do print_info "Dumping database: $db" target=pgsql_${db}_${dbhost}_${now}.sql @@ -213,13 +215,13 @@ backup_pgsql() { generate_md5 move_backup done - else - export PGPASSWORD=${dbpass} - compression - pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target} - exit_code=$? - generate_md5 - move_backup + else + export PGPASSWORD=${dbpass} + compression + pg_dump -h ${dbhost} -U ${dbuser} -p ${dbport} ${dbname} ${EXTRA_OPTS} | $dumpoutput > ${tmpdir}/${target} + exit_code=$? + generate_md5 + move_backup fi }