From efb4c800a7c8167cf2202466a720c0fad7001a5d Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Tue, 29 Oct 2013 19:37:56 -0700 Subject: [PATCH] docker-ci 0.37. Patch hack/dind with latest code for docker-test. --- .../infrastructure/docker-ci/docker-test/Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hack/infrastructure/docker-ci/docker-test/Dockerfile b/hack/infrastructure/docker-ci/docker-test/Dockerfile index 66cb9762eb..229d696b87 100644 --- a/hack/infrastructure/docker-ci/docker-test/Dockerfile +++ b/hack/infrastructure/docker-ci/docker-test/Dockerfile @@ -17,13 +17,12 @@ from docker maintainer Daniel Mizyrycki -# Setup go environment. Extracted from /Dockerfile -env CGO_ENABLED 0 -env GOROOT /goroot -env PATH $PATH:/goroot/bin -env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor -volume /var/lib/docker -workdir /go/src/github.com/dotcloud/docker +#### FIXME. Temporarily install docker and dind with proper apparmor handling +run wget -q -O /go/src/github.com/dotcloud/docker/hack/dind http://raw.github.com/jpetazzo/docker/escape-apparmor-confinement/hack/dind +run chmod +x /go/src/github.com/dotcloud/docker/hack/dind + +# Setup go to the PATH. Extracted from /Dockerfile +env PATH /usr/local/go/bin:$PATH # Add test_docker.sh add test_docker.sh /usr/bin/test_docker.sh