From c88039f6197079f0732cc84cc2db2a837b5bc22f Mon Sep 17 00:00:00 2001 From: Peter Salvatore Date: Thu, 29 Jan 2015 10:54:32 -0500 Subject: [PATCH] Tweak Dockerfile for official image. Replaced ADD with COPY per best practices article. Removed unnecessary Godeps install, and added a .dockerignore to shave off ~23M. Signed-off-by: Peter Salvatore --- .dockerignore | 1 + Dockerfile | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .dockerignore 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"]