From e267a804ec45aec147838ff9860a5130887e865f Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Thu, 1 Jan 2015 19:31:10 +0800
Subject: [PATCH 01/30] Create Dockerfile

---
 docker/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..cfc30b4
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:latest
+
+RUN apt-get update
+RUN apt-get install -y python-pip
+RUN pip install shadowsocks
+
+EXPOSE 8388
+
+ADD shadowsocks.json /etc/
+
+VOLUME ["/etc/shadowsocks.json"]
+
+CMD ssserver -c /etc/shadowsocks.json

From 14fdefeb45857ddbfacb1d104a07502ca4626ed2 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Thu, 1 Jan 2015 19:35:22 +0800
Subject: [PATCH 02/30] Update Dockerfile

---
 docker/Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cfc30b4..4894845 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,8 +6,4 @@ RUN pip install shadowsocks
 
 EXPOSE 8388
 
-ADD shadowsocks.json /etc/
-
-VOLUME ["/etc/shadowsocks.json"]
-
-CMD ssserver -c /etc/shadowsocks.json
+CMD ssserver -p 8388 -m "aes-256-cfb"

From 1898b53fc7be7b04554fede16724853b6dece4f3 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Thu, 1 Jan 2015 19:42:45 +0800
Subject: [PATCH 03/30] Update Dockerfile

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4894845..1e45586 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,4 +6,4 @@ RUN pip install shadowsocks
 
 EXPOSE 8388
 
-CMD ssserver -p 8388 -m "aes-256-cfb"
+CMD ssserver -p 8388 -m "aes-256-cfb" -k "$KEY"

From 239e5a9b809dac3900b121697859314f70ddeaaa Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Fri, 2 Jan 2015 11:00:49 +0800
Subject: [PATCH 04/30] Update Dockerfile

---
 docker/Dockerfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1e45586..ea8f1de 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,13 @@
 FROM ubuntu:latest
 
+ENV PORT "8388"
+ENV METHOD "aes-256-cfb"
+ENV KEY "changeme"
+
+EXPOSE "$PORT"
+
+CMD ssserver -p "$PORT" -m "$METHOD" -k "$KEY"
+
 RUN apt-get update
 RUN apt-get install -y python-pip
 RUN pip install shadowsocks
-
-EXPOSE 8388
-
-CMD ssserver -p 8388 -m "aes-256-cfb" -k "$KEY"

From 000fb4c307ea2365b3ee83bfeed2493bf66fb240 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Fri, 2 Jan 2015 11:13:50 +0800
Subject: [PATCH 05/30] Update Dockerfile

---
 docker/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ea8f1de..c109c90 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,12 @@
 FROM ubuntu:latest
 
-ENV PORT "8388"
 ENV METHOD "aes-256-cfb"
-ENV KEY "changeme"
+ENV KEY "Change Me!"
 
-EXPOSE "$PORT"
+ENV PORT 8388
+EXPOSE $PORT
 
-CMD ssserver -p "$PORT" -m "$METHOD" -k "$KEY"
+CMD ssserver -p $PORT -m "$METHOD" -k "$KEY"
 
 RUN apt-get update
 RUN apt-get install -y python-pip

From a74f6ddb80763210739d62de2b435868ce15cc73 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Fri, 2 Jan 2015 12:42:45 +0800
Subject: [PATCH 06/30] Update Dockerfile

---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c109c90..d038460 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,12 @@
 FROM ubuntu:latest
 
-ENV METHOD "aes-256-cfb"
-ENV KEY "Change Me!"
+ENV METHOD aes-256-cfb
+ENV KEY Change Me!
 
 ENV PORT 8388
 EXPOSE $PORT
 
-CMD ssserver -p $PORT -m "$METHOD" -k "$KEY"
+CMD ssserver -p "$PORT" -m "$METHOD" -k "$KEY"
 
 RUN apt-get update
 RUN apt-get install -y python-pip

From b9d6ca6e439d79a811355835cac399830a6833ca Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 18:52:50 +0800
Subject: [PATCH 07/30] Update Dockerfile

---
 docker/Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d038460..ad8a6e6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,13 @@
 FROM ubuntu:latest
-
-ENV METHOD aes-256-cfb
-ENV KEY Change Me!
+MAINTAINER Sah Lee <contact@leesah.name>
 
 ENV PORT 8388
 EXPOSE $PORT
 
-CMD ssserver -p "$PORT" -m "$METHOD" -k "$KEY"
+ENV CONF /etc/shadowsocks.json
+VOLUME ["/etc/shadowsocks.json"]
+
+CMD ssserver -p $PORT -c $CONF
 
 RUN apt-get update
 RUN apt-get install -y python-pip

