From 314ac5721db6c6f4cecbb57ba7c96b0f8f4879c4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 7 Jul 2017 18:17:25 -0500 Subject: [PATCH] fix the docker_label entry to be a valid JSON string Signed-off-by: Adam Miller --- fedora-docker.conf | 7 +------ fedora.conf | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/fedora-docker.conf b/fedora-docker.conf index 3fc2e36..dc2a22d 100644 --- a/fedora-docker.conf +++ b/fedora-docker.conf @@ -226,12 +226,7 @@ image_build = { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/usr/bin/bash" ]', 'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]', - 'docker_label': { - 'name': 'fedora', - 'license': u'MIT', - 'vendor': 'Fedora Project', - 'version': '25', - }, + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}', }, } ], diff --git a/fedora.conf b/fedora.conf index 4397ce2..ccc9c7f 100644 --- a/fedora.conf +++ b/fedora.conf @@ -293,12 +293,7 @@ image_build = { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/usr//bin/bash" ]', 'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]', - 'docker_label': { - 'name': 'fedora', - 'license': u'MIT', - 'vendor': 'Fedora Project', - 'version': '25', - }, + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}', }, }, ],