Merge pull request #123 from tianon/dockerfile-tweaks

Add a couple tweaks to the Dockerfile
This commit is contained in:
Michael Crosby 2014-07-24 09:48:55 -07:00
commit 010e87b261
1 changed files with 3 additions and 3 deletions

View File

@ -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", "./..."]