Bläddra i källkod

docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.

Daniel Mizyrycki 11 år sedan
förälder
incheckning
0cbeda7391
1 ändrade filer med 5 tillägg och 0 borttagningar
  1. 5 0
      hack/infrastructure/docker-ci/nightlyrelease/Dockerfile

+ 5 - 0
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