merge upstream

docker-compose.yaml

@@ -37,7 +37,7 @@ services:
       - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw
       - /opt/webcontent/sls2:/var/www/sls2:rw
       - /opt/webcontent/megwiki:/var/www/megwiki:rw
-      - /opt/webcontent/niagadm:/var/www/niagadm:rw
+      - /opt/webcontent/sinqimaging:/var/www/sinqimaging:rw
       - /opt/webcontent/omny:/var/www/omny:rw
       - /mount/srem/webhosting:/var/www/srem:rw
       - ./apache/conf:/etc/apache2/sites-enabled:ro
@@ -92,6 +92,15 @@ services:
   # Huang He <river.huang@psi.ch>
   # Also installed on docker-dmz
   # PSI Service
+  # MCDA DSS
+  mcda-dss:
+    image: gitea.psi.ch/images/mcda-dss:0.1.0
+    container_name: mcda-dss
+    restart: always
+    networks:
+      - backend
+
+  # MCDA Calculator
   mcda-calculator:
     image: gitea.psi.ch/images/mcda-calculator:1.0.3
     container_name: mcda-calculator
@@ -99,6 +108,7 @@ services:
     networks:
       - backend
 
+
   # Romain Sacchi <romain.sacchi@psi.ch>
   swiss-ecargo:
     image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2
@@ -206,7 +216,7 @@ services:
       - it_strategy_dashboard_backend
 
   it-strategy-dashboard-backend:
-    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.2
+    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.3
     container_name: it-strategy-dashboard-backend
     restart: always
     environment: