From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 19 Oct 2017 08:33:20 +0000 (+0200)
Subject: Enforce container boot order
X-Git-Tag: 2.0.0-ONAP~54
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9872c1abfb4326c85e4f8175b4bd2a23f2e1c9f0;p=so%2Fdocker-config.git

Enforce container boot order

Make sure that so container is started only
when db is ready to connect

Change-Id: I6ba1d9df7837f482def82d33b90fe5be52c686dd
Issue-ID: SO-208
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 65da92f..7cf32df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 networks:
   default:
     driver: bridge
@@ -21,6 +21,10 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      timeout: 20s
+      retries: 10
   mso:
     image: openecomp/mso
     ports:
@@ -35,7 +39,8 @@ services:
     hostname:
       mso.mso.testlab.openecomp.org
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_healthy
     logging:
       driver: "json-file"
       options: