merge upstream

conf.d/scicat-rocrate.conf

@@ -0,0 +1,25 @@
+server {
+    listen 80;
+    server_name scicat-rocrate.psi.ch;
+    client_max_body_size 10G;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    client_max_body_size 10G;
+    server_name scicat-rocrate.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
+
+    location / {
+        proxy_pass http://scicat-rocrate:8080;
+        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;
+	    proxy_set_header Cookie $http_cookie;
+	    proxy_set_header Authorization $http_authorization;
+    }
+}

docker-compose.yaml

@@ -261,9 +261,25 @@ services:
     volumes:
       - /mount/rocrate_qa:/rocrate:rw
 
+  scicat-rocrate:
+    image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.5
+    container_name: scicat-rocrate
+    restart: always
+    networks:
+      - backend
+    environment:
+      - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat.psi.ch
+      - QUARKUS_REST_CLIENT_S3BROKER_URL=https://scicat-s3-broker.psi.ch
+      - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G
+      - SCICAT_PID_PREFIX=20.500.11935
+      - QUARKUS_LOG_FILE_ENABLE=true
+      - QUARKUS_LOG_FILE_PATH=/rocrate/scicat-rocrate.log
+    volumes:
+      - /mount/rocrate_prod:/rocrate:rw
+
   # LEAPS ultrafast frithjof.nolting@psi.ch
   felira-web:
-    image: gitea.psi.ch/leaps/leaps-felira:3.0.3
+    image: gitea.psi.ch/leaps/leaps-felira:3.1.18
     container_name: felira-web
     restart: always
     # volumes: