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

Fix recursion error in images API

Browse source 
We only need parents for the root set of images
This commit is contained in:
Joseph Schorr 2017-08-09 13:27:54 -04:00
parent 8ff8a4ca1a
commit 2184721d28
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
endpoints/api/image_models_pre_oci.py
View file

@ -3,11 +3,14 @@ from data import model
from endpoints.api.image_models_interface import (ImageInterface, ImageWithHistory, ImageWithTags, from endpoints.api.image_models_interface import (ImageInterface, ImageWithHistory, ImageWithTags,
Image) Image)
def _image(namespace_name, repo_name, image, all_images): def _image(namespace_name, repo_name, image, all_images, include_parents=True):
parent_images = [all_images[ancestor_id] for ancestor_id in image.ancestor_id_list() parent_image_tuples = []
if all_images.get(ancestor_id)] if include_parents:
parent_image_tuples = [_image(namespace_name, repo_name, parent_image, all_images) parent_images = [all_images[ancestor_id] for ancestor_id in image.ancestor_id_list()
for parent_image in parent_images] if all_images.get(ancestor_id)]
parent_image_tuples = [_image(namespace_name, repo_name, parent_image, all_images, False)
for parent_image in parent_images]
return Image(image.docker_image_id, image.created, image.comment, image.command, return Image(image.docker_image_id, image.created, image.comment, image.command,
image.storage.image_size, image.storage.uploading, parent_image_tuples) image.storage.image_size, image.storage.uploading, parent_image_tuples)
@ -28,7 +31,8 @@ class PreOCIModel(ImageInterface):
all_images = model.image.get_repository_images_without_placements(repo) all_images = model.image.get_repository_images_without_placements(repo)
all_images_map = {image.id: image for image in all_images} all_images_map = {image.id: image for image in all_images}
all_tags = model.tag.list_repository_tags(namespace_name, repo_name) all_tags = list(model.tag.list_repository_tags(namespace_name, repo_name))
tags_by_docker_id = defaultdict(list) tags_by_docker_id = defaultdict(list)
for tag in all_tags: for tag in all_tags:
tags_by_docker_id[tag.image.docker_image_id].append(tag) tags_by_docker_id[tag.image.docker_image_id].append(tag)