Merge pull request docker-archive#330 from psftw/tweaks

Tweak Dockerfile for official image.
dongluochen · Jan 31, 2015 · 682633a · 682633a
2 parents 405494d + c88039f
commit 682633a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,12 @@
 FROM golang:1.3
 
-ADD . /go/src/github.com/docker/swarm
+COPY . /go/src/github.com/docker/swarm
 WORKDIR /go/src/github.com/docker/swarm
 
-RUN go get github.com/tools/godep
-RUN godep go install
+ENV GOPATH $GOPATH:/go/src/github.com/docker/swarm/Godeps/_workspace
+RUN go install -v
 
 EXPOSE 2375
+
 ENTRYPOINT ["swarm"]
+CMD ["--help"]