Merge branch 'master' of https://github.com/v2ray/v2ray-core

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."

tools/docker/Dockerfile

@@ -1,17 +1,4 @@
-FROM phusion/baseimage
+FROM golang:latest
-
-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
-
 
 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
+ADD server-cfg.json /go/server-cfg.json
-CMD /v2ray/bin/v2ray-custom-linux-64/v2ray --config="/v2ray/server-cfg.json"
+CMD /go/bin/v2ray-custom-linux-64/v2ray --config="/go/server-cfg.json"

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",