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

This commit is contained in:
yackob03 2013-10-26 17:41:32 -04:00
commit c276bce177
14 changed files with 444 additions and 35 deletions

View file

@ -180,22 +180,22 @@ user_files = UserRequestFiles(app.config['AWS_ACCESS_KEY'],
app.config['REGISTRY_S3_BUCKET'])
@app.route('/api/repository/', methods=['POST'])
@app.route('/api/repository', methods=['POST'])
@api_login_required
def create_repo_api():
owner = current_user.db_user()
namespace_name = owner.username
repository_name = request.values['repository']
visibility = request.values['visibility']
repository_name = request.get_json()['repository']
visibility = request.get_json()['visibility']
repo = model.create_repository(namespace_name, repository_name, owner,
visibility)
resp = make_response('Created', 201)
resp.headers['Location'] = url_for('get_repo_api', namespace=namespace_name,
repository=repository_name)
return resp
return jsonify({
'namespace': namespace_name,
'name': repository_name
})
@app.route('/api/find/repository', methods=['GET'])
@ -395,6 +395,17 @@ def get_repo_builds(namespace, repository):
abort(403) # Permissions denied
@app.route('/api/filedrop/', methods=['POST'])
def get_filedrop_url():
mimeType = request.get_json()['mimeType']
(url, file_id) = user_files.prepare_for_drop(mimeType)
return jsonify({
'url': url,
'file_id': file_id
})
@app.route('/api/repository/<path:repository>/build/', methods=['POST'])
@api_login_required
@parse_repository_name
@ -402,8 +413,7 @@ def request_repo_build(namespace, repository):
permission = ModifyRepositoryPermission(namespace, repository)
if permission.can():
logger.debug('User requested repository initialization.')
dockerfile_source = request.files['initializedata']
dockerfile_id = user_files.store_file(dockerfile_source)
dockerfile_id = request.get_json()['file_id']
repo = model.get_repository(namespace, repository)
token = model.create_access_token(repo, 'write')
@ -414,7 +424,9 @@ def request_repo_build(namespace, repository):
tag)
dockerfile_build_queue.put(json.dumps({'request_id': build_request.id}))
return make_response('Created', 201)
return jsonify({
'started': True
})
abort(403) # Permissions denied