From: Rob Daugherty <rd472p@att.com>
Date: Thu, 19 Oct 2017 21:33:57 +0000 (-0400)
Subject: Revert "Enforce container boot order"
X-Git-Tag: 2.0.0-ONAP~52
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=315516d8f6bb85f90807d3cfb3c34a4065fad735;p=so%2Fdocker-config.git

Revert "Enforce container boot order"

The integration has said they will not accept this
change at this time because it would require them
to upgrade their version of docker-compose.

This reverts commit 9872c1abfb4326c85e4f8175b4bd2a23f2e1c9f0.

Issue: SO-208
Change-Id: I4000c1f7fbe5acba6a3fb55ef54e672df447b5f2
Signed-off-by: Rob Daugherty <rd472p@att.com>
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 7cf32df..65da92f 100644
--- 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:
@@ -39,8 +35,7 @@ services:
     hostname:
       mso.mso.testlab.openecomp.org
     depends_on:
-      mariadb:
-        condition: service_healthy
+      - mariadb
     logging:
       driver: "json-file"
       options: