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

rebase and fix unicode issue

Browse Source 
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
This commit is contained in:
Adam Miller 2017-08-15 13:32:25 -05:00
parent e650328505
commit 2a565c78bc
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fedora-docker.conf
View File

@ -229,12 +229,8 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
'docker_labels': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
'Name': 'fedora',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '26',
},
}, },
}, },
{ {
@ -256,12 +252,7 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
'docker_labels': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
'Name': 'fedora-minimal',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '26',
},
}, },
} }
], ],

14
fedora.conf
View File

@ -293,12 +293,7 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]', 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_labels': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
'Name': 'fedora',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '27',
},
}, },
}, },
{ {
@ -318,12 +313,7 @@ image_build = {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]', 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_labels': { 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
'Name': 'fedora-minimal',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '27',
},
}, },
} }
], ],