summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile2
-rw-r--r--src/assets/env.js3
-rw-r--r--src/assets/env.template.js3
-rw-r--r--src/environments/environment.prod.ts2
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,
};