jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2734 from jrabbit/empty-env-var-2359

Browse source 
Empty env var #2359
This commit is contained in:
Joffrey F 2016-02-08 11:17:54 -08:00
commit fdf4a2e89e
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/config/config.py
View file

@ -491,12 +491,12 @@ def resolve_environment(service_dict):
env.update(env_vars_from_file(env_file))
env.update(parse_environment(service_dict.get('environment')))
return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(env))))
def resolve_build_args(build):
args = parse_build_arguments(build.get('args'))
return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(args))))
def validate_extended_service_dict(service_dict, filename, service):
@ -806,7 +806,7 @@ def resolve_env_var(key, val):
elif key in os.environ:
return key, os.environ[key]
else:
return key, ''
return ()
def env_vars_from_file(filename):