From 356f7a9136ee3dc0271b3db66a4a6d3e9e425dc6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 23 Jul 2014 19:07:07 -0600 Subject: [PATCH] Add a couple tweaks to the Dockerfile - we don't need to add a "daemon" user to busybox; it already has one :) - if we split out the "go get" from the "go install", we can have nice clean output on "docker build" of which dependencies we're pulling in and all the packages that get built :) Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3eb908c4..51fe268e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,7 @@ RUN go get code.google.com/p/go.tools/cmd/cover # 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 && \ - echo "daemon:x:1:1:daemon:/sbin:/sbin/nologin" >> /busybox/etc/passwd + curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.02/rootfs.tar' | tar -xC /busybox RUN curl -sSL https://raw.githubusercontent.com/dotcloud/docker/master/hack/dind -o /dind && \ chmod +x /dind @@ -15,7 +14,8 @@ COPY . /go/src/github.com/docker/libcontainer WORKDIR /go/src/github.com/docker/libcontainer RUN cp sample_configs/minimal.json /busybox/container.json -RUN go get -d ./... && go install ./... +RUN go get -d -v ./... +RUN go install -v ./... ENTRYPOINT ["/dind"] CMD ["go", "test", "-cover", "./..."]