Add waiting for containers to set up

[integration/csit.git] / plans / aaf / certservice / docker-compose.yml

diff --git a/plans/aaf/certservice/docker-compose.yml b/plans/aaf/certservice/docker-compose.yml
index 84da735..ae7ee87 100644 (file)
--- a/plans/aaf/certservice/docker-compose.yml
+++ b/plans/aaf/certservice/docker-compose.yml
@@ -2,23 +2,24 @@ version: "2.1"
 
 services:
   ejbca:
-    image: primekey/ejbca-ce
+    image: primekey/ejbca-ce:6.15.2.5
     hostname: cahostname
     container_name: aafcert-ejbca
     ports:
-        - "80:8080"
-        - "443:8443"
+      - "80:8080"
+      - "443:8443"
     volumes:
-        - $SCRIPTS_PATH:/opt/primekey/scripts
+      - $SCRIPTS_PATH:/opt/primekey/scripts
     command: bash -c "
-      ./scripts/ejbca-configuration.sh &
       /opt/primekey/bin/start.sh
       "
     healthcheck:
       test: ["CMD-SHELL", "curl -kI https://localhost:8443/ejbca/publicweb/healthcheck/ejbcahealth"]
-      interval: 10s
+      interval: 20s
       timeout: 3s
       retries: 9
+    networks:
+      - certservice
 
   certservice:
     image: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:latest
@@ -30,4 +31,11 @@ services:
     depends_on:
       ejbca:
         condition: service_healthy
+    networks:
+      - certservice
+
+
+networks:
+  certservice:
+    driver: bridge