Version 2 of docker-compose

Change-Id: I50d3efdbe39327dd804301cc259396ab01aa26ba
Signed-off-by: Anaël Closson <ac2550@intl.att.com>

diff --git a/docker-compose.yml b/docker-compose.yml
index 6259c9b..d1f1e1b 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,40 @@
-mariadb:
-  image: mariadb:10.1.11
-  ports:
-    - "3306"
-  volumes:
-    - ./volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-    - ./volumes/mariadb/conf.d:/etc/mysql/conf.d
-  environment:
-    - MYSQL_ROOT_PASSWORD=password
-  hostname:
-    db.mso.testlab.openecomp.org
-    
-mso:
-  image: openecomp/mso
-  ports:
-    - "3904:3904"
-    - "3905:3905"    
-    - "8080:8080"
-    - "9990:9990"    
-  volumes:
-    - ./volumes/mso/chef-config:/shared
-  links:
-    - mariadb:mariadb
-  environment:
-    - MYSQL_ROOT_PASSWORD=password
-  hostname:
-    mso.mso.testlab.openecomp.org
\ No newline at end of file
+version: '2'
+
+services:
+  mariadb:
+    image: mariadb:10.1.11
+    ports:
+      - "3306"
+    volumes:
+      - ./volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+      - ./volumes/mariadb/conf.d:/etc/mysql/conf.d
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+    hostname:
+      db.mso.testlab.openecomp.org
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+
+  mso:
+    image: ecomp/mso
+    ports:
+      - "3904:3904"
+      - "3905:3905"
+      - "8080:8080"
+      - "9990:9990"
+    volumes:
+      - ./volumes/mso/chef-config:/shared
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+    hostname:
+      mso.mso.testlab.openecomp.org
+    depends_on:
+      - mariadb
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"