tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent null logging options in `docker-compose config` output 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-08-10 10:59:23 -07:00 committed by Joffrey F
parent b893797e03
commit b2a3566cf5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/config.py
View File

@ -1044,8 +1044,8 @@ def merge_logging(base, override):
md.merge_scalar('driver') md.merge_scalar('driver')
if md.get('driver') == base.get('driver') or base.get('driver') is None: if md.get('driver') == base.get('driver') or base.get('driver') is None:
md.merge_mapping('options', lambda m: m or {}) md.merge_mapping('options', lambda m: m or {})
else: elif override.get('options'):
md['options'] = override.get('options') md['options'] = override.get('options', {})
return dict(md) return dict(md)

1
tests/unit/config/config_test.py
View File

@ -1864,7 +1864,6 @@ class ConfigTest(unittest.TestCase):
'image': 'alpine:edge', 'image': 'alpine:edge',
'logging': { 'logging': {
'driver': 'syslog', 'driver': 'syslog',
'options': None
} }
} }