projectatomic/atomic
1
0
Fork 0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-05 18:45:01 +01:00
Code Issues Releases Activity

syscontainers: read labels from v1Compatibility

Browse Source 
Images coming from registry.access.redhat.com through "skopeo copy"
have this information in the "v1Compatibility" block.  Use this
information so we can correctly catch "atomic.run".

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2018-02-01 15:20:44 +01:00
parent 772b8c9dc7
commit 12edeebb0e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Atomic/syscontainers.py
View File

@@ -1646,7 +1646,13 @@ Warning: You may want to modify `%s` before starting the service""" % os.path.jo
virtual_size = self._get_virtual_size(repo, manifest)
if 'Labels' in manifest:
labels = manifest['Labels']
else:
elif 'history' in manifest:
for i in manifest['history']:
if 'v1Compatibility' in i:
config = json.loads(i['v1Compatibility'])
if 'container_config' in config and 'Labels' in config['container_config']:
labels.update(config['container_config']['Labels'])
if labels is None or len(labels) == 0:
config = self._image_config(repo, manifest)
if config:
config = json.loads(config)