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

Merge branch 'dockerbuild' of https://bitbucket.org/yackob03/quay into dockerbuild

Browse source
This commit is contained in:
Joseph Schorr 2013-10-28 17:08:36 -04:00
commit e8cbc9c864
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildserver/buildserver.py
View file

@ -218,4 +218,4 @@ def get_all_status():
if __name__ == '__main__': if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT) logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT)
app.run(host='0.0.0.0', port=5002, debug=True) app.run(host='0.0.0.0', port=5002, debug=True, threaded=True)

2
buildserver/startserver
View file

@ -45,4 +45,4 @@ done
popd popd
docker -d & docker -d &
exec venv/bin/python buildserver.py 2> buildserver.log exec venv/bin/python buildserver.py

17
workers/dockerfilebuild.py
View file

@ -58,8 +58,10 @@ def get_status(url):
def babysit_builder(request): def babysit_builder(request):
""" Spin up a build node and ask it to build our job. Retryable errors
should return False, while fatal errors should return True.
"""
try: try:
logger.debug('Starting work item: %s' % request) logger.debug('Starting work item: %s' % request)
repository_build = model.get_repository_build(request['build_id']) repository_build = model.get_repository_build(request['build_id'])
logger.debug('Request details: %s' % repository_build) logger.debug('Request details: %s' % repository_build)
@ -143,6 +145,11 @@ def babysit_builder(request):
else: else:
logger.debug('Pull status was: %s' % pull_status) logger.debug('Pull status was: %s' % pull_status)
# Remove the credentials we used to pull so crafty users cant steal them
remove_auth_cmd = 'rm .dockercfg'
ssh_client.exec_command(remove_auth_cmd)
# Start the build server
start_cmd = 'docker run -d -privileged -lxc-conf="lxc.aa_profile=unconfined" quay.io/quay/buildserver' start_cmd = 'docker run -d -privileged -lxc-conf="lxc.aa_profile=unconfined" quay.io/quay/buildserver'
ssh_client.exec_command(start_cmd) ssh_client.exec_command(start_cmd)
@ -191,7 +198,7 @@ def babysit_builder(request):
# clean up the DO node # clean up the DO node
logger.debug('Cleaning up DO node.') logger.debug('Cleaning up DO node.')
# droplet.destroy() droplet.destroy()
repository_build.status_url = None repository_build.status_url = None
repository_build.build_node_id = None; repository_build.build_node_id = None;
@ -200,7 +207,9 @@ def babysit_builder(request):
return True return True
except Exception as outer_ex: except Exception as outer_ex:
# We don't really know what these are, but they are probably retryable
logger.exception('Exception processing job: %s' % outer_ex.message) logger.exception('Exception processing job: %s' % outer_ex.message)
return False
def process_work_items(pool): def process_work_items(pool):
@ -236,9 +245,7 @@ def start_worker():
sched = Scheduler() sched = Scheduler()
sched.start() sched.start()
# sched.add_interval_job(process_work_items, args=[pool], seconds=30) sched.add_interval_job(process_work_items, args=[pool], seconds=30)
process_work_items(pool)
while True: while True:
time.sleep(60 * 60 * 24) # sleep one day, basically forever time.sleep(60 * 60 * 24) # sleep one day, basically forever