Merge branch 'master' into master

2017-06-23 10:00:11 +12:00
parent af699006c7 9b9492f14b
commit 0877052a13
3805 changed files with 159818 additions and 137159 deletions
--- a/docker-compose-armhf.yml
+++ b/docker-compose-armhf.yml
@@ -2,11 +2,14 @@ version: '2'

 services:
 transmission:
-  build: 
+  build:
     context: .
     dockerfile: Dockerfile.armhf
  image: haugene/rpi-transmission-openvpn
-  privileged: true
+  cap_add:
+    - NET_ADMIN
+  devices:
+    - "/dev/net/tun"
  restart: always
  ports:
    - "9091:9091"