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