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

Move shared V1/V2 code into common methods and fix verbs

Browse source
This commit is contained in:
Joseph Schorr 2015-08-13 17:14:17 -04:00
parent 0e93dbb832
commit d246e68e68
5 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
endpoints/verbs.py
View file

@ -119,13 +119,10 @@ def _verify_repo_verb(store, namespace, repository, tag, verb, checker=None):
abort(404)
# If there is a data checker, call it first.
uuid = repo_image.storage.uuid
image_json = None
if checker is not None:
image_json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
image_json = json.loads(image_json_data)
image_json = json.loads(model.image.get_image_json(repo_image, store))
if not checker(image_json):
logger.debug('Check mismatch on %s/%s:%s, verb %s', namespace, repository, tag, verb)
abort(404)
@ -172,7 +169,7 @@ def _repo_verb(namespace, repository, tag, verb, formatter, sign=False, checker=
if not derived.uploading:
logger.debug('Derived %s image %s exists in storage', verb, derived.uuid)
derived_layer_path = store.image_layer_path(derived.uuid)
derived_layer_path = model.storage.get_layer_path(derived, store)
download_url = store.get_direct_download_url(derived.locations, derived_layer_path)
if download_url:
logger.debug('Redirecting to download URL for derived %s image %s', verb, derived.uuid)
@ -185,16 +182,13 @@ def _repo_verb(namespace, repository, tag, verb, formatter, sign=False, checker=
return send_file(store.stream_read_file(derived.locations, derived_layer_path))
# Load the ancestry for the image.
uuid = repo_image.storage.uuid
full_image_list = model.image.get_image_ancestors(repo_image)
logger.debug('Building and returning derived %s image %s', verb, derived.uuid)
ancestry_data = store.get_content(repo_image.storage.locations, store.image_ancestry_path(uuid))
full_image_list = json.loads(ancestry_data)
# Load the image's JSON layer.
if not image_json:
image_json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
image_json = json.loads(image_json_data)
image_json = json.loads(model.image.get_image_json(repo_image, store))
# Calculate a synthetic image ID.
synthetic_image_id = hashlib.sha256(tag_image.docker_image_id + ':' + verb).hexdigest()