catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Stephan Huber 2018-09-12 11:48:19 +02:00
commit 88596518f5
61 changed files with 2231 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

23
moto/ecr/models.py
View file

@ -209,17 +209,22 @@ class ECRBackend(BaseBackend):
"""
maxResults and filtering not implemented
"""
images = []
for repository in self.repositories.values():
if repository_name:
if repository.name != repository_name:
continue
repository = None
found = False
if repository_name in self.repositories:
repository = self.repositories[repository_name]
if registry_id:
if repository.registry_id != registry_id:
continue
if repository.registry_id == registry_id:
found = True
else:
found = True
for image in repository.images:
images.append(image)
if not found:
raise RepositoryNotFoundException(repository_name, registry_id or DEFAULT_REGISTRY_ID)
images = []
for image in repository.images:
images.append(image)
return images
def describe_images(self, repository_name, registry_id=None, image_ids=None):