From 2a565c78bc4c79798bdb91779994dde74b7c5e9a Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Aug 15 2017 18:32:25 +0000
Subject: rebase and fix unicode issue


Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

---

diff --git a/fedora-docker.conf b/fedora-docker.conf
index 51b02c9..0685ac0 100644
--- a/fedora-docker.conf
+++ b/fedora-docker.conf
@@ -229,12 +229,8 @@ image_build = {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
                 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
-                'docker_labels': {
-                    'Name': 'fedora',
-                    'License': u'MIT',
-                    'Vendor': 'Fedora Project',
-                    'Version': '26',
-                },
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
+
             },
         },
         {
@@ -256,12 +252,7 @@ image_build = {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
                 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
-                'docker_labels': {
-                    'Name': 'fedora-minimal',
-                    'License': u'MIT',
-                    'Vendor': 'Fedora Project',
-                    'Version': '26',
-                },
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
             },
         }
         ],
diff --git a/fedora.conf b/fedora.conf
index a2585aa..3e1e3fb 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -293,12 +293,7 @@ image_build = {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
                 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
-                'docker_labels': {
-                    'Name': 'fedora',
-                    'License': u'MIT',
-                    'Vendor': 'Fedora Project',
-                    'Version': '27',
-                },
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
             },
         },
         {
@@ -318,12 +313,7 @@ image_build = {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
                 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
-                'docker_labels': {
-                    'Name': 'fedora-minimal',
-                    'License': u'MIT',
-                    'Vendor': 'Fedora Project',
-                    'Version': '27',
-                },
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
             },
         }
         ],