From 3edd1f17bdfe7f1f83967dc44aefd7249e8e7dbc Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Mon, 8 May 2023 10:53:30 +0200
Subject: [PATCH] declared env variable extra_pages

---
 app-config/calculator-app/app.sh           | 2 ++
 app-config/docker-compose.yml              | 2 ++
 app-config/openshift/deploymentconfig.yaml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app-config/calculator-app/app.sh b/app-config/calculator-app/app.sh
index 8555379e..6a808f8c 100755
--- a/app-config/calculator-app/app.sh
+++ b/app-config/calculator-app/app.sh
@@ -21,6 +21,8 @@ if [[ "$APP_NAME" == "calculator-app" ]]; then
     export "ARVE_CLIENT_ID"="$ARVE_CLIENT_ID"
     export "ARVE_CLIENT_SECRET"="$ARVE_CLIENT_SECRET"
 
+    export "EXTRA_PAGES"="$EXTRA_PAGES"
+
     echo "Starting the caimira webservice with: python -m caimira.apps.calculator ${args[@]}"
     python -m caimira.apps.calculator "${args[@]}"
 elif [[ "$APP_NAME" == "caimira-voila" ]]; then
diff --git a/app-config/docker-compose.yml b/app-config/docker-compose.yml
index d9ddb34a..ca2f5e3b 100644
--- a/app-config/docker-compose.yml
+++ b/app-config/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - APPLICATION_ROOT=/
       - CAIMIRA_CALCULATOR_PREFIX=/calculator-cern
       - CAIMIRA_THEME=caimira/apps/templates/cern
+      - EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]
     user: ${CURRENT_UID}
 
   calculator-open-app:
@@ -29,6 +30,7 @@ services:
       - APP_NAME=calculator-app
       - APPLICATION_ROOT=/
       - CAIMIRA_CALCULATOR_PREFIX=/calculator-open
+      - EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]
     user: ${CURRENT_UID}
 
   auth-service:
diff --git a/app-config/openshift/deploymentconfig.yaml b/app-config/openshift/deploymentconfig.yaml
index e96d65a1..a646d7ca 100644
--- a/app-config/openshift/deploymentconfig.yaml
+++ b/app-config/openshift/deploymentconfig.yaml
@@ -283,6 +283,8 @@
                     secretKeyRef:
                       key: ARVE_API_KEY
                       name: arve-api
+                - name: EXTRA_PAGES
+                  value: [{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]
                 image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080