diff --git a/fedora-docker.conf b/fedora-docker.conf index 2a324c3..1dfd50f 100644 --- a/fedora-docker.conf +++ b/fedora-docker.conf @@ -224,12 +224,11 @@ image_build = { }, 'factory-parameters': { 'dockerversion': "1.10.1", - 'docker_cmd': "[ '/bin/bash' ]", - 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]", + 'docker_cmd': '[ "/usr/bin/bash" ]', + 'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]', 'docker_labels': { 'Name': 'fedora', - 'License': u'GPLv2', - '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', + 'License': u'MIT', 'Vendor': 'Fedora Project', 'Version': '26', }, diff --git a/fedora.conf b/fedora.conf index 55a5e71..eab3696 100644 --- a/fedora.conf +++ b/fedora.conf @@ -287,12 +287,11 @@ image_build = { }, 'factory-parameters': { 'dockerversion': "1.10.1", - 'docker_cmd': "[ '/bin/bash' ]", - 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]", + 'docker_cmd': '[ "/usr/bin/bash" ]', + 'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]', 'docker_labels': { 'Name': 'fedora', - 'License': u'GPLv2', - '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', + 'License': u'MIT', 'Vendor': 'Fedora Project', 'Version': '26', }, @@ -313,12 +312,11 @@ image_build = { }, 'factory-parameters': { 'dockerversion': "1.10.1", - 'docker_cmd': "[ '/bin/bash' ]", - 'docker_env': "[ 'DISTTAG=f26docker', 'FGC=f26' ]", + 'docker_cmd': '[ "/usr/bin/bash" ]', + 'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]', 'docker_labels': { 'Name': 'fedora-minimal', - 'License': u'GPLv2', - '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', + 'License': u'MIT', 'Vendor': 'Fedora Project', 'Version': '26', },