Merge pull request #164 from haugene/162

Updated compose files to match documentation and fix #162
This commit is contained in:
Patrick Kishino
2016-11-17 09:33:45 +01:00
committed by GitHub
2 changed files with 24 additions and 19 deletions

View File

@@ -1,11 +1,14 @@
transmission: version: '2'
services:
transmission:
build: build:
context: . context: .
dockerfile: Dockerfile.armhf dockerfile: Dockerfile.armhf
privileged: true privileged: true
restart: always restart: always
ports: ports:
- 9091:9091 - "9091:9091"
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@@ -13,17 +16,17 @@ transmission:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /your/storage/path/:/data - /your/storage/path/:/data
environment: environment:
OPENVPN_PROVIDER: PIA - OPENVPN_PROVIDER=PIA
OPENVPN_USERNAME: username - OPENVPN_USERNAME=username
OPENVPN_PASSWORD: password - OPENVPN_PASSWORD=password
OPENVPN_OPTS: "--inactive 3600 --ping 10 --ping-exit 60" - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
LOCAL_NETWORK: 192.168.0.0/24 - LOCAL_NETWORK=192.168.0.0/24
proxy: proxy:
build: ./proxy/Dockerfile.armhf build: ./proxy/Dockerfile.armhf
links: links:
- transmission - transmission
ports: ports:
- 8080:8080 - "8080:8080"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro

View File

@@ -1,9 +1,11 @@
transmission: version: '2'
services:
transmission:
image: haugene/transmission-openvpn image: haugene/transmission-openvpn
privileged: true privileged: true
restart: always restart: always
ports: ports:
- 9091:9091 - "9091:9091"
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
@@ -11,13 +13,13 @@ transmission:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /your/storage/path/:/data - /your/storage/path/:/data
environment: environment:
OPENVPN_PROVIDER: PIA - OPENVPN_PROVIDER=PIA
OPENVPN_USERNAME: username - OPENVPN_USERNAME=username
OPENVPN_PASSWORD: password - OPENVPN_PASSWORD=password
OPENVPN_OPTS: "--inactive 3600 --ping 10 --ping-exit 60" - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
LOCAL_NETWORK: 192.168.0.0/24 - LOCAL_NETWORK=192.168.0.0/24
proxy: proxy:
image: haugene/transmission-openvpn-proxy image: haugene/transmission-openvpn-proxy
links: links:
- transmission - transmission