From 37fbb259e6ec3ab0f255f4ee5a12fc8640ca5804 Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 27 Feb 2025 14:44:51 +0100 Subject: [PATCH 1/4] set default container env --- Dockerfiles/Dockerfile_frontend | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfiles/Dockerfile_frontend b/Dockerfiles/Dockerfile_frontend index bfff688..ee30d0f 100644 --- a/Dockerfiles/Dockerfile_frontend +++ b/Dockerfiles/Dockerfile_frontend @@ -16,6 +16,16 @@ COPY Dockerfiles/go.mod ./ RUN go build -v -o /usr/src/app/prestart FROM registry.access.redhat.com/ubi9/nginx-120 + +ENV VITE_OBP_LOGO_URL=https://static.openbankproject.com/images/obp_logo.png \ + VITE_OBP_API_VERSION='v5.1.0' \ + VITE_OBP_LINKS_COLOR='#39455f' \ + VITE_OBP_HEADER_LINKS_COLOR='#52b165' \ + VITE_OBP_HEADER_LINKS_HOVER_COLOR='#39455f' \ + VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR='#eef0f4' \ + VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION=OBPv5.1.0 \ + VITE_CHATBOT_ENABLED=false + USER 0 RUN dnf update -y RUN chown -R 1001 /var/log/nginx From 7220f2b27d7bf0e5fe7440560642fcd8b08baa61 Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 27 Feb 2025 17:07:22 +0100 Subject: [PATCH 2/4] allow empty apimanager container config --- Dockerfiles/prestart.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index 5d48e2e..93bb7e6 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -18,7 +18,7 @@ import ( func main() { // 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"} + url_config := []string{"VITE_OBP_API_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) @@ -42,6 +42,13 @@ func main() { configMap[key] = cleanURL } + api_manager := os.Getenv("VITE_OBP_API_MANAGER") + if api_manager == "" { + configMap["VITE_OBP_API_MANAGER"] = "" + } else { + configMap["VITE_OBP_API_MANAGER"] = checkURL(api_manager) + } + dir := "/opt/app-root/src/assets" pattern := "index-.*\\.js$" From 7470595da834f63f62bac176723552a9bf8f8aff Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 27 Feb 2025 17:29:37 +0100 Subject: [PATCH 3/4] Revert "allow empty apimanager container config" This reverts commit 7220f2b27d7bf0e5fe7440560642fcd8b08baa61. --- Dockerfiles/prestart.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index 93bb7e6..5d48e2e 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -18,7 +18,7 @@ import ( func main() { // 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_PORTAL_HOST", "VITE_OBP_LOGO_URL"} + 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) @@ -42,13 +42,6 @@ func main() { configMap[key] = cleanURL } - api_manager := os.Getenv("VITE_OBP_API_MANAGER") - if api_manager == "" { - configMap["VITE_OBP_API_MANAGER"] = "" - } else { - configMap["VITE_OBP_API_MANAGER"] = checkURL(api_manager) - } - dir := "/opt/app-root/src/assets" pattern := "index-.*\\.js$" From 5918055f9cc221e3ce0918e60d7e4c6c30532c82 Mon Sep 17 00:00:00 2001 From: tawoe Date: Thu, 27 Feb 2025 17:34:45 +0100 Subject: [PATCH 4/4] add VITE_SHOW_API_MANAGER_BUTTON to container build --- Dockerfiles/Dockerfile_frontend | 3 ++- Dockerfiles/frontend_build.env | 3 ++- Dockerfiles/prestart.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/Dockerfile_frontend b/Dockerfiles/Dockerfile_frontend index ee30d0f..cf05d92 100644 --- a/Dockerfiles/Dockerfile_frontend +++ b/Dockerfiles/Dockerfile_frontend @@ -24,7 +24,8 @@ ENV VITE_OBP_LOGO_URL=https://static.openbankproject.com/images/obp_logo.png \ VITE_OBP_HEADER_LINKS_HOVER_COLOR='#39455f' \ VITE_OBP_HEADER_LINKS_BACKGROUND_COLOR='#eef0f4' \ VITE_OBP_API_DEFAULT_RESOURCE_DOC_VERSION=OBPv5.1.0 \ - VITE_CHATBOT_ENABLED=false + VITE_CHATBOT_ENABLED=false \ + VITE_SHOW_API_MANAGER_BUTTON=false USER 0 RUN dnf update -y diff --git a/Dockerfiles/frontend_build.env b/Dockerfiles/frontend_build.env index f1b9724..b0b7dc0 100644 --- a/Dockerfiles/frontend_build.env +++ b/Dockerfiles/frontend_build.env @@ -9,4 +9,5 @@ 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 +VITE_CHATBOT_URL=VITE_CHATBOT_URL +VITE_SHOW_API_MANAGER_BUTTON=VITE_SHOW_API_MANAGER_BUTTON \ No newline at end of file diff --git a/Dockerfiles/prestart.go b/Dockerfiles/prestart.go index 5d48e2e..0862ab5 100644 --- a/Dockerfiles/prestart.go +++ b/Dockerfiles/prestart.go @@ -20,7 +20,7 @@ func main() { // 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"} + config := []string{"VITE_OBP_API_VERSION","VITE_SHOW_API_MANAGER_BUTTON", "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 {