From 3fbfb3a5dd62b5ad97f385c0163d7a030934c511 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 10 Aug 2017 10:59:23 -0700
Subject: [PATCH] Prevent null logging options in `docker-compose config`
 output

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 compose/config/config.py         | 4 ++--
 tests/unit/config/config_test.py | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compose/config/config.py b/compose/config/config.py
index fb376b325..f3b8e42fd 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -1044,8 +1044,8 @@ def merge_logging(base, override):
     md.merge_scalar('driver')
     if md.get('driver') == base.get('driver') or base.get('driver') is None:
         md.merge_mapping('options', lambda m: m or {})
-    else:
-        md['options'] = override.get('options')
+    elif override.get('options'):
+        md['options'] = override.get('options', {})
     return dict(md)
 
 
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 8861baa98..8a1e16f8a 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -1864,7 +1864,6 @@ class ConfigTest(unittest.TestCase):
             'image': 'alpine:edge',
             'logging': {
                 'driver': 'syslog',
-                'options': None
             }
         }