commit b74c9142a4a6af131af1d62e03d3505c4cd42a4c
author Zack Williams <zdw@cs.arizona.edu> Wed Dec 14 17:07:12 2016 -0700
committer Zack Williams <zdw@cs.arizona.edu> Fri Dec 16 11:39:26 2016 -0700
tree a4a61d7a198a363fd564be93872aceb0fdcbebf1
parent d0c49fd68e4603c758c39c60122ef2cc6d6b2e99

convert over to docker-compose v2 format, create 'xos' network, to try to get #1850 in faster
use xos_db db host, update other docker-compose files

Change-Id: I7c81b11b9effb0eb89c1eaff515e9901e1096a4a

mcord/docker-compose-bootstrap.yml

diff --git a/mcord/docker-compose-bootstrap.yml b/mcord/docker-compose-bootstrap.yml
index bb79486..2852b4d 100644
--- a/mcord/docker-compose-bootstrap.yml
+++ b/mcord/docker-compose-bootstrap.yml
@@ -1,10 +1,22 @@
-xos_db:
+---
+version: '2'
+
+networks:
+  xos:
+    external: true
+
+services:
+  xos_db:
     image: xosproject/xos-postgres
+    networks:
+      - xos
     expose:
         - "5432"
 
-xos_synchronizer_onboarding:
+  xos_synchronizer_onboarding:
     image: xosproject/xos
+    networks:
+      - xos
     command: bash -c "cd /opt/xos/synchronizers/onboarding; ./run.sh"
     #command: sleep 86400
     labels:
@@ -18,10 +30,11 @@
         - ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
         - ../../xos_services:/opt/xos_services
         - ../../xos_libraries:/opt/xos_libraries
-    log_driver: "json-file"
-    log_opt:
-            max-size: "100k"
-            max-file: "5"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1000k"
+        max-file: "5"
 
 #xos_synchronizer_openstack:
 #    command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
@@ -42,11 +55,13 @@
 #            max-size: "100k"
 #            max-file: "5"
 
-xos_bootstrap_ui:
+  xos_bootstrap_ui:
     command: python /opt/xos/manage.py runserver 0.0.0.0:81 --insecure --makemigrations
     environment:
         - CONFIG_DIR
     image: xosproject/xos
+    networks:
+      - xos
     links:
         - xos_db
     ports:
@@ -58,7 +73,9 @@
         - ../../xos_services:/opt/xos_services
         - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
         - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
-    log_driver: "json-file"
-    log_opt:
-            max-size: "100k"
-            max-file: "5"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1000k"
+        max-file: "5"
+