From 7a7c9f0f1d41534dd4afd66f7d8fa56e38ed94e1 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Mon, 28 Oct 2013 16:51:31 -0700 Subject: [PATCH] docker-ci 0.36. Patch hack/dind with latest code for nightly release to work. Upstream-commit: 0cbeda73910d6d1d3336da93c5f94df0bdd5fa44 Component: engine --- .../hack/infrastructure/docker-ci/nightlyrelease/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/engine/hack/infrastructure/docker-ci/nightlyrelease/Dockerfile b/components/engine/hack/infrastructure/docker-ci/nightlyrelease/Dockerfile index 953d7c11cc..6762cb4686 100644 --- a/components/engine/hack/infrastructure/docker-ci/nightlyrelease/Dockerfile +++ b/components/engine/hack/infrastructure/docker-ci/nightlyrelease/Dockerfile @@ -22,6 +22,11 @@ run apt-get update; apt-get install -y -q wget python2.7 # Add production docker binary run wget -q -O /usr/bin/docker http://get.docker.io/builds/Linux/x86_64/docker-latest; chmod +x /usr/bin/docker +#### FIXME. Temporarily install docker and dind with proper apparmor handling +run wget -q -O /usr/bin/docker http://test.docker.io/test/docker; chmod +x /usr/bin/docker +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 + # Add proto docker builder add ./dockerbuild.sh /usr/bin/dockerbuild.sh run chmod +x /usr/bin/dockerbuild.sh