From 2f038c3189bf64ba7d7f442f9af79a468a1b213a Mon Sep 17 00:00:00 2001 From: "tom.ritter" Date: Tue, 6 Jan 2026 09:38:15 +0100 Subject: [PATCH 1/8] chore(v4.0): update frontend and backend container --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 02cff27..4e39411 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -180,7 +180,7 @@ services: # It-Strategy monitoring dashboard it-strategy-dashboard-frontend: - image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:3.0 + image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0 container_name: it-strategy-dashboard-frontend command: ["sh","-c","/usr/local/bin/copyData.sh"] volumes: @@ -190,7 +190,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:3.0.1 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0 container_name: it-strategy-dashboard-backend restart: always environment: From 1a710204c5f386cdd909f0d71e3b70626f79dd53 Mon Sep 17 00:00:00 2001 From: "tom.ritter" Date: Wed, 28 Jan 2026 10:57:08 +0100 Subject: [PATCH 2/8] chore(v4.0.1): fix dashboard loading --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a0ba404..4c2e542 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -196,7 +196,7 @@ services: # It-Strategy monitoring dashboard it-strategy-dashboard-frontend: - image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0 + image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.1 container_name: it-strategy-dashboard-frontend command: ["sh","-c","/usr/local/bin/copyData.sh"] volumes: @@ -206,7 +206,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.1 container_name: it-strategy-dashboard-backend restart: always environment: From 6d0f508a08c3167d198507bae80e5b300add9fe8 Mon Sep 17 00:00:00 2001 From: "tom.ritter" Date: Thu, 29 Jan 2026 13:50:28 +0100 Subject: [PATCH 3/8] chore(v4.0.2): modify default dashboard --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4c2e542..6a21f73 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -196,7 +196,7 @@ services: # It-Strategy monitoring dashboard it-strategy-dashboard-frontend: - image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.1 + image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.2 container_name: it-strategy-dashboard-frontend command: ["sh","-c","/usr/local/bin/copyData.sh"] volumes: @@ -206,7 +206,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.1 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.2 container_name: it-strategy-dashboard-backend restart: always environment: From f46a1a4f6d0845d2f72ce43569410eb119fec164 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 13 Feb 2026 11:10:03 +0100 Subject: [PATCH 4/8] rename niagadm to sinqimaging Signed-off-by: Basil Bruhn --- apache/conf/{niagadm.conf => sinqimaging.conf} | 14 +++++++------- conf.d/{niagadm.conf => sinqimaging.conf} | 12 ++++++------ docker-compose.yaml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename apache/conf/{niagadm.conf => sinqimaging.conf} (56%) rename conf.d/{niagadm.conf => sinqimaging.conf} (58%) diff --git a/apache/conf/niagadm.conf b/apache/conf/sinqimaging.conf similarity index 56% rename from apache/conf/niagadm.conf rename to apache/conf/sinqimaging.conf index 0797b18..746929b 100644 --- a/apache/conf/niagadm.conf +++ b/apache/conf/sinqimaging.conf @@ -1,26 +1,26 @@ - ServerName niagadm.psi.ch - DocumentRoot /var/www/niagadm + ServerName sinqimaging.psi.ch + DocumentRoot /var/www/sinqimaging # Allow CGI everywhere if needed Options +ExecCGI AddHandler cgi-script .pl .cgi .x .py - + Options +ExecCGI AllowOverride None Require all granted # Explicit CGI directories - ScriptAlias /cgi-bin/ /var/www/niagadm/cgi-bin/ - + ScriptAlias /cgi-bin/ /var/www/sinqimaging/cgi-bin/ + Options +ExecCGI Require all granted - ScriptAlias /cgibin/ /var/www/niagadm/cgibin/ - + ScriptAlias /cgibin/ /var/www/sinqimaging/cgibin/ + Options +ExecCGI Require all granted diff --git a/conf.d/niagadm.conf b/conf.d/sinqimaging.conf similarity index 58% rename from conf.d/niagadm.conf rename to conf.d/sinqimaging.conf index 505626c..071e4e9 100644 --- a/conf.d/niagadm.conf +++ b/conf.d/sinqimaging.conf @@ -1,19 +1,19 @@ server { listen 80; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; - ssl_certificate /etc/nginx/certs/niagadm.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/niagadm.psi.ch.key; + ssl_certificate /etc/nginx/certs/sinqimaging.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/sinqimaging.psi.ch.key; - access_log /var/log/nginx/niagadm.access.log; - error_log /var/log/nginx/niagadm.error.log; + access_log /var/log/nginx/sinqimaging.access.log; + error_log /var/log/nginx/sinqimaging.error.log; # Proxy EVERYTHING to the Apache container location / { diff --git a/docker-compose.yaml b/docker-compose.yaml index 6a21f73..2aace24 100644 --- a/docker-compose.yaml +++ b/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 From 33e0ff48f3f400aca71e20f2ec56bedce84429ce Mon Sep 17 00:00:00 2001 From: huang_h Date: Mon, 16 Feb 2026 11:59:06 +0100 Subject: [PATCH 5/8] Add mcda-dss for mcda-dss.psi.ch --- docker-compose.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2aace24..5103c97 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -92,6 +92,15 @@ services: # Huang He # Also installed on docker-dmz # PSI Service + # MCDA DSS + mcda-calculator: + 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 swiss-ecargo: image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.2 From 6b7a35e475e9cceb46e45cdf6c009e6b2e249fdf Mon Sep 17 00:00:00 2001 From: huang_h Date: Tue, 17 Feb 2026 12:37:27 +0100 Subject: [PATCH 6/8] mcda-dss config --- conf.d/mcda-dss.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 conf.d/mcda-dss.conf diff --git a/conf.d/mcda-dss.conf b/conf.d/mcda-dss.conf new file mode 100644 index 0000000..204f66a --- /dev/null +++ b/conf.d/mcda-dss.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name mcda-dss-test.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name mcda-dss-test.psi.ch; + + ssl_certificate /etc/nginx/certs/mcda-dss-test.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/mcda-dss-test.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; + } +} \ No newline at end of file From bfb65dddaf8b64115d4ced159cda794f4d902000 Mon Sep 17 00:00:00 2001 From: "tom.ritter" Date: Fri, 20 Feb 2026 10:34:06 +0100 Subject: [PATCH 7/8] chore(v4.0.3): remove faulty liquibase --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 15fd3d5..5789d61 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -206,7 +206,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: From 6ca93c959786f37057f23e06a6987dc4f641af8f Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Tue, 24 Feb 2026 14:15:48 +0100 Subject: [PATCH 8/8] fixed mcda-dss compose Signed-off-by: Basil Bruhn --- docker-compose.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9877cfc..8d57d84 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -93,13 +93,13 @@ services: # Also installed on docker-dmz # PSI Service # MCDA DSS - mcda-calculator: - image: gitea.psi.ch/images/mcda-dss:0.1.0 - container_name: mcda-dss - restart: always - networks: - - backend - + 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