From e9b584cb1d7b001297880bf4745615e20f7d2bff Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:03:07 +0100 Subject: [PATCH 1/8] Update docker-compose.yaml --- docker-compose.yaml | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 55c549c..13dc534 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -452,6 +452,60 @@ services: - tomcatwiki_backend - backend + # Simone Pagliuca / 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: unless-stopped + + up-mavt-suite-backend: + image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.0 + container_name: up-mavt-suite-backend + ports: + - "5000:5000" + env_file: + - .env + environment: + MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation + FLASK_ENV: development + ADMIN_PASSWORD: ${ADMIN_PASSWORD} + depends_on: + - up-mavt-suite-mongo + networks: + - up_mavt_suite_network + restart: unless-stopped + + up-mavt-suite-worker: + image: gitea.psi.ch/images/up-mavt-suite-worker:0.1.0 + 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: unless-stopped + + up-mavt-suite-frontend: + image: gitea.psi.ch/images/up-mavt-suite-frontend:0.1.0 + container_name: up-mavt-suite-frontend + ports: + - "3000:3000" + environment: + VITE_API_URL: http://localhost:5000/api + depends_on: + - up-mavt-suite-backend + networks: + - up_mavt_suite_network + restart: unless-stopped + networks: public: backend: @@ -459,4 +513,5 @@ networks: it_strategy_dashboard_backend: panda_maintenance_backend: tomcatwiki_backend: + up_mavt_suite_network: From cec3b5763f7ed236b2cc6bdf670c9556f10c6fec Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:14:39 +0100 Subject: [PATCH 2/8] add config for revproxy --- conf.d/mcda-up.psi.ch.conf | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 conf.d/mcda-up.psi.ch.conf diff --git a/conf.d/mcda-up.psi.ch.conf b/conf.d/mcda-up.psi.ch.conf new file mode 100644 index 0000000..718de70 --- /dev/null +++ b/conf.d/mcda-up.psi.ch.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/mcda-up.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-up.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; + } +} From 2eb62f4e23f4144f594bcb6484df52edbd3138fc Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:18:20 +0100 Subject: [PATCH 3/8] restart always --- docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 13dc534..6b28eff 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -463,7 +463,7 @@ services: - /opt/webcontent/up-mavt-suite/mongo-data:/data/db networks: - up_mavt_suite_network - restart: unless-stopped + restart: always up-mavt-suite-backend: image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.0 @@ -480,7 +480,7 @@ services: - up-mavt-suite-mongo networks: - up_mavt_suite_network - restart: unless-stopped + restart: always up-mavt-suite-worker: image: gitea.psi.ch/images/up-mavt-suite-worker:0.1.0 @@ -491,7 +491,7 @@ services: - up-mavt-suite-mongo networks: - up_mavt_suite_network - restart: unless-stopped + restart: always up-mavt-suite-frontend: image: gitea.psi.ch/images/up-mavt-suite-frontend:0.1.0 @@ -504,7 +504,7 @@ services: - up-mavt-suite-backend networks: - up_mavt_suite_network - restart: unless-stopped + restart: always networks: public: From 203b697637549f08033550348062849d1c2e96e9 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:21:04 +0100 Subject: [PATCH 4/8] add backend network Should not be needed for DB and worker services --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6b28eff..c70aa14 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -480,6 +480,7 @@ services: - up-mavt-suite-mongo networks: - up_mavt_suite_network + - backend restart: always up-mavt-suite-worker: @@ -504,6 +505,7 @@ services: - up-mavt-suite-backend networks: - up_mavt_suite_network + - backend restart: always networks: From 2ee43c4dc9be11f1d0957ea61feeb7f8667a051e Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:23:12 +0100 Subject: [PATCH 5/8] removed ports --- docker-compose.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c70aa14..abca4e4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -468,8 +468,6 @@ services: up-mavt-suite-backend: image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.0 container_name: up-mavt-suite-backend - ports: - - "5000:5000" env_file: - .env environment: @@ -497,8 +495,6 @@ services: up-mavt-suite-frontend: image: gitea.psi.ch/images/up-mavt-suite-frontend:0.1.0 container_name: up-mavt-suite-frontend - ports: - - "3000:3000" environment: VITE_API_URL: http://localhost:5000/api depends_on: From 21e4e618ddd0772e23f1d90ee83dc46b42d21ce0 Mon Sep 17 00:00:00 2001 From: bruhn_b Date: Mon, 16 Mar 2026 16:27:43 +0100 Subject: [PATCH 6/8] Update conf.d/mcda-up.psi.ch.conf --- conf.d/mcda-up.psi.ch.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.d/mcda-up.psi.ch.conf b/conf.d/mcda-up.psi.ch.conf index 718de70..8adbdd3 100644 --- a/conf.d/mcda-up.psi.ch.conf +++ b/conf.d/mcda-up.psi.ch.conf @@ -1,15 +1,15 @@ server { listen 80; - server_name mcda-up.psi.ch; + server_name mcda-up-test.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; - server_name mcda-up.psi.ch; + server_name mcda-up-test.psi.ch; - ssl_certificate /etc/nginx/certs/mcda-up.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/mcda-up.psi.ch.key; + ssl_certificate /etc/nginx/certs/mcda-up-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-up-test.psi.ch.key; location /api/ { proxy_pass http://up-mavt-suite-backend:5000/api/; From 678254599d6fc2636e44f7fa4034bf9274f0c1c1 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:29:20 +0100 Subject: [PATCH 7/8] add test conf file --- conf.d/mcda-up-test.conf | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 conf.d/mcda-up-test.conf diff --git a/conf.d/mcda-up-test.conf b/conf.d/mcda-up-test.conf new file mode 100644 index 0000000..8adbdd3 --- /dev/null +++ b/conf.d/mcda-up-test.conf @@ -0,0 +1,29 @@ +server { + listen 80; + server_name mcda-up-test.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-up-test.psi.ch; + + ssl_certificate /etc/nginx/certs/mcda-up-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-up-test.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; + } +} From 76e87dbc2f9975c2d416ff244acc90225ede2dbf Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Mon, 16 Mar 2026 16:33:30 +0100 Subject: [PATCH 8/8] Delete conf.d/mcda-up-test.conf --- conf.d/mcda-up-test.conf | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 conf.d/mcda-up-test.conf diff --git a/conf.d/mcda-up-test.conf b/conf.d/mcda-up-test.conf deleted file mode 100644 index 8adbdd3..0000000 --- a/conf.d/mcda-up-test.conf +++ /dev/null @@ -1,29 +0,0 @@ -server { - listen 80; - server_name mcda-up-test.psi.ch; - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name mcda-up-test.psi.ch; - - ssl_certificate /etc/nginx/certs/mcda-up-test.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/mcda-up-test.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; - } -}