From 7b35432d176f25d861ae5824a1a2e28b9e9ab4cd Mon Sep 17 00:00:00 2001
From: Patrick Kishino <patrick.a.kishino@ericsson.com>
Date: Wed, 16 Nov 2016 14:44:41 +0100
Subject: [PATCH] Updated compose files to match documentation and fix #162

---
 docker-compose-armhf.yml | 25 ++++++++++++++-----------
 docker-compose.yml       | 18 ++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/docker-compose-armhf.yml b/docker-compose-armhf.yml
index c22b847b0..8580b7f45 100644
--- a/docker-compose-armhf.yml
+++ b/docker-compose-armhf.yml
@@ -1,11 +1,14 @@
-transmission:
+version: '2'
+
+services:
+ transmission:
   build: 
-    context: .
-    dockerfile: Dockerfile.armhf
+     context: .
+     dockerfile: Dockerfile.armhf
   privileged: true
   restart: always
   ports:
-    - 9091:9091
+    - "9091:9091"
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -13,17 +16,17 @@ transmission:
     - /etc/localtime:/etc/localtime:ro
     - /your/storage/path/:/data
   environment:
-    OPENVPN_PROVIDER: PIA
-    OPENVPN_USERNAME: username
-    OPENVPN_PASSWORD: password
-    OPENVPN_OPTS: "--inactive 3600 --ping 10 --ping-exit 60"
-    LOCAL_NETWORK: 192.168.0.0/24
+    - OPENVPN_PROVIDER=PIA
+    - OPENVPN_USERNAME=username
+    - OPENVPN_PASSWORD=password
+    - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
+    - LOCAL_NETWORK=192.168.0.0/24
 
-proxy:
+ proxy:
   build: ./proxy/Dockerfile.armhf
   links:
     - transmission
   ports:
-    - 8080:8080
+    - "8080:8080"
   volumes:
     - /etc/localtime:/etc/localtime:ro
diff --git a/docker-compose.yml b/docker-compose.yml
index bf55b9658..a0d169ab0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,11 @@
-transmission:
+version: '2'
+services:
+ transmission:
   image: haugene/transmission-openvpn
   privileged: true
   restart: always
   ports:
-    - 9091:9091
+    - "9091:9091"
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -11,13 +13,13 @@ transmission:
     - /etc/localtime:/etc/localtime:ro
     - /your/storage/path/:/data
   environment:
-    OPENVPN_PROVIDER: PIA
-    OPENVPN_USERNAME: username
-    OPENVPN_PASSWORD: password
-    OPENVPN_OPTS: "--inactive 3600 --ping 10 --ping-exit 60"
-    LOCAL_NETWORK: 192.168.0.0/24
+    - OPENVPN_PROVIDER=PIA
+    - OPENVPN_USERNAME=username
+    - OPENVPN_PASSWORD=password
+    - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
+    - LOCAL_NETWORK=192.168.0.0/24
 
-proxy:
+ proxy:
   image: haugene/transmission-openvpn-proxy
   links:
     - transmission