Fix #3281: Unexpected result when using build args with default values

Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
  .... args:
  - http_proxy
  - https_proxy
  - no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
This commit is contained in:
Andrey Devyatkin 2016-05-28 11:39:41 +02:00
commit a67ba5536d
2 changed files with 29 additions and 1 deletions

View file

@ -95,4 +95,4 @@ def microseconds_from_time_nano(time_nano):
def build_string_dict(source_dict):
return dict((k, str(v if v else '')) for k, v in source_dict.items())
return dict((k, str(v if v is not None else '')) for k, v in source_dict.items())