Skip to content

Commit

Permalink
Fixed the issues reported while testing. #5869
Browse files Browse the repository at this point in the history
  • Loading branch information
yogeshmahajan-1903 authored Oct 9, 2024
1 parent 9169d3d commit 866db40
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 866db40

Please sign in to comment.