kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

testing infrastructure, issue #1766: Temporarily install docker with proper apparmor handling

Browse source
This commit is contained in:
Daniel Mizyrycki 2013-09-21 12:14:40 -07:00 • committed by Daniel Mizyrycki
parent fac190959f
commit 6e3068700f
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
testing/Vagrantfile vendored
View file

@ -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; " \

6
testing/buildbot/dockerci_local.sh
View file

@ -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

5
testing/nightlyrelease/Dockerfile
View file

@ -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

6
testing/nightlyrelease/dockerbuild
View file

@ -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