From e2ee15a4df6f00017f9e2771c3fa414c19b6498e Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Sun, 12 Apr 2026 19:12:27 +0200 Subject: [PATCH 1/6] new version move images to version 0.9.0 --- docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c29fa23..64eb942 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -467,7 +467,7 @@ services: restart: always up-mavt-suite-backend: - image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.1 + image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.0 container_name: up-mavt-suite-backend env_file: - .env @@ -483,7 +483,7 @@ services: restart: always up-mavt-suite-worker: - image: gitea.psi.ch/images/up-mavt-suite-worker:0.1.1 + image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.0 container_name: up-mavt-suite-worker environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation @@ -494,7 +494,7 @@ services: restart: always up-mavt-suite-frontend: - image: gitea.psi.ch/images/up-mavt-suite-frontend:0.2.0 + image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.0 container_name: up-mavt-suite-frontend depends_on: - up-mavt-suite-backend From 68d83517b2b2b77c68c944026cc398b597e7bf45 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Sun, 12 Apr 2026 19:18:06 +0200 Subject: [PATCH 2/6] adding secrets this is how I added secrets in my local deployment --- docker-compose.yaml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 64eb942..194c9cd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -93,19 +93,12 @@ services: # 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-dss:secrets: + admin_password: + file: ./secrets/admin_password.txt + oauth2_client_secret: + file: ./secrets/oauth2_client_secret.txt - # MCDA Calculator - mcda-calculator: - image: gitea.psi.ch/images/mcda-calculator:1.0.3 - container_name: mcda-calculator - restart: always - networks: - backend # MCDA SRF tool @@ -473,8 +466,12 @@ services: - .env environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - FLASK_ENV: development - ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} + FLASK_ENV: production + ADMIN_PASSWORD_FILE: /run/secrets/admin_password + OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret + secrets: + - admin_password + - oauth2_client_secret depends_on: - up-mavt-suite-mongo networks: @@ -503,6 +500,12 @@ services: - backend restart: always +secrets: + admin_password: + file: ./secrets/admin_password.txt + oauth2_client_secret: + file: ./secrets/oauth2_client_secret.txt + networks: public: backend: From 575db5705149160ab83d8aefcae0d2ef6dffc117 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Sun, 12 Apr 2026 19:21:14 +0200 Subject: [PATCH 3/6] revert 68d83517b2b2b77c68c944026cc398b597e7bf45 revert adding secrets this is how I added secrets in my local deployment --- docker-compose.yaml | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 194c9cd..64eb942 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -93,12 +93,19 @@ services: # Also installed on docker-dmz # PSI Service # MCDA DSS - mcda-dss:secrets: - admin_password: - file: ./secrets/admin_password.txt - oauth2_client_secret: - file: ./secrets/oauth2_client_secret.txt + 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 + restart: always + networks: - backend # MCDA SRF tool @@ -466,12 +473,8 @@ services: - .env environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - FLASK_ENV: production - ADMIN_PASSWORD_FILE: /run/secrets/admin_password - OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret - secrets: - - admin_password - - oauth2_client_secret + FLASK_ENV: development + ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} depends_on: - up-mavt-suite-mongo networks: @@ -500,12 +503,6 @@ services: - backend restart: always -secrets: - admin_password: - file: ./secrets/admin_password.txt - oauth2_client_secret: - file: ./secrets/oauth2_client_secret.txt - networks: public: backend: From 6d2a37d11cbbd7b698965851860a697a06ddd194 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Sun, 12 Apr 2026 19:22:30 +0200 Subject: [PATCH 4/6] docker secrets this is how i added them into my local deployment --- docker-compose.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 64eb942..2239b6c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -474,7 +474,11 @@ services: environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation FLASK_ENV: development - ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} + ADMIN_PASSWORD_FILE: /run/secrets/admin_password + OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret + secrets: + - admin_password + - oauth2_client_secret depends_on: - up-mavt-suite-mongo networks: @@ -503,6 +507,12 @@ services: - backend restart: always +secrets: + admin_password: + file: ./secrets/admin_password.txt + oauth2_client_secret: + file: ./secrets/oauth2_client_secret.txt + networks: public: backend: From 8d32dc60e1102b494d95b1751fe1f7913c6556b1 Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Sun, 12 Apr 2026 19:23:00 +0200 Subject: [PATCH 5/6] move flask into production env --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2239b6c..23b1ea1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -473,7 +473,7 @@ services: - .env environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation - FLASK_ENV: development + FLASK_ENV: production ADMIN_PASSWORD_FILE: /run/secrets/admin_password OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret secrets: From 2084388d776a8f117f1287fbb50cc6b7e586441b Mon Sep 17 00:00:00 2001 From: pagliu_s Date: Thu, 16 Apr 2026 11:04:08 +0200 Subject: [PATCH 6/6] remove mounted secret files --- docker-compose.yaml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 23b1ea1..f595507 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -467,18 +467,15 @@ services: restart: always up-mavt-suite-backend: - image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.0 + image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.1 container_name: up-mavt-suite-backend env_file: - .env environment: MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation FLASK_ENV: production - ADMIN_PASSWORD_FILE: /run/secrets/admin_password - OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret - secrets: - - admin_password - - oauth2_client_secret + ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD} + OAUTH2_CLIENT_SECRET: ${MCDA_UP_OAUTH2_SECRET} depends_on: - up-mavt-suite-mongo networks: @@ -487,7 +484,7 @@ services: restart: always up-mavt-suite-worker: - image: gitea.psi.ch/images/up-mavt-suite-worker:0.9.0 + 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 @@ -498,7 +495,7 @@ services: restart: always up-mavt-suite-frontend: - image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.0 + image: gitea.psi.ch/images/up-mavt-suite-frontend:0.9.1 container_name: up-mavt-suite-frontend depends_on: - up-mavt-suite-backend @@ -507,12 +504,6 @@ services: - backend restart: always -secrets: - admin_password: - file: ./secrets/admin_password.txt - oauth2_client_secret: - file: ./secrets/oauth2_client_secret.txt - networks: public: backend: