From 866db40f4834ab6c713d226f193e3e2611c7b9d6 Mon Sep 17 00:00:00 2001 From: Yogesh Mahajan Date: Wed, 9 Oct 2024 17:05:34 +0530 Subject: [PATCH] Fixed the issues reported while testing. #5869 --- pkg/docker/entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh index c60c34153..f2d6990e0 100755 --- a/pkg/docker/entrypoint.sh +++ b/pkg/docker/entrypoint.sh @@ -15,6 +15,7 @@ fi function file_env() { local var="$1" local fileVar="${var}_FILE" + local def="${2:-}" if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then printf >&2 'error: both %s and %s are set (but are exclusive)\n' "$var" "$fileVar" exit 1 @@ -30,7 +31,9 @@ function file_env() { } # Set values for config variables that can be passed using secrets -file_env PGADMIN_CONFIG_CONFIG_DATABASE_URI +if [ -n "${PGADMIN_CONFIG_CONFIG_DATABASE_URI_FILE}" ]; then + file_env PGADMIN_CONFIG_CONFIG_DATABASE_URI +fi file_env PGADMIN_DEFAULT_PASSWORD # Populate config_distro.py. This has some default config, as well as anything