Merge "Check third-party container image metadata." into stable/stein
This commit is contained in:
commit
55001e0438
@ -566,7 +566,10 @@ class BaseImageUploader(object):
|
|||||||
fallback_tag=None):
|
fallback_tag=None):
|
||||||
labels = i.get('Labels', {})
|
labels = i.get('Labels', {})
|
||||||
|
|
||||||
|
if(hasattr(labels, 'keys')):
|
||||||
label_keys = ', '.join(labels.keys())
|
label_keys = ', '.join(labels.keys())
|
||||||
|
else:
|
||||||
|
label_keys = ""
|
||||||
|
|
||||||
if not tag_from_label:
|
if not tag_from_label:
|
||||||
raise ImageUploaderException(
|
raise ImageUploaderException(
|
||||||
@ -587,6 +590,8 @@ class BaseImageUploader(object):
|
|||||||
(image, e, label_keys)
|
(image, e, label_keys)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
tag_label = None
|
||||||
|
if(isinstance(labels, dict)):
|
||||||
tag_label = labels.get(tag_from_label)
|
tag_label = labels.get(tag_from_label)
|
||||||
if tag_label is None:
|
if tag_label is None:
|
||||||
if fallback_tag:
|
if fallback_tag:
|
||||||
|
Loading…
Reference in New Issue
Block a user