From 4cbf4617ed7708a3c9a4087bf4302c6df860b5c7 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 7 Aug 2015 15:01:34 +0800
Subject: [PATCH] update ShadowVPN

---
 shadowvpn/Dockerfile        | 30 ++++++++++++++----------------
 shadowvpn/Dockerfile.debian | 33 +++++++++++++++++++++++++++++++++
 shadowvpn/README.md         | 19 +++++++++++++------
 3 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 shadowvpn/Dockerfile.debian

diff --git a/shadowvpn/Dockerfile b/shadowvpn/Dockerfile
index 741e4dc..d27f1cf 100644
--- a/shadowvpn/Dockerfile
+++ b/shadowvpn/Dockerfile
@@ -2,17 +2,16 @@
 # Dockerfile for ShadowVPN
 #
 
-FROM debian:jessie
+FROM alpine
 MAINTAINER kev <noreply@datageek.info>
 
-RUN apt-get update \
-    && apt-get install -y automake \
-                          build-essential \
-                          gawk \
-                          git \
-                          net-tools \
-                          iptables \
-                          libtool \
+RUN apk add -U autoconf \
+               automake \
+               build-base \
+               gawk \
+               git \
+               iptables \
+               libtool \
     && git clone --recursive https://github.com/clowwindy/ShadowVPN.git \
     && cd ShadowVPN \
     && ./autogen.sh \
@@ -20,14 +19,13 @@ RUN apt-get update \
     && make install \
     && cd .. \
     && rm -rf ShadowVPN \
-    && apt-get purge -y --auto-remove automake \
-                                      build-essential \
-                                      gawk \
-                                      git \
-                                      libtool
+    && apk del autoconf \
+               automake \
+               build-base \
+               gawk \
+               git \
+               libtool
 
 EXPOSE 1123/udp
-VOLUME /etc/shadowvpn
 
 CMD shadowvpn -c /etc/shadowvpn/server.conf
-
diff --git a/shadowvpn/Dockerfile.debian b/shadowvpn/Dockerfile.debian
new file mode 100644
index 0000000..741e4dc
--- /dev/null
+++ b/shadowvpn/Dockerfile.debian
@@ -0,0 +1,33 @@
+#
+# Dockerfile for ShadowVPN
+#
+
+FROM debian:jessie
+MAINTAINER kev <noreply@datageek.info>
+
+RUN apt-get update \
+    && apt-get install -y automake \
+                          build-essential \
+                          gawk \
+                          git \
+                          net-tools \
+                          iptables \
+                          libtool \
+    && git clone --recursive https://github.com/clowwindy/ShadowVPN.git \
+    && cd ShadowVPN \
+    && ./autogen.sh \
+    && ./configure --enable-static --sysconfdir=/etc \
+    && make install \
+    && cd .. \
+    && rm -rf ShadowVPN \
+    && apt-get purge -y --auto-remove automake \
+                                      build-essential \
+                                      gawk \
+                                      git \
+                                      libtool
+
+EXPOSE 1123/udp
+VOLUME /etc/shadowvpn
+
+CMD shadowvpn -c /etc/shadowvpn/server.conf
+
diff --git a/shadowvpn/README.md b/shadowvpn/README.md
index ee884de..f034435 100644
--- a/shadowvpn/README.md
+++ b/shadowvpn/README.md
@@ -1,17 +1,20 @@
+ShadowVPN
+=========
+
+![](https://badge.imagelayers.io/vimagick/shadowvpn:latest.svg)
+
 [`ShadowVPN`][1] is a fast, safe VPN based on libsodium.
 
 ## directory tree
 
 ```
 ~/fig/shadowvpn/
-.
 ├── docker-compose.yml
-└── shadowvpn/
-    ├── server.conf
-    ├── server_down.sh
-    └── server_up.sh
+└── server.conf
 ```
 
+> Please change password in [server.conf][2] to protect your server.
+
 ## docker-compose.yml
 
 ```
@@ -20,7 +23,7 @@ shadowvpn:
   ports:
     - "1123:1123/udp"
   volumes:
-    - "shadowvpn:/etc/shadowvpn"
+    - "server.conf:/etc/shadowvpn/server.conf"
   privileged: true
   restart: always
 ```
@@ -37,4 +40,8 @@ $ docker-compose up -d
 $ shadowvpn -c /etc/shadowvpn/client.conf -v
 ```
 
+> Change settings in [client.conf][3].
+
 [1]: https://shadowvpn.org/
+[2]: https://github.com/clowwindy/ShadowVPN/blob/master/samples/server.conf
+[2]: https://github.com/clowwindy/ShadowVPN/blob/master/samples/client.conf