From 3fae0119ca2d1a05c490fdbf286370e92ce4a349 Mon Sep 17 00:00:00 2001 From: Michael Irwin Date: Tue, 5 Mar 2019 10:17:09 -0500 Subject: [PATCH] Fix merging of compose files when network has None config Signed-off-by: Michael Irwin Resolves #6525 --- compose/config/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/config/config.py b/compose/config/config.py index e2ed29a47..f3142d80a 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -1193,7 +1193,7 @@ def merge_networks(base, override): base = {k: {} for k in base} if isinstance(base, list) else base override = {k: {} for k in override} if isinstance(override, list) else override for network_name in all_network_names: - md = MergeDict(base.get(network_name, {}), override.get(network_name, {})) + md = MergeDict(base.get(network_name) or {}, override.get(network_name) or {}) md.merge_field('aliases', merge_unique_items_lists, []) md.merge_field('link_local_ips', merge_unique_items_lists, []) md.merge_scalar('priority')