Bläddra i källkod

Fix merging of compose files when network has None config

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

Resolves #6525
Michael Irwin 6 år sedan
förälder
incheckning
3f1d41a97e
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      compose/config/config.py

+ 1 - 1
compose/config/config.py

@@ -1214,7 +1214,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')