testing infrastructure, issue moby#1766: Temporarily install docker w…

…ith proper apparmor handling

testing/Vagrantfile

@@ -44,6 +44,9 @@ Vagrant::Config.run do |config|
       "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list; " \
       "apt-get update -qq; apt-get install -yq lxc-docker; "
 
+    #### FIXME. Temporarily install docker with proper apparmor handling
+    pkg_cmd << "stop docker; wget -q -O /usr/bin/docker http://test.docker.io/test/docker; start docker; " \
+
     # Install testing dependencies
     pkg_cmd << "wget -O go.tgz http://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz; " \
       "  tar -C /usr/local -vxzf go.tgz; ln -s /usr/local/go/bin/go /usr/bin/go; " \

testing/buildbot/dockerci_local.sh

@@ -4,12 +4,6 @@
 # Build docker nightly release container
 cd /go/src/github.com/dotcloud/docker/testing/nightlyrelease; docker build -t dockerbuilder .
 
-# Relaunch docker for dind to work (disabling apparmor)
-/sbin/stop docker
-DIND_CMD="    /etc/init.d/apparmor stop; /etc/init.d/apparmor teardown; /usr/bin/docker -dns=8.8.8.8 -d"
-sed -Ei "s~    /usr/bin/docker -d~$DIND_CMD~" /etc/init/docker.conf
-/sbin/start docker
-
 # Self removing
 echo -e '#!/bin/sh -e\nexit 0\n' > /etc/rc.local
 exit 0

testing/nightlyrelease/Dockerfile

@@ -21,7 +21,10 @@ run echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt
 run apt-get update; apt-get install -y -q lxc bzip2 iptables ca-certificates git wget python2.7
 
 # Add production docker binary
-run wget -O /usr/bin/docker http://get.docker.io/builds/Linux/x86_64/docker-latest; chmod +x /usr/bin/docker
+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 with proper apparmor handling
+run wget -q -O /usr/bin/docker http://test.docker.io/test/docker; chmod +x /usr/bin/docker
 
 # Add proto docker builder
 add ./dockerbuild /usr/bin/dockerbuild

testing/nightlyrelease/dockerbuild

@@ -8,9 +8,13 @@
 set -x
 
 # Fetch docker master branch
-git clone http://github.com/dotcloud/docker /go/src/github.com/dotcloud/docker
+git clone -q http://github.com/dotcloud/docker /go/src/github.com/dotcloud/docker
 cd /go/src/github.com/dotcloud/docker
 
+echo FIXME. Temporarily add Jerome changeset with proper apparmor handling
+git fetch  http://github.com/jpetazzo/docker escape-apparmor-confinement:escape-apparmor-confinement
+git rebase --onto master master escape-apparmor-confinement
+
 # Launch docker daemon using dind inside the container
 ./hack/dind /usr/bin/docker -dns=8.8.8.8 -d &
 sleep 5