From: Ian Main <imain@redhat.com>
Date: Thu, 8 Jun 2017 22:56:55 +0000 (-0400)
Subject: Fix bug in docker-toool where values are sometimes empty.
X-Git-Tag: opnfv-6.0.0~561^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=43d08a0bfa513e064ea99a2246a1c657a5f74bfc;p=apex-tripleo-heat-templates.git

Fix bug in docker-toool where values are sometimes empty.

I was getting empty volumes from the json and it was creating bad
docker command lines.

Change-Id: Ie90fc1afa5711d6b029e98d621507b9cb70c1dbe
---

diff --git a/docker/docker-toool b/docker/docker-toool
index 36aba4a7..0b87ea92 100755
--- a/docker/docker-toool
+++ b/docker/docker-toool
@@ -75,6 +75,9 @@ def parse_opts(argv):
 
 def docker_arg_map(key, value):
     value = str(value).encode('ascii', 'ignore')
+    if len(value) == 0:
+        return ''
+
     return {
         'environment': "--env=%s" % value,
         # 'image': value,