From 43145ecf1b7310dc0f5cd4ccafd300cdbe2f153b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 17 Oct 2014 00:00:16 +0000 Subject: [PATCH] Move the download of docker to top of dockerfile We need to do this because it's a big dep. While we remove this recursive dep this is the best that we can do right now. Signed-off-by: Michael Crosby --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65bf5731..96d8f352 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,9 @@ FROM crosbymichael/golang RUN apt-get update && apt-get install -y gcc make RUN go get code.google.com/p/go.tools/cmd/cover +ENV GOPATH $GOPATH:/go/src/github.com/docker/libcontainer/vendor +RUN go get github.com/docker/docker/pkg/term + # setup a playground for us to spawn containers in RUN mkdir /busybox && \ curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.02/rootfs.tar' | tar -xC /busybox @@ -14,8 +17,6 @@ COPY . /go/src/github.com/docker/libcontainer WORKDIR /go/src/github.com/docker/libcontainer RUN cp sample_configs/minimal.json /busybox/container.json -ENV GOPATH $GOPATH:/go/src/github.com/docker/libcontainer/vendor - RUN go get -d -v ./... RUN make direct-install