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

Merge branch 'newchanges' into python-registry-v2

Browse source
This commit is contained in:
Jake Moshenko 2015-11-06 18:24:32 -05:00
commit 7efa6265bf
6 changed files with 26 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/v1/registry.py
View file

@ -396,7 +396,7 @@ def get_image_ancestry(namespace, repository, image_id, headers):
parents = model.image.get_parent_images(namespace, repository, image)
ancestry_docker_ids = [image.docker_image_id]
ancestry_docker_ids.extend([parent.docker_image_id for parent in reversed(parents)])
ancestry_docker_ids.extend([parent.docker_image_id for parent in parents])
# We can not use jsonify here because we are returning a list not an object
response = make_response(json.dumps(ancestry_docker_ids), 200)
@ -519,7 +519,7 @@ def process_image_changes(namespace, repository, image_id):
parent_trie_path = None
if parents:
parent_trie_path, parent_locations = process_image_changes(namespace, repository,
parents[-1].docker_image_id)
parents[0].docker_image_id)
# Read in the collapsed layer state of the filesystem for the parent
parent_trie = changes.empty_fs()