Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ

docker-compose.yaml

@@ -162,15 +162,16 @@ services:
   # Only on rhodo_network. The `backend` alias is required because
   # the frontend image's internal nginx uses http://backend:8000/
   rhodo-backend:
-    image: gitea.psi.ch/images/grn_opsins-backend:1.0.0
+    image: gitea.psi.ch/images/grn_opsins-backend:1.2.0
     container_name: rhodo-backend
+    restart: always
     networks:
       rhodo_network:
         aliases:
           - backend
 
   rhodo-frontend:
-    image: gitea.psi.ch/images/grn_opsins-frontend:1.0.0
+    image: gitea.psi.ch/images/grn_opsins-frontend:1.2.0
     container_name: rhodo-frontend
     restart: always
     depends_on:
@@ -180,7 +181,7 @@ services:
       - backend
 
   scicat-rocrate-qa:
-    image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.5.2
+    image: gitea.psi.ch/data-catalog-services/scicat-rocrate:2.6.0-rc-openbis-import.5
     container_name: scicat-rocrate-qa
     restart: always
     networks:
@@ -189,21 +190,26 @@ 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
+      - SCICAT_PID_PREFIX=20.500.11935
     volumes:
-      - /mount/rocrate/qa:/rocrate:rw
+      - /mount/rocrate_qa:/rocrate:rw
 
 # LEAPS ultrafast frithjof.nolting@psi.ch
   felira-web:
-    image: gitea.psi.ch/leaps/leaps-felira:latest
+    image: gitea.psi.ch/leaps/leaps-felira:3.0.3
     container_name: felira-web
     restart: always
-    volumes:
-      - /mount/webhosting_dmz_write/leaps/web:/var/www/html:rw
+    # volumes:
+    #   - /mount/webhosting_dmz_write/leaps/web:/var/www/html:rw
     depends_on:
       - felira-db
     networks:
       - backend
       - leaps_db
+    environment:
+      - DB_DATABASE=felira_leaps_ultrafast
+      - DB_USERNAME=felira_leaps_ultrafast
+      - DB_PASSWORD=${LEAPS_DB_PW}
   felira-db:
     image: mariadb:latest
     container_name: felira-db