From 5d4414723d0d6276e30a091bfd048d811ce8570d Mon Sep 17 00:00:00 2001
From: Jonathan Lee <jonjohn1232009@gmail.com>
Date: Mon, 13 Jun 2016 21:47:59 -0400
Subject: [PATCH] Upgrade docker-compose files to v2

---
 cadvisor/docker-compose.yml    | 20 +++++++-------
 prepare-vms/docker-compose.yml | 49 ++++++++++++++++++----------------
 www/docker-compose.yml         | 15 ++++++-----
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/cadvisor/docker-compose.yml b/cadvisor/docker-compose.yml
index 8d05fa7b..80ac9586 100644
--- a/cadvisor/docker-compose.yml
+++ b/cadvisor/docker-compose.yml
@@ -1,10 +1,12 @@
-cadvisor:
-  image: google/cadvisor
-  ports:
-    - "8080:8080"
-  volumes:
-    - "/:/rootfs:ro"
-    - "/var/run:/var/run:rw"
-    - "/sys:/sys:ro"
-    - "/var/lib/docker/:/var/lib/docker:ro"
+version: "2"
 
+services:
+    cadvisor:
+      image: google/cadvisor
+      ports:
+        - "8080:8080"
+      volumes:
+        - "/:/rootfs:ro"
+        - "/var/run:/var/run:rw"
+        - "/sys:/sys:ro"
+        - "/var/lib/docker/:/var/lib/docker:ro"
diff --git a/prepare-vms/docker-compose.yml b/prepare-vms/docker-compose.yml
index e439cc2f..e394c1b9 100644
--- a/prepare-vms/docker-compose.yml
+++ b/prepare-vms/docker-compose.yml
@@ -1,23 +1,26 @@
-prepare-vms:
-    build: .
-    container_name: prepare-vms
-    working_dir: /root/prepare-vms
-    volumes:
-        - $HOME/.aws/:/root/.aws/
-        - /etc/localtime:/etc/localtime:ro
-        - /tmp/.X11-unix:/tmp/.X11-unix
-        - $SSH_AUTH_DIRNAME:$SSH_AUTH_DIRNAME
-        - $PWD/:/root/prepare-vms/
-    environment:
-        SCRIPT_DIR: /root/prepare-vms
-        DISPLAY: ${DISPLAY}
-        SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
-        SSH_AGENT_PID: ${SSH_AGENT_PID}
-        AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
-        AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
-        AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
-        AWS_DEFAULT_OUTPUT: json
-        AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
-        AWS_VPC_ID: ${AWS_VPC_ID}
-        USER: ${USER}
-    entrypoint: /root/prepare-vms/scripts/trainer-cli
+version: "2"
+
+services:
+    prepare-vms:
+        build: .
+        container_name: prepare-vms
+        working_dir: /root/prepare-vms
+        volumes:
+            - $HOME/.aws/:/root/.aws/
+            - /etc/localtime:/etc/localtime:ro
+            - /tmp/.X11-unix:/tmp/.X11-unix
+            - $SSH_AUTH_DIRNAME:$SSH_AUTH_DIRNAME
+            - $PWD/:/root/prepare-vms/
+        environment:
+            SCRIPT_DIR: /root/prepare-vms
+            DISPLAY: ${DISPLAY}
+            SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
+            SSH_AGENT_PID: ${SSH_AGENT_PID}
+            AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+            AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+            AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
+            AWS_DEFAULT_OUTPUT: json
+            AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
+            AWS_VPC_ID: ${AWS_VPC_ID}
+            USER: ${USER}
+        entrypoint: /root/prepare-vms/scripts/trainer-cli
diff --git a/www/docker-compose.yml b/www/docker-compose.yml
index ca8b6c24..466c5075 100644
--- a/www/docker-compose.yml
+++ b/www/docker-compose.yml
@@ -1,6 +1,9 @@
-www:
-  image: nginx
-  ports:
-    - "8080:80"
-  volumes:
-    - "./htdocs:/usr/share/nginx/html"
+version: "2"
+
+services:
+    www:
+      image: nginx
+      ports:
+        - "8080:80"
+      volumes:
+        - "./htdocs:/usr/share/nginx/html"