From a1ac8b74efe5c65ba1514f3e5fd4bb8bec690fd1 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Wed, 27 Mar 2024 13:15:13 +0100 Subject: Make ui logging configurable - introduce LOGGING_ENABLED environment variable that can be set to enable the ui logging Issue-ID: PORTALNG-81 Change-Id: Icb540020bf18e030e3b02fa27f66eb5982a2bf31 Signed-off-by: Fiete Ostkamp --- Dockerfile | 2 +- src/assets/env.js | 3 ++- src/assets/env.template.js | 3 ++- src/environments/environment.prod.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 78556cc..de1c28d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN npm run build -- --configuration production FROM nginxinc/nginx-unprivileged:alpine-slim USER root -RUN apk add gettext # required for envsubst in docker_entrypoint.sh +RUN apk add --no-cache gettext # required for envsubst in docker_entrypoint.sh USER nginx COPY --chown=nginx:nginx server/nginx* ./ diff --git a/src/assets/env.js b/src/assets/env.js index 154ed3b..ba1920a 100644 --- a/src/assets/env.js +++ b/src/assets/env.js @@ -3,8 +3,9 @@ window["env"]["keycloak"] = window["env"]["keycloak"] || {}; // Environment variables - window["env"]["customStyleEnabled"]; window["env"]["keycloak"]["hostname"]; window["env"]["keycloak"]["realm"]; window["env"]["keycloak"]["clientId"]; + window["env"]["customStyleEnabled"]; + window["env"]["loggingEnabled"] })(this); diff --git a/src/assets/env.template.js b/src/assets/env.template.js index 037014b..66dcee7 100644 --- a/src/assets/env.template.js +++ b/src/assets/env.template.js @@ -3,8 +3,9 @@ window["env"]["keycloak"] = window["env"]["keycloak"] || {}; // Environment variables - window["env"]["customStyleEnabled"] = "${CUSTOM_STYLE_ENABLED}"; window["env"]["keycloak"]["hostname"] = "${KEYCLOAK_HOSTNAME}"; window["env"]["keycloak"]["realm"] = "${KEYCLOAK_REALM}"; window["env"]["keycloak"]["clientId"] = "${KEYCLOAK_CLIENT_ID}"; + window["env"]["customStyleEnabled"] = "${CUSTOM_STYLE_ENABLED}"; + window["env"]["loggingEnabled"] = "${LOGGING_ENABLED}"; })(this); diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ae20693..9a14f80 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -42,5 +42,5 @@ export const environment: Environment = { dateTimeFormat: 'dd/MM/yyyy HH:mm:ss', loggingUrl: window.location.origin + '/onap_logging', supportUrlLink: 'https://wiki.onap.org/', - loggingEnabled: true + loggingEnabled: window["env"]["loggingEnabled"] || false, }; -- cgit 1.2.3-korg