Updated config for new OpenSCD container using Bitnami

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

compas/docker-compose-basex.yml

@@ -144,15 +144,12 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.24.0.3"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
+    image: "lfenergy/compas-open-scd:v0.24.0.4"
     depends_on:
       - scl-data-service
       - cim-mapping
+      - scl-auto-alignment
+      - scl-validator
 
   reverse-proxy:
     labels:
@@ -163,15 +160,12 @@ services:
         COMPAS_HOSTNAME: ${COMPAS_HOSTNAME}
     ports:
       - "80:80"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
     depends_on:
       - keycloak
       - scl-data-service
       - cim-mapping
+      - scl-auto-alignment
+      - scl-validator
       - open-scd
 
 volumes:

compas/docker-compose-postgresql.yml

@@ -8,7 +8,7 @@ services:
   postgresql:
     labels:
       compas: true
-    image: "postgres:14.4"
+    image: "postgres:14.5"
     ports:
       - "5432:5432"
     environment:
@@ -151,12 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.24.0.3"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
+    image: "lfenergy/compas-open-scd:v0.24.0.4"
     depends_on:
       - scl-data-service
       - cim-mapping
@@ -172,11 +167,6 @@ services:
         COMPAS_HOSTNAME: ${COMPAS_HOSTNAME}
     ports:
       - "80:80"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
     depends_on:
       - keycloak
       - scl-data-service

compas/reverse-proxy/nginx.conf

@@ -45,7 +45,7 @@ http {
        # Added Header back to browser to get JWT Content for Debugging, should not do this in production.
        add_header X-Debug-Bearer "Bearer ${access_token}" always;
 
-       proxy_pass http://open-scd:80/;
+       proxy_pass http://open-scd:8080/;
 
        proxy_set_header Host $http_host;
        proxy_cache_bypass $http_upgrade;