From e29ea15554b0939be993f4060246fd15d68fb525 Mon Sep 17 00:00:00 2001 From: Levitt Olivier Date: Tue, 17 Dec 2019 13:15:04 +0530 Subject: [PATCH] =?UTF-8?q?Fix=20an=20issue=20where=C2=A0servers.json=20im?= =?UTF-8?q?port=20fails=20when=20running=20in=20desktop=20mode.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/docker/entrypoint.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh index 47d14bf2d..d83b61dbb 100755 --- a/pkg/docker/entrypoint.sh +++ b/pkg/docker/entrypoint.sh @@ -37,7 +37,13 @@ if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then 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} + # When running in Desktop mode, no user is created + # so we have to import servers anonymously + if [ "${PGADMIN_CONFIG_SERVER_MODE}" = "False" ]; then + /usr/local/bin/python /pgadmin4/setup.py --load-servers "${PGADMIN_SERVER_JSON_FILE}" + else + /usr/local/bin/python /pgadmin4/setup.py --load-servers "${PGADMIN_SERVER_JSON_FILE}" --user ${PGADMIN_DEFAULT_EMAIL} + fi fi fi