Merge branch 'master' into 'feat/trialytix-demo'

# Conflicts:
#   02_hetzner/02_trialytix/trialytix-demo/deployment.yaml

01_onsite/01_dev/shubbkoarnsru/deployment.yaml

@@ -24,7 +24,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: schubbkoarnsru
-          image: packages.semapp.lan:5000/schubbkoarnsru:v1.0.7
+          image: packages.semapp.lan:5000/schubbkoarnsru:develop
           imagePullPolicy: Always
           resources:
             requests:

01_onsite/02_qa/trialytix/deployment.yaml

@@ -22,10 +22,10 @@ spec:
 
         resources:
           requests:
-            memory: "256Mi"
-            cpu: "100m"
-          limits:
             memory: "512Mi"
+            cpu: "1"
+          limits:
+            memory: "2048Mi"
             cpu: "4"
         ports:
           - containerPort: 5100
@@ -41,10 +41,10 @@ spec:
 
         resources:
           requests:
-            memory: "256Mi"
-            cpu: "100m"
-          limits:
             memory: "512Mi"
+            cpu: "1"
+          limits:
+            memory: "2048Mi"
             cpu: "4"
         ports:
           - containerPort: 8100
@@ -84,6 +84,7 @@ data:
   API_URL: 'http://trialytix-qa.k3s.semapp.lan'
   FRONTEND_PORT: '8100'
   BACKEND_PORT: '5100'
+  ENV_TYPE: 'qa'
 
 # Nginx configuration
 ---

02_hetzner/01_prod/rm/deployment.yaml

@@ -133,7 +133,7 @@ data:
 
     # media_type = django.core.files.storage.FileSystemStorage
 
-    media_type = flexrm.kernel.minio.storage.MinIOMediaStorage
+    media_type = flexrm.kernel.storage.minio.storage.MinIOMediaStorage
     minio_endpoint = minio-api.semprod.local
     minio_use_https = False
     minio_media_bucket = rm-prod

02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml

@@ -18,13 +18,13 @@ spec:
       containers:
       # Backend container
       - name: trialytix-backend
-        image: packages.semapp.lan:5000/trialytix_backend:1.6.4-rc1
+        image: packages.semapp.lan:5000/trialytix_backend:1.7.0-rc1
         resources:
           requests:
-            memory: "256Mi"
+            memory: "512Mi"
             cpu: "100m"
           limits:
-            memory: "512Mi"
+            memory: "1024Mi"
             cpu: "4"
         ports:
           - containerPort: 5100
@@ -36,7 +36,7 @@ spec:
         imagePullPolicy: Always
       # Frontend container
       - name: trialytix-frontend
-        image: packages.semapp.lan:5000/trialytix_frontend:1.6.4-rc1
+        image: packages.semapp.lan:5000/trialytix_frontend:1.7.0-rc1
         resources:
           requests:
             memory: "256Mi"