merge upstream

conf.d/rf-pikett.conf

@@ -1,21 +1,21 @@
 server {
     listen 80;
-    server_name mcda-pct-test.psi.ch;
+    server_name rf-pikett.psi.ch;
     return 301 https://$host$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name mcda-pct-test.psi.ch;
+    server_name rf-pikett.psi.ch;
 
-    ssl_certificate /etc/nginx/certs/mcda-pct-test.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/mcda-pct-test.psi.ch.key;
+    ssl_certificate /etc/nginx/certs/rf-pikett.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/rf-pikett.psi.ch.key;
 
     location / {
-        proxy_pass http://mcda-pct:8080;
+        proxy_pass http://pikettlischte-beautifier:80;
         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;
     }
-}
+}

conf.d/tiermaker.conf

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

docker-compose.yaml

@@ -140,13 +140,51 @@ services:
     networks:
       - backend
 
-  # MCDA PCT tool
-  mcda-pct:
-    image: gitea.psi.ch/images/mcda-pct:0.2.0
-    container_name: mcda-pct
+  # Enea Zeolla <enea.zeolla@psi.ch>
+  drsa-tiermaker:
+    image: gitea.psi.ch/images/drsa-tiermaker:0.1.5
+    container_name: drsa-tiermaker
     restart: always
+    depends_on:
+      drsa-tiermaker-db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=postgresql+psycopg2://${DRSA_TIERMAKER_DB_USER}:${DRSA_TIERMAKER_DB_PW}@drsa-tiermaker-db:5432/drsa_tiermaker
+      - SECRET_KEY=${DRSA_TIERMAKER_SECRET_KEY}
+      - FIRST_ADMIN_EMAIL=mcda@psi.ch
+      - FIRST_ADMIN_PASSWORD=${DRSA_TIERMAKER_ADMIN_PW}
+      - ENVIRONMENT=production
+      - COOKIE_SECURE=true
+      - DRSA_ENGINE=builtin
+      - WEB_CONCURRENCY=2
+      - CORS_ORIGINS=${DRSA_TIERMAKER_URL}
+      - APP_BASE_URL=${DRSA_TIERMAKER_URL}
     networks:
       - backend
+      - drsa_tiermaker_backend
+  # Enea Zeolla <enea.zeolla@psi.ch>
+  drsa-tiermaker-db:
+    image: postgres:16-alpine
+    container_name: drsa-tiermaker-db
+    restart: always
+    environment:
+      - POSTGRES_USER=${DRSA_TIERMAKER_DB_USER}
+      - POSTGRES_PASSWORD=${DRSA_TIERMAKER_DB_PW}
+      - POSTGRES_DB=drsa_tiermaker
+    volumes:
+      - /opt/webcontent/drsa-tiermaker/db-data:/var/lib/postgresql/data
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${DRSA_TIERMAKER_DB_USER} -d drsa_tiermaker",
+        ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    networks:
+      - drsa_tiermaker_backend
 
   # PEPISCO <andras.boedi@psi.ch> <patrick.hemberger@psi.ch>
   # PhotoElectron PhotoIon Spectral COmpendium
@@ -523,18 +561,28 @@ services:
       - backend
 
   scicat-rocrate-dev:
-    image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2
+    image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.0
     container_name: scicat-rocrate-dev
     restart: always
     networks:
       - backend
     environment:
       - QUARKUS_REST_CLIENT_SCICAT_URL=https://scicat.development.psi.ch
-      - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.development.psi.ch
+      - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.development.psi.ch
       - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G
     volumes:
       - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw
 
+  # Aimo Altorfer / Roger Kalt - RF
+  # rf-pikett.psi.ch - Pikettlischte Beautifier
+  # Image is built from https://gitea.psi.ch/RF/pikettlischte-beautifier
+  pikettlischte-beautifier:
+    image: gitea.psi.ch/rf/pikettlischte-beautifier:latest
+    container_name: pikettlischte-beautifier
+    restart: always
+    networks:
+      - backend
+
 networks:
   public:
   backend:
@@ -542,3 +590,4 @@ networks:
   it_strategy_dashboard_backend:
   panda_maintenance_backend:
   tomcatwiki_backend:
+  drsa_tiermaker_backend: