Remove UI container health check and fix restart policies of AAS cont…

…ainers
eclipse-slm · Sep 22, 2023 · b77fec9 · b77fec9
1 parent ded26ca
commit b77fec9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/stack/compose/base.aas.yml b/stack/compose/base.aas.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   aas-registry:
     image: eclipsebasyx/aas-registry:1.4.0
-    restart: always
+    restart: unless-stopped
     depends_on:
       - aas-database
       - aas-server
@@ -26,7 +26,7 @@ services:
 
   aas-server:
     image: eclipsebasyx/aas-server:1.4.0
-    restart: always
+    restart: unless-stopped
     depends_on:
       - aas-database
       - aas-broker
@@ -51,7 +51,7 @@ services:
 
   aas-database:
     image: mongo:latest
-    restart: always
+    restart: unless-stopped
     networks:
       default:
         aliases:
@@ -61,7 +61,7 @@ services:
 
   aas-gui:
     image: eclipsebasyx/aas-gui:v230703
-    restart: always
+    restart: unless-stopped
     ports:
       - "3000:3000"
     environment:

diff --git a/stack/compose/slm.yml b/stack/compose/slm.yml
@@ -24,8 +24,6 @@ services:
       KEYCLOAK_URL: "http://${SLM_HOSTNAME}:${KEYCLOAK_PORT}/auth"
       AWX_URL: "http://${SLM_HOSTNAME}:${AWX_PORT_HTTP}"
       BASYX_AAS_GUI_URL: "http://${SLM_HOSTNAME}:3000"
-    healthcheck:
-      test: [ "CMD", "curl", "http://localhost:8080" ]
 
   resource-management:
     image: ghcr.io/eclipse-slm/slm/resource-management:${SLM_VERSION}

diff --git a/tests/backend/src/test/java/org/eclipse/slm/tests/stack/DockerStackTests.java b/tests/backend/src/test/java/org/eclipse/slm/tests/stack/DockerStackTests.java
@@ -37,7 +37,7 @@ public class DockerStackTests {
         put("keycloak-database", "healthy");
         put("keycloak-init", "exited");
         put("vault", "healthy");
-        put("ui", "unhealthy");
+        put("ui", "running");
         put("notification-service", "healthy");
         put("notification-service-database", "healthy");
         put("resource-management", "healthy");