diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..6b8710a711
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/Dockerfile b/Dockerfile
index f683006b52..d7a25c53f0 100644
--- 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"]