From 89df3d10be0cfe61c2b12884d28cb3aaaa5ff8af Mon Sep 17 00:00:00 2001 From: yackob03 Date: Fri, 25 Oct 2013 20:08:02 -0400 Subject: [PATCH] Add dependencies for docker in docker. Fix the aufs startup command. Fix a bug in the buildserver. --- buildserver/Dockerfile | 2 +- buildserver/Readme.md | 2 +- buildserver/buildserver.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildserver/Dockerfile b/buildserver/Dockerfile index 2b90e36a6..0a190a7cd 100644 --- a/buildserver/Dockerfile +++ b/buildserver/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER jake@devtable.com RUN echo deb http://archive.ubuntu.com/ubuntu precise universe > /etc/apt/sources.list.d/universe.list RUN apt-get update -qq -RUN apt-get install -qqy iptables ca-certificates lxc python-virtualenv git python-dev xz-utils +RUN apt-get install -qqy iptables ca-certificates lxc python-virtualenv git python-dev xz-utils aufs-tools # This will use the latest public release. To use your own, comment it out... ADD https://get.docker.io/builds/Linux/x86_64/docker-latest /usr/local/bin/docker diff --git a/buildserver/Readme.md b/buildserver/Readme.md index 6b36df9ee..8dc0dff56 100644 --- a/buildserver/Readme.md +++ b/buildserver/Readme.md @@ -9,5 +9,5 @@ To run: ``` sudo docker pull quay.io/quay/buildserver -sudo docker run -d -privileged -lxc-conf="aa_profile=unconfined" quay.io/quay/buildserver +sudo docker run -d -privileged -lxc-conf="lxc.aa_profile=unconfined" quay.io/quay/buildserver ``` \ No newline at end of file diff --git a/buildserver/buildserver.py b/buildserver/buildserver.py index 5e65a2392..2ac90e9fc 100644 --- a/buildserver/buildserver.py +++ b/buildserver/buildserver.py @@ -147,7 +147,7 @@ def start_build(): # Save the token host = re.match(r'([a-z0-9.:]+)/.+/.+$', tag_name) if host: - docker_endpoint = 'http://%s/v1/' % host.group(0) + docker_endpoint = 'http://%s/v1/' % host.group(1) dockercfg_path = os.path.join(os.environ.get('HOME', '.'), '.dockercfg') token = b64encode('$token:%s' % acccess_token) with open(dockercfg_path, 'w') as dockercfg: