Merge pull request pingcap#1070 from pingcap/siddontang/docker

Dockerfile: update docker.
R1ckyZhang · Apr 9, 2016 · 4c4ef41 · 4c4ef41
2 parents 49c7b43 + d57f1ba
commit 4c4ef41
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,13 @@
-FROM golang
+FROM golang:1.6
 
-VOLUME /opt
+COPY . /go/src/github.com/pingcap/tidb
 
-RUN apt-get update && apt-get install -y wget git make ; \
-        cd /opt ; \
-        export PATH=$GOROOT/bin:$GOPATH/bin:$PATH ; \
-        go get -d github.com/pingcap/tidb ; \
-        cd $GOPATH/src/github.com/pingcap/tidb ; \
-        make ; make server ; cp tidb-server/tidb-server /usr/bin/ 
+RUN cd /go/src/github.com/pingcap/tidb && \
+    make godep && make server && \
+    cp tidb-server/tidb-server /go/bin/ && \
+    rm -rf /go/src/*
 
 EXPOSE 4000
 
-CMD ["/usr/bin/tidb-server"]
+CMD ["tidb-server"]