From b0d605ad92f19a70b2781054ce752389cd40e01a Mon Sep 17 00:00:00 2001 From: etj Date: Thu, 4 Apr 2019 13:35:06 +0200 Subject: [PATCH] #20: use a known db for a checking SELECT --- 3.6.0/postgres/docker-entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.6.0/postgres/docker-entrypoint.sh b/3.6.0/postgres/docker-entrypoint.sh index 9135686..3135021 100755 --- a/3.6.0/postgres/docker-entrypoint.sh +++ b/3.6.0/postgres/docker-entrypoint.sh @@ -28,7 +28,7 @@ if [ "$1" = 'catalina.sh' ]; then echo "$db_host:$db_port:*:$POSTGRES_DB_USERNAME:$POSTGRES_DB_PASSWORD" > ~/.pgpass chmod 0600 ~/.pgpass for db_name in "$db_admin" "$db_gn"; do - if psql -h "$db_host" -U "$POSTGRES_DB_USERNAME" -p "$db_port" -tqc "SELECT 1 FROM pg_database WHERE datname = '$db_name'" | grep -q 1; then + if psql -h "$db_host" -U "$POSTGRES_DB_USERNAME" -p "$db_port" -tqc "SELECT 1 FROM pg_database WHERE datname = '$db_name'" postgres | grep -q 1; then echo "database '$db_name' exists; skipping createdb" else createdb -h "$db_host" -U "$POSTGRES_DB_USERNAME" -p "$db_port" -O "$POSTGRES_DB_USERNAME" "$db_name" @@ -48,4 +48,4 @@ if [ "$1" = 'catalina.sh' ]; then sed -i -e 's#5432#${jdbc.port}#g' $CATALINA_HOME/webapps/geonetwork/WEB-INF/config-db/postgres.xml fi -exec "$@" \ No newline at end of file +exec "$@"