From 59dc0a79d75a7fead8fb0f71ae7faa21a8bb8372 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 19:40:41 +0800
Subject: [PATCH 08/30] Create README.md

---
 docker/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 docker/README.md

diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..9ec99a2
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,22 @@
+# Shadowsocks Dockerization
+
+## How to use this image
+
+Pull the image.
+
+```bash
+docker pull leesah/shadowsocks
+```
+
+Create a data container and edit the configuration file.
+
+```bash
+docker run --name shadowsocks-data leesah/shadowsocks /bin/true
+docker run --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.conf
+```
+
+Start the daemon container.
+
+```bash
+docker run --name shadowsocks-app --detach --publish 58388:8388 --volumes-from shadowsocks-data leesah/shadowsocks
+```

From c48574669ff5480b77c609939a5def0efa30cf97 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 19:56:38 +0800
Subject: [PATCH 09/30] Update Dockerfile

build shadowsocks from code
---
 docker/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad8a6e6..3299f4b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,5 +10,8 @@ VOLUME ["/etc/shadowsocks.json"]
 CMD ssserver -p $PORT -c $CONF
 
 RUN apt-get update
-RUN apt-get install -y python-pip
-RUN pip install shadowsocks
+RUN apt-get install -y git-core python python-setuptools
+RUN git clone https://github.com/shadowsocks/shadowsocks.git
+RUN cd shadowsocks
+RUN python setup.py build
+RUN python setup.py install

From 92cdf0fba117a6f13ed04664e54a8722d81df5e8 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 20:18:54 +0800
Subject: [PATCH 10/30] Update Dockerfile

---
 docker/Dockerfile | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3299f4b..acd6253 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,17 +1,28 @@
 FROM ubuntu:latest
+
 MAINTAINER Sah Lee <contact@leesah.name>
 
-ENV PORT 8388
-EXPOSE $PORT
-
-ENV CONF /etc/shadowsocks.json
-VOLUME ["/etc/shadowsocks.json"]
-
-CMD ssserver -p $PORT -c $CONF
-
+# Set up building environment
 RUN apt-get update
 RUN apt-get install -y git-core python python-setuptools
+
+# Get the latest code, build and install
 RUN git clone https://github.com/shadowsocks/shadowsocks.git
 RUN cd shadowsocks
 RUN python setup.py build
 RUN python setup.py install
+
+# Tear down building environment and delete git repository
+RUN apt-get --purge autoremove -y git-core python python-setuptools
+RUN cd ..
+RUN rm -rf shadowsocks
+
+# Config file can be in a separated container
+ENV CONF /etc/shadowsocks.json
+VOLUME ["$CONF"]
+
+# Port in the config file won't take affect. Instead we'll use 8388.
+ENV PORT 8388
+EXPOSE $PORT
+
+CMD ssserver -c $CONF -p $PORT

From 03ce18e72866cca8f8089bccb6e264c416b8724e Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 20:23:09 +0800
Subject: [PATCH 11/30] Update README.md

---
 docker/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 9ec99a2..bfe2641 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -20,3 +20,7 @@ Start the daemon container.
 ```bash
 docker run --name shadowsocks-app --detach --publish 58388:8388 --volumes-from shadowsocks-data leesah/shadowsocks
 ```
