update

fteproxy/Dockerfile

@@ -5,13 +5,14 @@
 FROM alpine
 MAINTAINER kev <norelpy@datageek.info>
 
-RUN apk add -U build-base \
-               gmp \
-               gmp-dev \
-               libstdc++ \
-               python \
-               python-dev \
-               py-pip \
+RUN set -xe \
+    && apk add -U build-base \
+                  gmp \
+                  gmp-dev \
+                  libstdc++ \
+                  python \
+                  python-dev \
+                  py-pip \
     && pip install fteproxy \
     && apk del build-base \
                gmp-dev \

obfsproxy/Dockerfile

@@ -5,7 +5,8 @@
 FROM debian:jessie
 MAINTAINER kev<noreply@datageek.info>
 
-RUN apt-get update \
+RUN set -xe \
+    && apt-get update \
     && apt-get install -y build-essential curl python python-dev \
     && curl https://bootstrap.pypa.io/get-pip.py | python \
     && pip install obfsproxy \

obfsproxy/README.md

@@ -11,19 +11,19 @@ I will update this image if there's better one.
 This includes `Tor`, `VPN`, `SSH`, and many other protocols. 
 
 We can transport `OpenVPN` over `Obfsproxy`, so that firewall cannot detect it.  
-In the following example, you should run `kylemanna/openvpn` container first.  
+In the following example, you should run `vimagick/openvpn` container first.  
 Don't forget to edit `/etc/openvpn/openvpn.conf` to use `proto tcp`.  
 
 ## docker-compose.yml
 
 ```
 data:
-  image: busybox:latest
+  image: busybox
   volumes:
     - /etc/openvpn
 
 server:
-  image: kylemanna/openvpn:latest
+  image: vimagick/openvpn
   ports:
     - "1194:1194/tcp"
   volumes_from:
@@ -33,7 +33,7 @@ server:
   restart: always
 
 obfsproxy:
-  image: vimagick/obfsproxy:latest
+  image: vimagick/obfsproxy
   ports:
     - "4911:4911"
   links:
@@ -51,7 +51,7 @@ To link a existing `openvpn` container, please use `external_links` instead of `
 
 ```
 obfsproxy:
-  image: vimagick/obfsproxy:latest
+  image: vimagick/obfsproxy
   ports:
     - "4911:4911"
   external_links:
@@ -70,7 +70,7 @@ The following example shows us how to make a OpenVPN relay:
 
 ```
 obfsproxy:
-  image: vimagick/obfsproxy:latest
+  image: vimagick/obfsproxy
   ports:
     - "1194:1194/tcp"
   environment:

obfsproxy/docker-compose.yml

@@ -0,0 +1,26 @@
+server:
+  image: vimagick/obfsproxy
+  ports:
+    - "4911:4911"
+  external_links:
+    - openvpn_server_1:openvpn
+  environment:
+    - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP
+    - DEST_ADDR=openvpn
+    - DEST_PORT=1194
+    - LISTEN_ADDR=0.0.0.0
+    - LISTEN_PORT=4911
+  restart: always
+
+client:
+  image: vimagick/obfsproxy
+  ports:
+    - "1194:1194/tcp"
+  environment:
+    - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP
+    - DEST_ADDR=vpn.datageek.info
+    - DEST_PORT=4911
+    - RUN_MODE=client
+    - LISTEN_ADDR=0.0.0.0
+    - LISTEN_PORT=1194
+  restart: always

obfsproxy/fig.yml

@@ -1,13 +0,0 @@
-obfsproxy:
-  image: vimagick/obfsproxy:latest
-  ports:
-    - "4911:4911"
-  external_links:
-    - openvpn_server_1:openvpn
-  environment:
-    - PASSWORD=J23TNHPJPAOQJLTCPLFD4CQYVFY6MEVP
-    - DEST_ADDR=openvpn
-    - DEST_PORT=1194
-    - LISTEN_ADDR=0.0.0.0
-    - LISTEN_PORT=4911
-  restart: always