From b9bcc9ae94b6d5ef3b10dd9ca29dda21a541cd22 Mon Sep 17 00:00:00 2001 From: fpotier Date: Fri, 26 Jun 2026 11:13:18 +0200 Subject: [PATCH 1/4] add scicat-rocrate QA --- conf.d/scicat-rocrate-qa.conf | 25 +++++++++++++++++++++++++ docker-compose.yaml | 11 +++++++++++ 2 files changed, 36 insertions(+) create mode 100644 conf.d/scicat-rocrate-qa.conf diff --git a/conf.d/scicat-rocrate-qa.conf b/conf.d/scicat-rocrate-qa.conf new file mode 100644 index 0000000..d19d922 --- /dev/null +++ b/conf.d/scicat-rocrate-qa.conf @@ -0,0 +1,25 @@ +erver { + listen 80; + server_name scicat-rocrate-qa.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-qa.psi.ch; + + ssl_certificate /etc/nginx/certs/scicat-rocrate-qa.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/scicat-rocrate-qa.psi.ch.key; + + location / { + proxy_pass http://scicat-rocrate-qa: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 6d277a4..6ce83b2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -177,6 +177,17 @@ services: - rhodo_network - backend + scicat-rocrate: + image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2 + container_name: scicat-rocrate-qa + restart: always + networks: + - backend + environment: + - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat-qa.psi.ch + - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.qa.psi.ch + - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G + networks: public: backend: From c888f5fa86bc53d4261bc9f47438ec6c8f4450ac Mon Sep 17 00:00:00 2001 From: fpotier Date: Wed, 1 Jul 2026 11:42:11 +0200 Subject: [PATCH 2/4] mount nfs share --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6ce83b2..921e39f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -187,6 +187,8 @@ services: - QUARKUS_REST_CLIENT_SCICAT_URL=https://dacat-qa.psi.ch - QUARKUS_REST_CLIENT_S3BROKER_URL=https://s3-broker.qa.psi.ch - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=10G + volumes: + - /mount/rocrate/qa:/rocrate:rw networks: public: From 24cb61de6988981e23b7d42463d80a36b5984588 Mon Sep 17 00:00:00 2001 From: fpotier Date: Wed, 1 Jul 2026 11:43:40 +0200 Subject: [PATCH 3/4] fix service name --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 921e39f..ca9387d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -177,7 +177,7 @@ services: - rhodo_network - backend - scicat-rocrate: + scicat-rocrate-qa: image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2 container_name: scicat-rocrate-qa restart: always From ac6622d50017eee13df8663bbda6c419ae0fa1a8 Mon Sep 17 00:00:00 2001 From: fpotier Date: Wed, 1 Jul 2026 11:51:19 +0200 Subject: [PATCH 4/4] update certificate name --- conf.d/scicat-rocrate-qa.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/scicat-rocrate-qa.conf b/conf.d/scicat-rocrate-qa.conf index d19d922..61d2aa6 100644 --- a/conf.d/scicat-rocrate-qa.conf +++ b/conf.d/scicat-rocrate-qa.conf @@ -10,8 +10,8 @@ server { client_max_body_size 10G; server_name scicat-rocrate-qa.psi.ch; - ssl_certificate /etc/nginx/certs/scicat-rocrate-qa.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/scicat-rocrate-qa.psi.ch.key; + 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-qa:8080;