From 8e6e770e3ec5de3c1e2ee3aad47ffadf6af0e347 Mon Sep 17 00:00:00 2001 From: huang_h Date: Fri, 28 Aug 2026 09:05:42 +0200 Subject: [PATCH 1/3] Tier-ranking tool REST fix (#35) Co-authored-by: River Huang Reviewed-on: https://gitea.psi.ch/linux/WebHosting_DMZ/pulls/35 Reviewed-by: buchel_k Co-authored-by: huang_h --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 89e1439..2c888bd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -146,7 +146,7 @@ services: # Enea Zeolla drsa-tiermaker: - image: gitea.psi.ch/images/drsa-tiermaker:0.2.0 + image: gitea.psi.ch/images/drsa-tiermaker:0.2.1 container_name: drsa-tiermaker restart: always depends_on: From 2a7a1fe006421096dba74e5f1ca2adab288d97bf Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Mon, 31 Aug 2026 08:44:12 +0200 Subject: [PATCH 2/3] Update felira to 3.1.18 Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2c888bd..c9ed085 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -263,7 +263,7 @@ services: # 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: From 2ece82de8a2e57a239babb1adc6efb07394e5e95 Mon Sep 17 00:00:00 2001 From: fpotier Date: Mon, 31 Aug 2026 09:44:40 +0200 Subject: [PATCH 3/3] scicat-rocrate prod deployment --- conf.d/scicat-rocrate.conf | 25 +++++++++++++++++++++++++ docker-compose.yaml | 16 ++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 conf.d/scicat-rocrate.conf diff --git a/conf.d/scicat-rocrate.conf b/conf.d/scicat-rocrate.conf new file mode 100644 index 0000000..43f9758 --- /dev/null +++ b/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; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index c9ed085..18e6998 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -261,6 +261,22 @@ 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.1.18