From 9fe65b5ac9ce9e4c8c0bf9e75f3d851b9f1605c6 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 30 Apr 2026 10:45:31 +0200 Subject: [PATCH 1/2] deploying several MCDA apps Signed-off-by: Basil Bruhn --- conf.d/mcda-dss.conf | 21 ++++++++++++ conf.d/mcda-srf.conf | 21 ++++++++++++ conf.d/mcda-up.conf | 29 ++++++++++++++++ docker-compose.yaml | 80 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 conf.d/mcda-dss.conf create mode 100644 conf.d/mcda-srf.conf create mode 100644 conf.d/mcda-up.conf diff --git a/conf.d/mcda-dss.conf b/conf.d/mcda-dss.conf new file mode 100644 index 0000000..0eb751e --- /dev/null +++ b/conf.d/mcda-dss.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name mcda-dss.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-dss.psi.ch; + + ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key; + + location / { + proxy_pass http://mcda-dss:8050; + 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; + } +} diff --git a/conf.d/mcda-srf.conf b/conf.d/mcda-srf.conf new file mode 100644 index 0000000..0f77994 --- /dev/null +++ b/conf.d/mcda-srf.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name mcda-srf.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-srf.psi.ch; + + ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key; + + location / { + proxy_pass http://mcda-srf:8000; + 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; + } +} diff --git a/conf.d/mcda-up.conf b/conf.d/mcda-up.conf new file mode 100644 index 0000000..81d8cb2 --- /dev/null +++ b/conf.d/mcda-up.conf @@ -0,0 +1,29 @@ +server { + listen 80; + server_name mcda-up.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-up.psi.ch; + + ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key; + + location /api/ { + proxy_pass http://up-mavt-suite-backend:5000/api/; + 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 / { + proxy_pass http://up-mavt-suite-frontend:3000; + 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; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index f0539f0..82708ee 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -39,7 +39,7 @@ services: networks: - backend - # Huang He + # MCDA Calculator Huang He mcda-calculator: image: gitea.psi.ch/images/mcda-calculator:1.0.3 container_name: mcda-calculator @@ -47,6 +47,83 @@ services: networks: - backend + # MCDA DSS Huang He + mcda-dss: + image: gitea.psi.ch/images/mcda-dss:0.1.0 + container_name: mcda-dss + restart: always + networks: + - backend + + # MCDA SRF Huang He + mcda-srf: + image: gitea.psi.ch/images/mcda-srf:0.1.0 + container_name: mcda-srf + restart: always + networks: + - backend + + # River Huang + # UP-MAVT-Suite + up-mavt-suite-mongo: + image: mongo:7.0 + container_name: up-mavt-suite-mongo + environment: + MONGO_INITDB_DATABASE: elicitation + volumes: + - /opt/webcontent/up-mavt-suite/mongo-data:/data/db + networks: + - up_mavt_suite_network + restart: always + + up-mavt-suite-backend: + image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.1 + container_name: up-mavt-suite-backend + environment: + MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation + FLASK_ENV: production + ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} + OAUTH2_CLIENT_SECRET: ${MCDA_UP_OAUTH2_SECRET} + SMTP_HOST: smtp.office365.com + SMTP_PORT: 587 + SMTP_USER: mcda@psi.ch + EMAIL_AUTH_MODE: oauth2 + OAUTH2_TENANT_ID: 50f89ee2-f910-47c5-9913-a6ea08928f11 + OAUTH2_CLIENT_ID: 201ba262-3c76-41fb-8942-dcefb7729caa + OAUTH2_SCOPE: https://outlook.office365.com/.default + OAUTH2_USERNAME: mcda@psi.ch + SMTP_USE_TLS: true + EMAIL_FROM: mcda@psi.ch + APP_BASE_URL: https://mcda-up.psi.ch/ + depends_on: + - up-mavt-suite-mongo + networks: + - up_mavt_suite_network + - backend + restart: always + + up-mavt-suite-worker: + image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.1 + container_name: up-mavt-suite-worker + environment: + MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation + depends_on: + - up-mavt-suite-mongo + networks: + - up_mavt_suite_network + restart: always + + up-mavt-suite-frontend: + image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.1 + container_name: up-mavt-suite-frontend + depends_on: + - up-mavt-suite-backend + networks: + - up_mavt_suite_network + - backend + restart: always + + # Romain Sacchi swiss-ecargo: image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2 @@ -83,3 +160,4 @@ services: networks: public: backend: + up_mavt_suite_network: From 53b4e80fce059b6bf0be330242eaaa0732029f14 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 30 Apr 2026 12:44:23 +0200 Subject: [PATCH 2/2] update nginx Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 82708ee..00df85a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,7 @@ services: # linux-eng@psi.ch nginx: - image: gitea.psi.ch/images/nginx:1.29.4 + image: gitea.psi.ch/images/nginx:1.29.8 container_name: nginx_proxy restart: always ports: