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

One of the calls which returns an image was not using the base format which includes locations yet.

Browse source
This commit is contained in:
Jake Moshenko 2014-06-30 14:51:01 -04:00
parent b3bf782035
commit d851feef6e
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/model/legacy.py
View file

@ -1186,21 +1186,11 @@ def get_tag_image(namespace_name, repository_name, tag_name):
def get_image_by_id(namespace_name, repository_name, docker_image_id): def get_image_by_id(namespace_name, repository_name, docker_image_id):
query = (Image image = get_repo_image(namespace_name, repository_name, docker_image_id)
.select(Image, ImageStorage) if not image:
.join(Repository)
.switch(Image)
.join(ImageStorage, JOIN_LEFT_OUTER)
.where(Repository.name == repository_name,
Repository.namespace == namespace_name,
Image.docker_image_id == docker_image_id))
try:
return query.get()
except Image.DoesNotExist:
raise DataModelException('Unable to find image \'%s\' for repo \'%s/%s\'' % raise DataModelException('Unable to find image \'%s\' for repo \'%s/%s\'' %
(docker_image_id, namespace_name, (docker_image_id, namespace_name, repository_name))
repository_name)) return image
def get_parent_images(namespace_name, repository_name, image_obj): def get_parent_images(namespace_name, repository_name, image_obj):