Merge branch 'main' into main

conf.d/swiss-ecargo.conf

@@ -1,18 +1,18 @@
 server {
     listen 80;
-    server_name carculator-api-test.psi.ch;
+    server_name swiss-ecargo-api-test.psi.ch;
     return 301 https://$host$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name carculator-api-test.psi.ch;
+    server_name swiss-ecargo-api-test.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/carculator-api-test.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/carculator-api-test.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/swiss-ecargo-api-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/swiss-ecargo-api-test.psi.ch.key;
 
     location / {
-        proxy_pass http://carculator:8000;
+        proxy_pass http://swiss-ecargo: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;

docker-compose.yaml

@@ -11,6 +11,8 @@ services:
       - "80:80"
       - "443:443"
     volumes:
+      - /etc/letsencrypt/live:/etc/letsencrypt/live:ro
+      - /etc/letsencrypt/archive:/etc/letsencrypt/archive:ro
       - /etc/pki/tls/certs:/etc/nginx/certs:ro
       - /etc/pki/tls/private:/etc/nginx/private:ro
       - /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
@@ -66,11 +68,9 @@ services:
       - backend
 
   # Romain Sacchi <romain.sacchi@psi.ch>
-  # Also installed on docker-dmz
-  # PSI Service
-  carculator:
-    image: gitea.psi.ch/sacchi_r/carculator:0.1.0
-    container_name: carculator
+  swiss-ecargo:
+    image: gitea.psi.ch/sacchi_r/swiss-ecargo:0.1.0
+    container_name: swiss-ecargo
     restart: always
     networks:
       - backend
@@ -219,7 +219,7 @@ services:
       - it_strategy_dashboard_backend
 
   it-strategy-dashboard-backend:
-    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:2.0
+    image: gitea.psi.ch/9501/it-strategy-dashboard-backend:2.0.1
     container_name: it-strategy-dashboard-backend
     restart: always
     environment: