davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #281 fix the docker_label entry to be a valid JSON string

Browse Source
This commit is contained in:
Adam Miller 2017-08-15 16:54:10 +00:00
commit 19da994463
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fedora-docker.conf
View File

@ -226,12 +226,7 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/usr/bin/bash" ]', 'docker_cmd': '[ "/usr/bin/bash" ]',
'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]', 'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',
'docker_label': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}',
'name': 'fedora',
'license': u'MIT',
'vendor': 'Fedora Project',
'version': '25',
},
}, },
} }
], ],

7
fedora.conf
View File

@ -293,12 +293,7 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/usr//bin/bash" ]', 'docker_cmd': '[ "/usr//bin/bash" ]',
'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]', 'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',
'docker_label': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}',
'name': 'fedora',
'license': u'MIT',
'vendor': 'Fedora Project',
'version': '25',
},
}, },
}, },
], ],