瀏覽代碼

Fix merging of compose files when network has None config

Signed-off-by: Michael Irwin <[email protected]>

Resolves #6525
Michael Irwin 6 年之前
父節點
當前提交
3fae0119ca
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      compose/config/config.py

+ 1 - 1
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')