From 1cf9ced260bf2674bec446a232089994da233305 Mon Sep 17 00:00:00 2001 From: Yogesh Mahajan Date: Fri, 6 Dec 2024 12:08:24 +0530 Subject: [PATCH] Fixed the issues reported while testing #7330. --- docs/en_US/container_deployment.rst | 6 ++++-- pkg/docker/entrypoint.sh | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst index c28f00f47..4a9fa6ec1 100644 --- a/docs/en_US/container_deployment.rst +++ b/docs/en_US/container_deployment.rst @@ -142,12 +142,14 @@ Override the default file path for the preferences customization at the containe /pgadmin4/preferences.json mapped file below for more information. See the format of the `Preferences JSON file `_. -**PGADMIN_CONFIG_DISTRO_FILE** +**PGADMIN_CUSTOM_CONFIG_DISTRO_FILE** *Default: /pgadmin4/config_distro.py* Override the default file path for the pgadmin configurations file.This can be used while provisioning -container with read only root file system to achieve a more secure pgadmin4 deployment for docker and kubernetes. +container with read only root file system to achieve a more secure pgadmin4 deployment for kubernetes. +Note that if you are externally mapping this file, then environment variables passed using *PGADMIN_CONFIG_* +suffix will be ignored. **PGPASS_FILE** diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh index dc539bc79..aef32e77b 100755 --- a/pkg/docker/entrypoint.sh +++ b/pkg/docker/entrypoint.sh @@ -37,8 +37,7 @@ fi file_env PGADMIN_DEFAULT_PASSWORD # TO enable custom path for config_distro, pass config distro path via environment variable. -export CONFIG_DISTRO_FILE_PATH="${PGADMIN_CONFIG_DISTRO_FILE:-/pgadmin4/config_distro.py}" - +export CONFIG_DISTRO_FILE_PATH="${PGADMIN_CUSTOM_CONFIG_DISTRO_FILE:-/pgadmin4/config_distro.py}" # Populate config_distro.py. This has some default config, as well as anything # provided by the user through the PGADMIN_CONFIG_* environment variables. # Only update the file on first launch. The empty file is created during the