Von Basil vorgeschlagene Aenderungen wurden gemacht. Hoffentlich laeuft das Ganze nun auf der Produktion. Lokal laueft alles ohne Probleme.

additional/archivecostwebapp.conf

@@ -0,0 +1,45 @@
+server {
+    listen 80;
+    server_name archivecostwebapp.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name archivecostwebapp.psi.ch;
+
+    ssl_certificate     /etc/nginx/certs/archivecostwebapp.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/archivecostwebapp.psi.ch.key;
+
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+
+    location / {
+        proxy_pass http://archive_cost_analytics:8501;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location /logic/ {
+        proxy_pass http://archive_cost_logic:1880/;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+    }
+}
+

analytics/Dockerfile

@@ -1,14 +1,18 @@
 #FROM python:3.11-slim
 FROM python:3.14-slim
 
+# Arbeitsverzeichnis setzen
 WORKDIR /app
 
-# Erfordert keine schweren Systempakete, das beschleunigt auch den Build!
-# Wir installieren direkt die benötigten Python-Bibliotheken
-RUN pip3 install --no-cache-dir streamlit pandas plotly openpyxl
+# Zuerst die Abhängigkeiten installieren, um den Docker-Cache optimal zu nutzen
+COPY requirements.txt .
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+# Jetzt den gesamten App-Code in das Arbeitsverzeichnis kopieren
+COPY . .
 
 # Port für Streamlit öffnen
 EXPOSE 8501
 
-# Streamlit starten und an alle Netzwerk-Schnittstellen binden
-ENTRYPOINT ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]
+# Standardbefehl zum Starten der App
+CMD ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]

analytics/requirements.txt

@@ -0,0 +1,4 @@
+streamlit
+pandas
+plotly
+openpyxl

docker-compose.override.yml

@@ -0,0 +1,16 @@
+services:
+  logic-red:
+    volumes:
+      - ./logic/node-red-data:/data
+      - ./shared_data:/data/results
+      - ./logic/scripts:/data/scripts
+      - /data/node_modules
+    ports:
+      - "1880:1880"
+
+  analytics-app:
+    volumes:
+      - ./analytics:/app
+      - ./shared_data:/data/results:ro
+    ports:
+      - "8501:8501"

docker-compose.prod.merge_yml

@@ -1,37 +0,0 @@
-
-  # Datacenter and DB Services (9522), Peter Hüsser (HP95)
-  # Archivkostenberechnung
-  logic-red:
-    image: gitea.psi.ch/data-catalog-services/archivecostwebapp-logic:latest
-    container_name: archive_cost_logic
-    restart: always
-    volumes:
-      - ./logic/node-red-data:/data
-      - ./shared_data:/data/results
-      - ./logic/scripts:/data/scripts
-    environment:
-      - TZ=Europe/Zurich
-      - GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
-      - BEGIN_NAME_GROUPINFO_JSON_FILE_WITH_PATH=/data/size_by_ownergroup_and_number_of_copies_
-      - JSON_CACHE_WITH_PATH=/data/results/json_cache.json
-      - NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
-      - ERROR_LOGFILE=/data/logs/get_new_groupinfo_error.log
-      - AD_SERVER=d.psi.ch
-      - AD_SEARCH_BASE=DC=d,DC=psi,DC=ch
-      - AD_USER=${AD_USER}
-      - AD_PASSWORD=${AD_PASSWORD}
-      - METABASE_API_KEY=${METABASE_API_KEY}
-      - MAIN_WORKFLOW_CRON=0 6 * * *
-      - CLEANUP_TIME=20
-      - CLEANUP_CRON=0 7 * * *
-      - CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
-      - CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
-
-  analytics-app:
-    image: gitea.psi.ch/data-catalog-services/archivecostwebapp-analytics:latest
-    container_name: archive_cost_analytics
-    restart: always
-    volumes:
-      - ./shared_data:/data/results:ro
-    environment:
-      - TZ=Europe/Zurich

docker-compose.yml

@@ -3,9 +3,9 @@ services:
     build: ./logic
     container_name: archive_cost_logic
     volumes:
-      - ./logic/node-red-data:/data
-      - ./shared_data:/data/results
-      - ./logic/scripts:/data/scripts
+      - /opt/webcontent/archivecost/logic/node-red-data:/data
+      - /opt/webcontent/archivecost/shared_data:/data/results
+      - /opt/webcontent/archivecost/logic/scripts:/data/scripts
     environment:
       - TZ=Europe/Zurich
       - GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
@@ -24,16 +24,11 @@ services:
       - CLEANUP_CRON=0 7 * * *
       - CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
       - CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
-    ports:
-      - "1880:1880"
 
   analytics-app:
     build: ./analytics
     container_name: archive_cost_analytics
-    ports:
-      - "8501:8501"
     volumes:
-      - ./analytics:/app
-      - ./shared_data:/data/results:ro
+      - /opt/webcontent/archivecost/shared_data:/data/results:ro
     environment:
-      - TZ=Europe/Zurich
+      - TZ=Europe/Zurich

logic/node-red-data/archivegroup_information.json

@@ -1 +1 @@
-size_by_ownergroup_and_number_of_copies_2026-07-03T11_20_22.json
+size_by_ownergroup_and_number_of_copies_2026-07-09T09_59_04.json

logic/start.sh

@@ -1,12 +1,2 @@
 #!/bin/sh
-
-if [ ! -d "/data/node_modules" ] || [ -z "$(ls -A /data/node_modules 2>/dev/null)" ]; then
-    echo "Installing Node-RED modules ..."
-    cd /data
-    npm install --no-update-notifier \
-    node-red-contrib-moment \
-    node-red-contrib-cron-plus \
-    passport-ldapauth
-fi
-
-exec /usr/src/node-red/entrypoint.sh
+exec /usr/src/node-red/entrypoint.sh