+
+## References
+
+[Shadowsocks - Servers](http://shadowsocks.org/en/download/servers.html)

From e63bc987063c33040e5c012b3321fb0517499929 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 20:44:42 +0800
Subject: [PATCH 12/30] Update Dockerfile

---
 docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index acd6253..811596b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,15 +7,14 @@ RUN apt-get update
 RUN apt-get install -y git-core python python-setuptools
 
 # Get the latest code, build and install
-RUN git clone https://github.com/shadowsocks/shadowsocks.git
-RUN cd shadowsocks
+RUN git clone https://github.com/shadowsocks/shadowsocks.git /tmp
+WORKDIR /tmp/shadowsocks
 RUN python setup.py build
 RUN python setup.py install
 
 # Tear down building environment and delete git repository
 RUN apt-get --purge autoremove -y git-core python python-setuptools
-RUN cd ..
-RUN rm -rf shadowsocks
+RUN rm -rf /tmp/shadowsocks
 
 # Config file can be in a separated container
 ENV CONF /etc/shadowsocks.json

From 0ce93d85e07ea90de1703dafdbc661f782b62cfa Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 20:50:31 +0800
Subject: [PATCH 13/30] Update Dockerfile

---
 docker/Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 811596b..9a729ff 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,19 +2,22 @@ FROM ubuntu:latest
 
 MAINTAINER Sah Lee <contact@leesah.name>
 
+ENV BASEDIR /
+
 # Set up building environment
 RUN apt-get update
 RUN apt-get install -y git-core python python-setuptools
 
 # Get the latest code, build and install
-RUN git clone https://github.com/shadowsocks/shadowsocks.git /tmp
-WORKDIR /tmp/shadowsocks
+RUN git clone https://github.com/shadowsocks/shadowsocks.git $BASEDIR
+WORKDIR $BASEDIR/shadowsocks
+RUN pwd
 RUN python setup.py build
 RUN python setup.py install
 
 # Tear down building environment and delete git repository
 RUN apt-get --purge autoremove -y git-core python python-setuptools
-RUN rm -rf /tmp/shadowsocks
+RUN rm -rf $BASEDIR/shadowsocks
 
 # Config file can be in a separated container
 ENV CONF /etc/shadowsocks.json

From e8c58e9db92b542b1f53ae7146890f8fe34ddd3d Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 20:54:42 +0800
Subject: [PATCH 14/30] Update Dockerfile

---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9a729ff..e4edc6f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,7 +9,8 @@ RUN apt-get update
 RUN apt-get install -y git-core python python-setuptools
 
 # Get the latest code, build and install
-RUN git clone https://github.com/shadowsocks/shadowsocks.git $BASEDIR
+WORKDIR $BASEDIR
+RUN git clone https://github.com/shadowsocks/shadowsocks.git
 WORKDIR $BASEDIR/shadowsocks
 RUN pwd
 RUN python setup.py build

From de839a08d97f2af657cd721d07b9be32114cc9e0 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 21:09:37 +0800
Subject: [PATCH 15/30] Update Dockerfile

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e4edc6f..30ab0ce 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,4 +28,4 @@ VOLUME ["$CONF"]
 ENV PORT 8388
 EXPOSE $PORT
 
-CMD ssserver -c $CONF -p $PORT
+CMD /usr/local/bin/ssserver -c $CONF -p $PORT

From 49adad89bfa4ed65b01cfeb23a9f1269595fa2dc Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 21:18:57 +0800
Subject: [PATCH 16/30] Update README.md

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index bfe2641..857b357 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -12,7 +12,7 @@ Create a data container and edit the configuration file.
 
 ```bash
 docker run --name shadowsocks-data leesah/shadowsocks /bin/true
-docker run --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.conf
+docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.conf
 ```
 
 Start the daemon container.

From a10f679a4aa2f74a1a6a36ccf674967fe4af9f46 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sat, 3 Jan 2015 21:26:17 +0800
Subject: [PATCH 17/30] Update Dockerfile

---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30ab0ce..81ee582 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,6 +17,7 @@ RUN python setup.py build
 RUN python setup.py install
 
 # Tear down building environment and delete git repository
+WORKDIR $BASEDIR
 RUN apt-get --purge autoremove -y git-core python python-setuptools
 RUN rm -rf $BASEDIR/shadowsocks
 
@@ -28,4 +29,4 @@ VOLUME ["$CONF"]
 ENV PORT 8388
 EXPOSE $PORT
 
-CMD /usr/local/bin/ssserver -c $CONF -p $PORT
+CMD ssserver -c $CONF -p $PORT

From baa6f876ab0e87c29270ed61ce70d8c7187d33d5 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 00:08:14 +0800
Subject: [PATCH 18/30] Update Dockerfile

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 81ee582..6911694 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@ RUN python setup.py install
 
 # Tear down building environment and delete git repository
 WORKDIR $BASEDIR
-RUN apt-get --purge autoremove -y git-core python python-setuptools
+RUN apt-get --purge autoremove -y git-core python-setuptools
 RUN rm -rf $BASEDIR/shadowsocks
 
 # Config file can be in a separated container

From dc9db195edaf26de932598aa28a378eb9ffb1686 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 00:24:54 +0800
Subject: [PATCH 19/30] Update Dockerfile

---
 docker/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6911694..2b4974d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,9 +4,12 @@ MAINTAINER Sah Lee <contact@leesah.name>
 
 ENV BASEDIR /
 
-# Set up building environment
+# Install dependencies
 RUN apt-get update
-RUN apt-get install -y git-core python python-setuptools
+RUN apt-get install -y python python-pkg-resources
+
+# Set up building environment
+RUN apt-get install -y git-core python-setuptools
 
 # Get the latest code, build and install
 WORKDIR $BASEDIR

From 721d80a14881ba428583e242c776837919db5394 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 10:19:17 +0800
Subject: [PATCH 20/30] Update Dockerfile

---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b4974d..aa9c021 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,4 +32,5 @@ VOLUME ["$CONF"]
 ENV PORT 8388
 EXPOSE $PORT
 
-CMD ssserver -c $CONF -p $PORT
+# Override the host and port in the config file.
+CMD ssserver --fast-open -c $CONF -s 0.0.0.0 -p $PORT

From 0e4253096cb1adc4d91889e42db20b5c6d63c278 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 11:03:17 +0800
Subject: [PATCH 21/30] Update README.md

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index 857b357..569b80e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -12,7 +12,7 @@ Create a data container and edit the configuration file.
 
 ```bash
 docker run --name shadowsocks-data leesah/shadowsocks /bin/true
-docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.conf
+docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.json
 ```
 
 Start the daemon container.

From 7ad2130eaac8ec50a211f9d0aa44f2f9bdb3d121 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 11:06:42 +0800
Subject: [PATCH 22/30] Update Dockerfile

---
 docker/Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aa9c021..70457f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:latest
 
 MAINTAINER Sah Lee <contact@leesah.name>
 
-ENV BASEDIR /
+ENV BASEDIR /tmp
 
 # Install dependencies
 RUN apt-get update
@@ -25,12 +25,13 @@ RUN apt-get --purge autoremove -y git-core python-setuptools
 RUN rm -rf $BASEDIR/shadowsocks
 
 # Config file can be in a separated container
-ENV CONF /etc/shadowsocks.json
-VOLUME ["$CONF"]
+ENV CONFIG_DIR /etc/shadowsocks
+ENV CONFIG_FILE $CONFIG_DIR/shadowsocks.json
+VOLUME ["$CONFIG_DIR"]
 
 # Port in the config file won't take affect. Instead we'll use 8388.
 ENV PORT 8388
 EXPOSE $PORT
 
 # Override the host and port in the config file.
-CMD ssserver --fast-open -c $CONF -s 0.0.0.0 -p $PORT
+CMD ssserver --fast-open -c $CONFIG_FILE -s 0.0.0.0 -p $PORT

From 6bfe87bbbe144bcecf6541da24e2b95f5a71c85e Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 11:07:07 +0800
Subject: [PATCH 23/30] Update README.md

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index 569b80e..0061b6e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -12,7 +12,7 @@ Create a data container and edit the configuration file.
 
 ```bash
 docker run --name shadowsocks-data leesah/shadowsocks /bin/true
-docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks.json
+docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks/shadowsocks.json
 ```
 
 Start the daemon container.

From f78c71d065cd15ed867f74b71e6c9e8a62d477b1 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 13:05:14 +0800
Subject: [PATCH 24/30] Create shadowsocks.json

---
 docker/shadowsocks.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docker/shadowsocks.json

diff --git a/docker/shadowsocks.json b/docker/shadowsocks.json
new file mode 100644
index 0000000..c0bc7cc
--- /dev/null
+++ b/docker/shadowsocks.json
@@ -0,0 +1,5 @@
+{
+    "password":"Change Me!",
+    "timeout":120,
+    "method":"aes-256-cfb"
+}

From 1ff973dda419c31212d44df77bffb5397d1c2494 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 13:07:57 +0800
Subject: [PATCH 25/30] Update Dockerfile

---
 docker/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 70457f0..e6b4d8a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,6 +3,9 @@ FROM ubuntu:latest
 MAINTAINER Sah Lee <contact@leesah.name>
 
 ENV BASEDIR /tmp
+ENV CONFIGDIR /etc/shadowsocks
+ENV CONFIGFILE $CONFIGDIR/shadowsocks.json
+ENV PORT 8388
 
 # Install dependencies
 RUN apt-get update
@@ -25,13 +28,11 @@ RUN apt-get --purge autoremove -y git-core python-setuptools
 RUN rm -rf $BASEDIR/shadowsocks
 
 # Config file can be in a separated container
-ENV CONFIG_DIR /etc/shadowsocks
-ENV CONFIG_FILE $CONFIG_DIR/shadowsocks.json
-VOLUME ["$CONFIG_DIR"]
+VOLUME ["$CONFIGDIR"]
+ADD shadowsocks.json $CONFIGDIR
 
 # Port in the config file won't take affect. Instead we'll use 8388.
-ENV PORT 8388
 EXPOSE $PORT
 
 # Override the host and port in the config file.
-CMD ssserver --fast-open -c $CONFIG_FILE -s 0.0.0.0 -p $PORT
+CMD ssserver --fast-open -c $CONFIGFILE -s 0.0.0.0 -p $PORT

From cd3989c83b709d5a9ef6f3527699aa6ba55ecf87 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 14:05:43 +0800
Subject: [PATCH 26/30] Update Dockerfile

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e6b4d8a..95c8235 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -rf $BASEDIR/shadowsocks
 
 # Config file can be in a separated container
 VOLUME ["$CONFIGDIR"]
-ADD shadowsocks.json $CONFIGDIR
+ADD shadowsocks.json $CONFIGFILE
 
 # Port in the config file won't take affect. Instead we'll use 8388.
 EXPOSE $PORT

From ea8cba003256da03f7246bf4f6335cdfc158061a Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 15:40:10 +0800
Subject: [PATCH 27/30] Update README.md

---
 docker/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 0061b6e..1f12bc4 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,6 +2,8 @@
 
 ## How to use this image
 
+### Start the daemon for the firt time
+
 Pull the image.
 
 ```bash
@@ -21,6 +23,26 @@ Start the daemon container.
 docker run --name shadowsocks-app --detach --publish 58388:8388 --volumes-from shadowsocks-data leesah/shadowsocks
 ```
 
+### Stop the daemon
+
+```bash
+docker stop shadowsocks-app
+```
+
+### Start a stopped daemon
+
+```bash
+docker start shadowsocks-app
+```
+
+### Use in CoreOS
+
+COMING SOON
+
+### Use with `fig`
+
+COMING SOON
+
 ## References
 
 [Shadowsocks - Servers](http://shadowsocks.org/en/download/servers.html)

From 599752fbf503502ff3386cf01720deec2f65d188 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 15:40:40 +0800
Subject: [PATCH 28/30] Update README.md

---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/README.md b/docker/README.md
index 1f12bc4..6fe6fbc 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,4 +1,4 @@
-# Shadowsocks Dockerization
+# Shadowsocks Dockerized
 
 ## How to use this image
 

From a46176b3e78bb04f000dfc5875cd6898f11af0b5 Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 15:43:28 +0800
Subject: [PATCH 29/30] Update README.md

---
 docker/README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 6fe6fbc..ae6b15d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,17 @@
 # Shadowsocks Dockerized
 
+## What is Shadowsocks
+
+A secure socks5 proxy designed to protect your Internet traffic.
+
+See http://shadowsocks.org/
+
+## What is Docker
+
+An open platform for distributed applications for developers and sysadmins.
+
+See https://www.docker.com/
+
 ## How to use this image
 
 ### Start the daemon for the firt time
@@ -35,6 +47,10 @@ docker stop shadowsocks-app
 docker start shadowsocks-app
 ```
 
+### Upgrade
+
+COMING SOON
+
 ### Use in CoreOS
 
 COMING SOON

From 92f88c9702d4376f3735a49c508ac0436a49c0bc Mon Sep 17 00:00:00 2001
From: Sah <contact@leesah.name>
Date: Sun, 4 Jan 2015 15:44:24 +0800
Subject: [PATCH 30/30] Update README.md

---
 docker/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index ae6b15d..8e9e435 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -19,32 +19,32 @@ See https://www.docker.com/
 Pull the image.
 
 ```bash
-docker pull leesah/shadowsocks
+$ docker pull leesah/shadowsocks
 ```
 
 Create a data container and edit the configuration file.
 
 ```bash
-docker run --name shadowsocks-data leesah/shadowsocks /bin/true
-docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks/shadowsocks.json
+$ docker run --name shadowsocks-data leesah/shadowsocks /bin/true
+$ docker run --interactive --tty --rm --volumes-from shadowsocks-data leesah/shadowsocks vi /etc/shadowsocks/shadowsocks.json
 ```
 
 Start the daemon container.
 
 ```bash
-docker run --name shadowsocks-app --detach --publish 58388:8388 --volumes-from shadowsocks-data leesah/shadowsocks
+$ docker run --name shadowsocks-app --detach --publish 58388:8388 --volumes-from shadowsocks-data leesah/shadowsocks
 ```
 
 ### Stop the daemon
 
 ```bash
-docker stop shadowsocks-app
+$ docker stop shadowsocks-app
 ```
 
 ### Start a stopped daemon
 
 ```bash
-docker start shadowsocks-app
+$ docker start shadowsocks-app
 ```
 
 ### Upgrade