From b79963bcd475900d1d40d7d8245bef9147726199 Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Mar 31 2017 18:55:08 +0000
Subject: Fix docker metadata formatting and license


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>

---

diff --git a/fedora-docker.conf b/fedora-docker.conf
index f57368d..cc152e3 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=f25docker', 'FGC=f25' ]",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f25docker", "FGC=f25" ]',
                 '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': '25',
                 },
diff --git a/fedora.conf b/fedora.conf
index 1e6b395..b125fec 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -291,12 +291,11 @@ image_build = {
                     },
             'factory-parameters': {
                 'dockerversion': "1.10.1",
-                'docker_cmd':  "[ '/bin/bash' ]",
-                'docker_env': "[ 'DISTTAG=f25docker', 'FGC=f25' ]",
+                'docker_cmd':  '[ "/usr//bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f25docker", "FGC=f25" ]',
                 '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': '25',
                 },