diff options
| author | Michael Irwin <mikesir87@gmail.com> | 2019-03-05 10:17:09 -0500 |
|---|---|---|
| committer | Ulysses Souza <ulysses.souza@docker.com> | 2019-03-22 15:15:18 +0100 |
| commit | 3fae0119ca2d1a05c490fdbf286370e92ce4a349 (patch) | |
| tree | 8c8b7fd1bba42a7b6059da661fa952ac8c90ce68 | |
| parent | 0fdb9783cd3358a480ed508b5da6744a2d0dedb4 (diff) | |
Fix merging of compose files when network has None config
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
Resolves #6525
| -rw-r--r-- | compose/config/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compose/config/config.py b/compose/config/config.py index e2ed29a4..f3142d80 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') |