X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=1769b463b528e0f7be7666256d827b45149cf934;hb=4f1ed42e92332e9cd82a25b76f341757cb82bb18;hp=d176228c7031557ea0a99ae5f96fa99daeffa8b4;hpb=c4e65037584636b7a3b3c9920fd501126fb68fcc;p=so%2Fdocker-config.git

diff --git a/docker-compose.yml b/docker-compose.yml
index d176228..1769b46 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,54 @@
-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: ecomp/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'
+networks:
+  default:
+    driver: bridge
+    driver_opts:
+      com.docker.network.driver.mtu: ${MTU}
+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: openecomp/mso
+    ports:
+      - "3904:3904"
+      - "3905:3905"
+      - "8080:8080"
+      - "9990:9990"
+    volumes:
+      - ./volumes/mso/chef-config:/shared
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - ONAP_IP=${OPENO_IP}
+    hostname:
+      mso.mso.testlab.openecomp.org
+    depends_on:
+      - 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