| |
@@ -229,12 +229,8 @@
|
| |
'dockerversion': "1.10.1",
|
| |
'docker_cmd': '[ "/bin/bash" ]',
|
| |
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
|
| |
- 'docker_labels': {
|
| |
- 'Name': 'fedora',
|
| |
- 'License': u'MIT',
|
| |
- 'Vendor': 'Fedora Project',
|
| |
- 'Version': '26',
|
| |
- },
|
| |
+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
|
| |
+
|
| |
},
|
| |
},
|
| |
{
|
| |
@@ -256,12 +252,7 @@
|
| |
'dockerversion': "1.10.1",
|
| |
'docker_cmd': '[ "/bin/bash" ]',
|
| |
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
|
| |
- 'docker_labels': {
|
| |
- 'Name': 'fedora-minimal',
|
| |
- 'License': u'MIT',
|
| |
- 'Vendor': 'Fedora Project',
|
| |
- 'Version': '26',
|
| |
- },
|
| |
+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
|
| |
},
|
| |
}
|
| |
],
|
| |
maxamillion
commented 7 years ago
Previously the key 'docker_labels' was used but this isn't actually
picked up by imagefactory because the parameter key it's looking for
is 'docker_label'. This patch resolves that.
Also included in this patch is a change to set the labels to be
lowercase as defined in the Fedora Container Guidelines.
Signed-off-by: Adam Miller maxamillion@fedoraproject.org