Merge pull request #181 from samthecodingman/patch-1

Fix docker-compose errors and introduce image names
This commit is contained in:
Kristian Haugene
2017-01-08 21:24:12 +01:00
committed by GitHub

View File

@@ -5,6 +5,7 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile.armhf dockerfile: Dockerfile.armhf
image: haugene/rpi-transmission-openvpn
privileged: true privileged: true
restart: always restart: always
ports: ports:
@@ -19,11 +20,14 @@ services:
- 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:
context: ./proxy
dockerfile: Dockerfile.armhf
image: haugene/rpi-transmission-openvpn-proxy
links: links:
- transmission - transmission
ports: ports: