From 25f85fe123bc17bfa6141014a32fc55a3861e412 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Fri, 23 Aug 2019 09:53:24 +0100 Subject: [PATCH] Fix PGADMIN_SERVER_JSON_FILE environment variable support in the container. Fixes #4657 --- docs/en_US/release_notes_4_13.rst | 3 ++- pkg/docker/entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_13.rst b/docs/en_US/release_notes_4_13.rst index a009ef4e8..d06c4f263 100644 --- a/docs/en_US/release_notes_4_13.rst +++ b/docs/en_US/release_notes_4_13.rst @@ -24,4 +24,5 @@ Bug fixes | `Issue #4419 `_ - Fix a debugger error when using Python 2.7. | `Issue #4643 `_ - Fix Truncate option deselect issue for compound triggers. | `Issue #4644 `_ - Fix length and precision enable/disable issue when changing the data type for Domain node. -| `Issue #4650 `_ - Fix SQL tab issue for Views. It's a regression of compound triggers. \ No newline at end of file +| `Issue #4650 `_ - Fix SQL tab issue for Views. It's a regression of compound triggers. +| `Issue #4657 `_ - Fix PGADMIN_SERVER_JSON_FILE environment variable support in the container. \ No newline at end of file diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh index 063518576..46f5bdce9 100755 --- a/pkg/docker/entrypoint.sh +++ b/pkg/docker/entrypoint.sh @@ -33,7 +33,7 @@ if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then # Importing pgadmin4 (from this script) is enough python run_pgadmin.py - export PGADMIN_SERVER_JSON_FILE=${PGADMIN_SERVER_JSON:-/pgadmin4/servers.json} + export PGADMIN_SERVER_JSON_FILE=${PGADMIN_SERVER_JSON_FILE:-/pgadmin4/servers.json} # Pre-load any required servers if [ -f "${PGADMIN_SERVER_JSON_FILE}" ]; then /usr/local/bin/python /pgadmin4/setup.py --load-servers "${PGADMIN_SERVER_JSON_FILE}" --user ${PGADMIN_DEFAULT_EMAIL}