From 03aeb2538ec1b09ecb704dada08d6d782015f97a Mon Sep 17 00:00:00 2001 From: karmaking Date: Wed, 26 Feb 2025 13:09:32 +0100 Subject: [PATCH 1/6] fix/update prestart with new env vars --- Dockerfiles/prestart.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index f0b236e..ac32359 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -11,7 +11,7 @@ import ( func main() { // Define the host env variables to be replaced at build time - config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST"} + config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_LOGO_URL", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION"} configMap := make(map[string]string) for _, key := range config { From c5044690b13ab6ebc7966fd322ace34d8357599f Mon Sep 17 00:00:00 2001 From: tawoe Date: Wed, 26 Feb 2025 16:21:46 +0100 Subject: [PATCH 2/6] process non url container env --- Dockerfiles/prestart.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index ac32359..d94d9fa 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -11,12 +11,23 @@ import ( func main() { // Define the host env variables to be replaced at build time - config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_LOGO_URL", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION"} + url_config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST", "VITE_OBP_LOGO_URL"} + config := []string{"VITE_OBP_API_VERSION", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION"} configMap := make(map[string]string) for _, key := range config { + value := os.Getenv(key) + if value == "" { + fmt.Printf("Skipping: Environment variable %s is not set\n", key) + continue + } + configMap[key] = value + } + + for _, key := range url_config { rawURL := os.Getenv(key) if rawURL == "" { + fmt.Printf("Skipping: Environment variable %s is not set\n", key) continue } cleanURL := checkURL(rawURL) From 663caec8184e57346b7c13c116fc90219eba8961 Mon Sep 17 00:00:00 2001 From: tawoe Date: Wed, 26 Feb 2025 16:25:26 +0100 Subject: [PATCH 3/6] fix go import --- Dockerfiles/prestart.go | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index d94d9fa..341f0cf 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -7,6 +7,7 @@ import ( "path/filepath" "regexp" "strings" + "fmt" ) func main() { From 48020771efdd7395f159cad3ce760eee03a21031 Mon Sep 17 00:00:00 2001 From: tawoe Date: Wed, 26 Feb 2025 16:33:52 +0100 Subject: [PATCH 4/6] update frontend env --- Dockerfiles/frontend_build.env | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/frontend_build.env b/Dockerfiles/frontend_build.env index e54a1f1..f6e74cf 100644 --- a/Dockerfiles/frontend_build.env +++ b/Dockerfiles/frontend_build.env @@ -1,5 +1,10 @@ VITE_OBP_API_HOST=VITE_OBP_API_HOST VITE_OBP_API_PORTAL_HOST=VITE_OBP_API_PORTAL_HOST VITE_OBP_API_MANAGER_HOST=VITE_OBP_API_MANAGER_HOST -VITE_OBP_API_VERSION=v5.1.0 - +VITE_OBP_LOGO_URL=VITE_OBP_LOGO_URL +VITE_OBP_API_VERSION=VITE_OBP_API_VERSION +VITE_OBP_LINKS_COLOR=VITE_OBP_LINKS_COLOR +VITE_OBP_HEADER_LINKS_COLOR=VITE_OBP_HEADER_LINKS_COLOR +VITE_OBP_HEADER_LINKS_HOVER_COLOR=VITE_OBP_HEADER_LINKS_HOVER_COLOR +VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR=VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR +VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION=VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION From 46049874d7b54314b6d88fbc75cdd0bfd5e464e8 Mon Sep 17 00:00:00 2001 From: tawoe Date: Wed, 26 Feb 2025 16:54:34 +0100 Subject: [PATCH 5/6] enable chatbot config container --- Dockerfiles/frontend_build.env | 2 ++ Dockerfiles/prestart.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/frontend_build.env b/Dockerfiles/frontend_build.env index f6e74cf..f1b9724 100644 --- a/Dockerfiles/frontend_build.env +++ b/Dockerfiles/frontend_build.env @@ -8,3 +8,5 @@ VITE_OBP_HEADER_LINKS_COLOR=VITE_OBP_HEADER_LINKS_COLOR VITE_OBP_HEADER_LINKS_HOVER_COLOR=VITE_OBP_HEADER_LINKS_HOVER_COLOR VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR=VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION=VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION +VITE_CHATBOT_ENABLED=VITE_CHATBOT_ENABLED +VITE_CHATBOT_URL=VITE_CHATBOT_URL \ No newline at end of file diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index 341f0cf..e759fdb 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -13,7 +13,7 @@ import ( func main() { // Define the host env variables to be replaced at build time url_config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST", "VITE_OBP_LOGO_URL"} - config := []string{"VITE_OBP_API_VERSION", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION"} + config := []string{"VITE_OBP_API_VERSION", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION", "VITE_CHATBOT_ENABLED", "VITE_CHATBOT_URL"} configMap := make(map[string]string) for _, key := range config { From 13ec4b145345a6dc96abcc29882b7679d6b60753 Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 27 Feb 2025 11:13:52 +0100 Subject: [PATCH 6/6] commenting prestart.go --- Dockerfiles/prestart.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index e759fdb..5d48e2e 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -10,9 +10,16 @@ import ( "fmt" ) +// As the frontend environment is read at build time, we need to reprocess the values +// at container runtime. +// This app will search and replace the values set at build time from this build environment: Dockerfiles/frontend_build.env +// with values taken from the container environment. + func main() { - // Define the host env variables to be replaced at build time + // Define the build env variables to be replaced at container run time + // url config variables are expected to be a valid URL in the container environment url_config := []string{"VITE_OBP_API_HOST", "VITE_OBP_API_MANAGER_HOST", "VITE_OBP_API_PORTAL_HOST", "VITE_OBP_LOGO_URL"} + // DANGERZONE: The following strings will be replaced by container environment variables without any checking of whatever!!! config := []string{"VITE_OBP_API_VERSION", "VITE_OBP_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_COLOR", "VITE_OBP_HEADER_LINKS_HOVER_COLOR", "VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR", "VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION", "VITE_CHATBOT_ENABLED", "VITE_CHATBOT_URL"} configMap := make(map[string]string)