From 3ba80ea066996033cc3a73fb29011455ceda94a6 Mon Sep 17 00:00:00 2001 From: fpotier Date: Thu, 7 May 2026 10:59:01 +0200 Subject: [PATCH 1/3] add scicat-rocrate-dev --- conf.d/scicat-rocrate-dev.conf | 26 ++++++++++++++++++++++++++ docker-compose.yaml | 9 +++++++++ 2 files changed, 35 insertions(+) create mode 100644 conf.d/scicat-rocrate-dev.conf diff --git a/conf.d/scicat-rocrate-dev.conf b/conf.d/scicat-rocrate-dev.conf new file mode 100644 index 0000000..ef0905f --- /dev/null +++ b/conf.d/scicat-rocrate-dev.conf @@ -0,0 +1,26 @@ +server { + listen 80; + server_name scicat-rocrate-development.psi.ch; + client_max_body_size 50M; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + client_max_body_size 50M; + server_name scicat-rocrate-development.psi.ch; + + ssl_certificate /etc/nginx/certs/scicat-rocrate-development.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/scicat-rocrate-development.psi.ch.key; + + location / { + client_max_body_size 50M; + proxy_pass http://scicat-rocrate-dev: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 8815d4c..de1fbd5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -480,6 +480,15 @@ services: - tomcatwiki_backend - backend + scicat-rocrate-dev: + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.2.9 + container_name: scicat-rocrate-dev + networks: + - backend + environment: + - QUARKUS_REST_CLIENT_SCICAT_URL=https://scicat.development.psi.ch + - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.development.psi.ch + networks: public: backend: From 24e8cd2b87099a3115df3aa263096bbcf8966b29 Mon Sep 17 00:00:00 2001 From: fpotier Date: Tue, 23 Jun 2026 13:32:28 +0200 Subject: [PATCH 2/3] latest tag + mount storage --- docker-compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index de1fbd5..69a27b7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -481,13 +481,15 @@ services: - backend scicat-rocrate-dev: - image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.2.9 + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.4.4 container_name: scicat-rocrate-dev networks: - backend environment: - QUARKUS_REST_CLIENT_SCICAT_URL=https://scicat.development.psi.ch - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.development.psi.ch + volumes: + - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw networks: public: From 4b535339bfb64dd16aca4eae96094b1c4eee2fc6 Mon Sep 17 00:00:00 2001 From: fpotier Date: Fri, 26 Jun 2026 10:18:29 +0200 Subject: [PATCH 3/3] restart policy + max body size --- conf.d/scicat-rocrate-dev.conf | 5 ++--- docker-compose.yaml | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf.d/scicat-rocrate-dev.conf b/conf.d/scicat-rocrate-dev.conf index ef0905f..33b66c3 100644 --- a/conf.d/scicat-rocrate-dev.conf +++ b/conf.d/scicat-rocrate-dev.conf @@ -1,20 +1,19 @@ server { listen 80; server_name scicat-rocrate-development.psi.ch; - client_max_body_size 50M; + client_max_body_size 10G; return 301 https://$host$request_uri; } server { listen 443 ssl; - client_max_body_size 50M; + client_max_body_size 10G; server_name scicat-rocrate-development.psi.ch; ssl_certificate /etc/nginx/certs/scicat-rocrate-development.psi.ch.crt; ssl_certificate_key /etc/nginx/private/scicat-rocrate-development.psi.ch.key; location / { - client_max_body_size 50M; proxy_pass http://scicat-rocrate-dev:8080; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docker-compose.yaml b/docker-compose.yaml index 69a27b7..ddceed4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -481,13 +481,15 @@ services: - backend scicat-rocrate-dev: - image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.4.4 + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2 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_HTTP_LIMITS_MAX_BODY_SIZE=10G volumes: - /opt/webcontent/rocrate-dev/dev:/ro-crate:rw