From e2370de572c569aec548b4749e5b728b32c93752 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Mon, 25 Jan 2016 17:48:34 +0100
Subject: [PATCH 1/3] Update version for next release

---
 core.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.go b/core.go
index dc3e3f229..4fbc25e90 100644
--- a/core.go
+++ b/core.go
@@ -8,7 +8,7 @@ import (
 )
 
 var (
-	version  = "1.5"
+	version  = "1.6"
 	build    = "Custom"
 	codename = "New Order"
 	intro    = "An unified platform for anti-censorship."

From dd464427357283a43214bed462dd777c4cda7a56 Mon Sep 17 00:00:00 2001
From: kxjhlele <kxjhlele@163.com>
Date: Tue, 26 Jan 2016 16:25:16 +0800
Subject: [PATCH 2/3] Update Dockerfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改为直接使用官方构建的 golang
---
 tools/docker/Dockerfile | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 89c8ac966..bd3dd32b9 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,17 +1,4 @@
-FROM phusion/baseimage
-
-ENV GOPATH /v2ray
-ENV PATH $PATH:/usr/local/go/bin
-
-RUN apt-get update
-RUN apt-get install -y git
-RUN apt-get clean
-
-RUN mkdir -p /v2ray/logs
-RUN curl -o /go.tar.gz https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf /go.tar.gz
-RUN rm /go.tar.gz
-
+FROM golang:latest
 
 RUN go get -u github.com/v2ray/v2ray-core
 RUN rm -f $GOPATH/bin/build
@@ -19,5 +6,5 @@ RUN go install github.com/v2ray/v2ray-core/tools/build
 RUN $GOPATH/bin/build
 
 EXPOSE 27183
-ADD server-cfg.json /v2ray/server-cfg.json
-CMD /v2ray/bin/v2ray-custom-linux-64/v2ray --config="/v2ray/server-cfg.json"
+ADD server-cfg.json /go/server-cfg.json
+CMD /go/bin/v2ray-custom-linux-64/v2ray --config="/go/server-cfg.json"

From 6e8450016231b988d7408cfa932259b9108816d1 Mon Sep 17 00:00:00 2001
From: kxjhlele <kxjhlele@163.com>
Date: Tue, 26 Jan 2016 16:28:00 +0800
Subject: [PATCH 3/3] Update gen-server-cfg.sh

---
 tools/docker/gen-server-cfg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/docker/gen-server-cfg.sh b/tools/docker/gen-server-cfg.sh
index 5cd861d56..6974cd8a2 100755
--- a/tools/docker/gen-server-cfg.sh
+++ b/tools/docker/gen-server-cfg.sh
@@ -12,7 +12,7 @@ cat <<EOF > server-cfg.json
 {
   "port": $PORT,
   "log" : {
-    "access": "/v2ray/logs/access.log"
+    "access": "/go/access.log"
   },
   "inbound": {
     "protocol": "vmess",