From b791581fe85c6e1b51c3e6ef1487917bf4a10974 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 23 Feb 2023 10:46:03 +0100
Subject: [PATCH] updated docker files for expert app

---
 app-config/caimira-public-docker-image/Dockerfile | 1 +
 app-config/caimira-public-docker-image/nginx.conf | 6 ++++++
 app-config/caimira-webservice/app.sh              | 3 +++
 app-config/docker-compose.yml                     | 8 ++++++++
 4 files changed, 18 insertions(+)

diff --git a/app-config/caimira-public-docker-image/Dockerfile b/app-config/caimira-public-docker-image/Dockerfile
index ee69552b..fe4aa1b8 100644
--- a/app-config/caimira-public-docker-image/Dockerfile
+++ b/app-config/caimira-public-docker-image/Dockerfile
@@ -15,6 +15,7 @@ COPY ./app-config/caimira-public-docker-image/run_caimira.sh /opt/caimira/start.
 # In the best case this will be a no-op.
 RUN cd /opt/caimira/src/ && /opt/caimira/app/bin/pip install -r /opt/caimira/src/requirements.txt
 RUN /opt/caimira/app/bin/jupyter trust /opt/caimira/src/caimira/apps/expert/*.ipynb
+RUN /opt/caimira/app/bin/jupyter trust /opt/caimira/src/caimira/apps/simulator/*.ipynb
 COPY ./app-config/caimira-public-docker-image/nginx.conf /opt/caimira/nginx.conf
 
 EXPOSE 8080
diff --git a/app-config/caimira-public-docker-image/nginx.conf b/app-config/caimira-public-docker-image/nginx.conf
index 88cd8e2b..caef1720 100644
--- a/app-config/caimira-public-docker-image/nginx.conf
+++ b/app-config/caimira-public-docker-image/nginx.conf
@@ -50,6 +50,12 @@ http {
         rewrite ^/expert-app$ /voila-server/ last;
         rewrite ^/(files/static)/(.*)$ /voila-server/voila/$1/$2 last;
 
+        location /CO2-voila-server/ {
+            proxy_pass http://localhost:8082/CO2-voila-server/;
+        }
+        rewrite ^/CO2-app$ /voila-server/ last;
+        rewrite ^/(files/static)/(.*)$ /voila-server/voila/$1/$2 last;
+
         location / {
             proxy_pass http://localhost:8081;
         }
diff --git a/app-config/caimira-webservice/app.sh b/app-config/caimira-webservice/app.sh
index 40380a7e..dfa1a237 100755
--- a/app-config/caimira-webservice/app.sh
+++ b/app-config/caimira-webservice/app.sh
@@ -26,6 +26,9 @@ if [[ "$APP_NAME" == "caimira-webservice" ]]; then
 elif [[ "$APP_NAME" == "caimira-voila" ]]; then
     echo "Starting the voila service"
     voila caimira/apps/expert/ --port=8080 --no-browser --base_url=/voila-server/ --tornado_settings 'allow_origin=*'
+elif [[ "$APP_NAME" == "caimira-CO2-voila" ]]; then
+    echo "Starting the voila service"
+    voila caimira/apps/simulator/ --port=8080 --no-browser --base_url=/CO2-voila-server/ --tornado_settings 'allow_origin=*'
 else
     echo "No APP_NAME specified"
     exit 1
diff --git a/app-config/docker-compose.yml b/app-config/docker-compose.yml
index b2046c21..c2aef12e 100644
--- a/app-config/docker-compose.yml
+++ b/app-config/docker-compose.yml
@@ -6,6 +6,12 @@ services:
       - APP_NAME=caimira-voila
     user: ${CURRENT_UID:?"Please run as follows 'CURRENT_UID=$(id -u):$(id -g) docker-compose up'"}
 
+  caimira-CO2-app:
+    image: caimira-webservice
+    environment:
+      - APP_NAME=caimira-CO2-voila
+    user: ${CURRENT_UID:?"Please run as follows 'CURRENT_UID=$(id -u):$(id -g) docker-compose up'"}
+
   caimira-webservice:
     image: caimira-webservice
     environment:
@@ -46,6 +52,8 @@ services:
         condition: service_started
       caimira-app:
         condition: service_started
+      caimira-CO2-app:
+        condition: service_started
       auth-service:
         condition: service_started
     user: ${CURRENT_UID}