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

Fix docker metadata formatting and license

Browse Source 
The previous formatting for docker image metadata was getting
escaped incorrectly when passed to imagefactory. This resolves that.

Fix the license label to be MIT instead of GPLv2.

Fix the bash path

Remove atomic RUN command, it causes build failures and isn't
necessary in the base image.

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
This commit is contained in:
Adam Miller 2017-03-31 13:58:16 -05:00
parent efddd81a8f
commit a522a05f95
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fedora-docker.conf
View File

@ -224,12 +224,11 @@ image_build = {
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': "[ '/bin/bash' ]", 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': "[ 'DISTTAG=f27docker', 'FGC=f27' ]", 'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_labels': { 'docker_labels': {
'Name': 'fedora', 'Name': 'fedora',
'License': u'GPLv2', 'License': u'MIT',
'RUN': 'docker run -it --rm ${OPT1} --privileged -v \`pwd\`:/atomicapp -v /run:/run -v /:/host --net=host --name ${NAME} -e NAME=${NAME} -e IMAGE=${IMAGE} ${IMAGE} -v ${OPT2} run ${OPT3} /atomicapp',
'Vendor': 'Fedora Project', 'Vendor': 'Fedora Project',
'Version': '27', 'Version': '27',
}, },

14
fedora.conf
View File

@ -287,12 +287,11 @@ image_build = {
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': "[ '/bin/bash' ]", 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': "[ 'DISTTAG=f27docker', 'FGC=f27' ]", 'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_labels': { 'docker_labels': {
'Name': 'fedora', 'Name': 'fedora',
'License': u'GPLv2', 'License': u'MIT',
'RUN': 'docker run -it --rm ${OPT1} --privileged -v \`pwd\`:/atomicapp -v /run:/run -v /:/host --net=host --name ${NAME} -e NAME=${NAME} -e IMAGE=${IMAGE} ${IMAGE} -v ${OPT2} run ${OPT3} /atomicapp',
'Vendor': 'Fedora Project', 'Vendor': 'Fedora Project',
'Version': '27', 'Version': '27',
}, },
@ -313,12 +312,11 @@ image_build = {
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': "[ '/bin/bash' ]", 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': "[ 'DISTTAG=f27docker', 'FGC=f27' ]", 'docker_env': '[ "DISTTAG=f27docker", "FGC=f27" ]',
'docker_labels': { 'docker_labels': {
'Name': 'fedora-minimal', 'Name': 'fedora-minimal',
'License': u'GPLv2', 'License': u'MIT',
'RUN': 'docker run -it --rm ${OPT1} --privileged -v \`pwd\`:/atomicapp -v /run:/run -v /:/host --net=host --name ${NAME} -e NAME=${NAME} -e IMAGE=${IMAGE} ${IMAGE} -v ${OPT2} run ${OPT3} /atomicapp',
'Vendor': 'Fedora Project', 'Vendor': 'Fedora Project',
'Version': '27', 'Version': '27',
}, },