vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add dependencies for docker in docker. Fix the aufs startup command. Fix a bug in the buildserver.

Browse source
This commit is contained in:
yackob03 2013-10-25 20:08:02 -04:00
parent 660a931d6b
commit 89df3d10be
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildserver/Dockerfile
View file

@ -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 echo deb http://archive.ubuntu.com/ubuntu precise universe > /etc/apt/sources.list.d/universe.list
RUN apt-get update -qq 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... # 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 ADD https://get.docker.io/builds/Linux/x86_64/docker-latest /usr/local/bin/docker

2
buildserver/Readme.md
View file

@ -9,5 +9,5 @@ To run:
``` ```
sudo docker pull quay.io/quay/buildserver 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
``` ```

2
buildserver/buildserver.py
View file

@ -147,7 +147,7 @@ def start_build():
# Save the token # Save the token
host = re.match(r'([a-z0-9.:]+)/.+/.+$', tag_name) host = re.match(r'([a-z0-9.:]+)/.+/.+$', tag_name)
if host: 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') dockercfg_path = os.path.join(os.environ.get('HOME', '.'), '.dockercfg')
token = b64encode('$token:%s' % acccess_token) token = b64encode('$token:%s' % acccess_token)
with open(dockercfg_path, 'w') as dockercfg: with open(dockercfg_path, 'w') as dockercfg: