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

Merge branch 'master' of https://github.com/coreos-inc/quay

Browse source
This commit is contained in:
Joseph Schorr 2014-12-09 23:39:27 +02:00
commit 1eae1a87b2
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -3,7 +3,7 @@ to build and upload quay to quay:
``` ```
curl -s https://get.docker.io/ubuntu/ | sudo sh curl -s https://get.docker.io/ubuntu/ | sudo sh
sudo apt-get update && sudo apt-get install -y git sudo apt-get update && sudo apt-get install -y git
git clone https://bitbucket.org/yackob03/quay.git git clone https://github.com/coreos-inc/quay.git
cd quay cd quay
rm Dockerfile rm Dockerfile
ln -s Dockerfile.web Dockerfile ln -s Dockerfile.web Dockerfile
@ -33,7 +33,7 @@ start the quay processes:
``` ```
cd ~ cd ~
git clone https://bitbucket.org/yackob03/quayconfig.git git clone https://github.com/coreos-inc/quay.git
sudo docker pull staging.quay.io/quay/quay sudo docker pull staging.quay.io/quay/quay
cd ~/gantryd cd ~/gantryd
sudo venv/bin/python gantry.py ../quayconfig/production/gantry.json update quay sudo venv/bin/python gantry.py ../quayconfig/production/gantry.json update quay
@ -44,7 +44,7 @@ to build and upload the builder to quay
``` ```
curl -s https://get.docker.io/ubuntu/ | sudo sh curl -s https://get.docker.io/ubuntu/ | sudo sh
sudo apt-get update && sudo apt-get install -y git sudo apt-get update && sudo apt-get install -y git
git clone git clone https://bitbucket.org/yackob03/quay.git git clone git clone https://github.com/coreos-inc/quay.git
cd quay cd quay
rm Dockerfile rm Dockerfile
ln -s Dockerfile.buildworker Dockerfile ln -s Dockerfile.buildworker Dockerfile
@ -74,7 +74,7 @@ start the worker
``` ```
cd ~ cd ~
git clone https://bitbucket.org/yackob03/quayconfig.git git clone https://github.com/coreos-inc/quay.git
sudo docker pull quay.io/quay/builder sudo docker pull quay.io/quay/builder
cd ~/gantryd cd ~/gantryd
sudo venv/bin/python gantry.py ../quayconfig/production/gantry.json update builder sudo venv/bin/python gantry.py ../quayconfig/production/gantry.json update builder

8
buildman/jobutil/buildjob.py
View file

@ -19,9 +19,7 @@ class BuildJob(object):
) )
try: try:
self._repo_build = model.get_repository_build(self._job_details['namespace'], self._repo_build = model.get_repository_build(self._job_details['build_uuid'])
self._job_details['repository'],
self._job_details['build_uuid'])
except model.InvalidRepositoryBuildException: except model.InvalidRepositoryBuildException:
raise BuildJobLoadException( raise BuildJobLoadException(
'Could not load repository build with ID %s' % self._job_details['build_uuid']) 'Could not load repository build with ID %s' % self._job_details['build_uuid'])
@ -38,8 +36,8 @@ class BuildJob(object):
# TODO(jschorr): Change this to use the more complicated caching rules, once we have caching # TODO(jschorr): Change this to use the more complicated caching rules, once we have caching
# be a pull of things besides the constructed tags. # be a pull of things besides the constructed tags.
tags = self._build_config.get('docker_tags', ['latest']) tags = self._build_config.get('docker_tags', ['latest'])
existing_tags = model.list_repository_tags(self._job_details['namespace'], existing_tags = model.list_repository_tags(self._repo_build.repository.namespace_user.username,
self._job_details['repository']) self._repo_build.repository.name)
cached_tags = set(tags) & set([tag.name for tag in existing_tags]) cached_tags = set(tags) & set([tag.name for tag in existing_tags])
if cached_tags: if cached_tags: