tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 23:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change special case from '_', None to ()

Browse Source 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
This commit is contained in:
jrabbit 2016-02-06 02:54:06 -05:00 committed by Daniel Nephin
parent c195915263
commit abec6f5891
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compose/config/config.py
View File

@ -491,18 +491,12 @@ def resolve_environment(service_dict):
env.update(env_vars_from_file(env_file)) env.update(env_vars_from_file(env_file))
env.update(parse_environment(service_dict.get('environment'))) env.update(parse_environment(service_dict.get('environment')))
d = 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))))
if '_' in d.keys():
del d['_']
return d
def resolve_build_args(build): def resolve_build_args(build):
args = parse_build_arguments(build.get('args')) args = parse_build_arguments(build.get('args'))
d = 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))))
if '_' in d.keys():
del d['_']
return d
def validate_extended_service_dict(service_dict, filename, service): def validate_extended_service_dict(service_dict, filename, service):
@ -812,7 +806,7 @@ def resolve_env_var(key, val):
elif key in os.environ: elif key in os.environ:
return key, os.environ[key] return key, os.environ[key]
else: else:
return "_", None return ()
def env_vars_from_file(filename): def env_vars_from_file(filename):