From 4f7c39b30cbc96144000cfb1dafe93f171a34027 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 11 Jul 2016 17:30:09 +0800 Subject: [PATCH] update docker-compose.yml --- README.md | 1 + fteproxy/docker-compose.yml | 36 +++++++++++++++++++--------------- openvpn/arm/docker-compose.yml | 16 +++++++++++++-- openvpn/docker-compose.yml | 33 ++++++------------------------- 4 files changed, 41 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 5d57faa..8294530 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,7 @@ A collection of delicious docker recipes. - [x] openconnect-arm - [x] openvpn-arm - [x] pptp +- [x] pptp-arm - [x] pptpd - [x] shadowvpn - [x] strongswan :+1: diff --git a/fteproxy/docker-compose.yml b/fteproxy/docker-compose.yml index ffba3d8..7eb8463 100644 --- a/fteproxy/docker-compose.yml +++ b/fteproxy/docker-compose.yml @@ -1,23 +1,27 @@ -server: +master: image: vimagick/fteproxy ports: - - "80" + - "4911:4911" + external_links: + - openvpn_server_1:server environment: - - "MODE=server" - - "SERVER_IP=0.0.0.0" - - "SERVER_PORT=80" - - "PROXY_IP=www.google.com" - - "PROXY_PORT=80" + - MODE=server + - SERVER_IP=0.0.0.0 + - SERVER_PORT=4911 + - PROXY_IP=server + - PROXY_PORT=1194 + - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741 + restart: always -client: +bridge: image: vimagick/fteproxy ports: - - "9009:80" - links: - - server + - "1194:1194" environment: - - "MODE=client" - - "SERVER_IP=server" - - "SERVER_PORT=80" - - "CLIENT_IP=0.0.0.0" - - "CLIENT_PORT=80" + - MODE=client + - SERVER_IP=vpn.easypi.info + - SERVER_PORT=4911 + - CLIENT_IP=0.0.0.0 + - CLIENT_PORT=1194 + - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741 + restart: always diff --git a/openvpn/arm/docker-compose.yml b/openvpn/arm/docker-compose.yml index a1370c7..00bcaee 100644 --- a/openvpn/arm/docker-compose.yml +++ b/openvpn/arm/docker-compose.yml @@ -3,7 +3,19 @@ openvpn: command: --config pi.ovpn volumes: - ./data:/etc/openvpn - cap_add: - - NET_ADMIN net: host + privileged: yes + restart: always + +stunnel: + image: easypi/stunnel-arm + ports: + - "1194:1194" + environment: + - CLIENT=yes + - SERVICE=openvpn + - ACCEPT=0.0.0.0:1194 + - CONNECT=server:4911 + extra_hosts: + - server:1.2.3.4 restart: always diff --git a/openvpn/docker-compose.yml b/openvpn/docker-compose.yml index 68fcdea..2ef801a 100644 --- a/openvpn/docker-compose.yml +++ b/openvpn/docker-compose.yml @@ -13,36 +13,15 @@ server: - NET_ADMIN restart: always -################################### SERVER ################################### - -fteproxy: - image: vimagick/fteproxy +stunnel: + image: vimagick/stunnel ports: - "4911:4911" links: - server environment: - - MODE=server - - SERVER_IP=0.0.0.0 - - SERVER_PORT=4911 - - PROXY_IP=server - - PROXY_PORT=1194 - - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741 + - CLIENT=no + - SERVICE=openvpn + - ACCEPT=0.0.0.0:4911 + - CONNECT=server:1194 restart: always - -################################### CLIENT ################################### -# -#fteproxy: -# image: vimagick/fteproxy -# ports: -# - "1194:1194" -# environment: -# - MODE=client -# - SERVER_IP=vpn.easypi.info -# - SERVER_PORT=4911 -# - CLIENT_IP=0.0.0.0 -# - CLIENT_PORT=1194 -# - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741 -# restart: always -# -##############################################################################