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:
root 2013-10-29 22:16:22 +00:00
commit 6dd1b56a03
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -1,6 +1,7 @@
to prepare a new host: to prepare a new host:
``` ```
sudo apt-get install software-properties-common
sudo apt-add-repository -y ppa:nginx/stable sudo apt-add-repository -y ppa:nginx/stable
sudo apt-get update sudo apt-get update
sudo apt-get install -y git python-virtualenv python-dev phantomjs sudo apt-get install -y git python-virtualenv python-dev phantomjs

2
buildserver/buildserver.py
View file

@ -124,7 +124,7 @@ def build_image(build_dir, tag_name, num_steps, result_object):
except Exception as e: except Exception as e:
logger.exception('Exception when processing request.') logger.exception('Exception when processing request.')
result_object['status'] = 'error' result_object['status'] = 'error'
result_object['message'] = e.message result_object['message'] = str(e.message)
MIME_PROCESSORS = { MIME_PROCESSORS = {

3
requirements-nover.txt
View file

@ -15,4 +15,5 @@ beautifulsoup4
marisa-trie marisa-trie
apscheduler apscheduler
python-daemon python-daemon
paramiko paramiko
python-digitalocean

4
requirements.txt
View file

@ -12,6 +12,7 @@ beautifulsoup4==4.3.2
blinker==1.3 blinker==1.3
boto==2.15.0 boto==2.15.0
distribute==0.6.34 distribute==0.6.34
ecdsa==0.10
eventlet==0.14.0 eventlet==0.14.0
greenlet==0.4.1 greenlet==0.4.1
gunicorn==18.0 gunicorn==18.0
@ -19,10 +20,13 @@ itsdangerous==0.23
lockfile==0.9.1 lockfile==0.9.1
marisa-trie==0.5.1 marisa-trie==0.5.1
mixpanel-py==3.0.0 mixpanel-py==3.0.0
paramiko==1.12.0
peewee==2.1.4 peewee==2.1.4
py-bcrypt==0.4 py-bcrypt==0.4
pycrypto==2.6.1
python-daemon==1.6 python-daemon==1.6
python-dateutil==2.1 python-dateutil==2.1
python-digitalocean==0.5
requests==2.0.0 requests==2.0.0
six==1.4.1 six==1.4.1
stripe==1.9.8 stripe==1.9.8

6
workers/dockerfilebuild.py
View file

@ -43,7 +43,7 @@ def retry_command(to_call, args=[], kwargs={}, retries=5, period=5):
def get_status(url): def get_status(url):
return requests.get(url).json()['status'] return retry_command(requests.get, [url]).json()['status']
def babysit_builder(request): def babysit_builder(request):
@ -112,8 +112,10 @@ def babysit_builder(request):
ssh_client = paramiko.SSHClient() ssh_client = paramiko.SSHClient()
ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
logger.debug('Connecting to droplet through ssh at ip: %s' %
droplet.ip_address)
retry_command(ssh_client.connect, [droplet.ip_address, 22, 'root'], retry_command(ssh_client.connect, [droplet.ip_address, 22, 'root'],
{'look_for_keys': False, {'look_for_keys': False, 'timeout': 10.0,
'key_filename': app.config['DO_SSH_PRIVATE_KEY_FILENAME']}) 'key_filename': app.config['DO_SSH_PRIVATE_KEY_FILENAME']})
# Load the node with the pull token # Load the node with the pull token