Add allotted resource recipe table

[so/docker-config.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 7cf32df..1769b46 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2'
 networks:
   default:
     driver: bridge
@@ -21,10 +21,6 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      timeout: 20s
-      retries: 10
   mso:
     image: openecomp/mso
     ports:
@@ -36,13 +32,23 @@ services:
       - ./volumes/mso/chef-config:/shared
     environment:
       - MYSQL_ROOT_PASSWORD=password
+      - ONAP_IP=${OPENO_IP}
     hostname:
       mso.mso.testlab.openecomp.org
     depends_on:
-      mariadb:
-        condition: service_healthy
+      - mariadb
+    links:
+      - mariadb
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
+    command:
+      - /wait-for.sh
+      - -q
+      - -t
+      - "300"
+      - mariadb:3306
+      - --
+      - /opt/mso/scripts/start-jboss-server.sh