use Config MacAddress by default instead of Networks (#564)

* use Config MacAddress by default instead of Networks

* use Config MacAddress by default instead of Networks - fix typo

* #564 docker_container macaddress - add changelog fragment
This commit is contained in:
Kirill Petrov 2020-06-30 06:40:43 +03:00 committed by Felix Fontein
parent baf78aca3a
commit 1c45fe0170

View File

@ -2121,7 +2121,7 @@ class Container(DockerBaseClass):
ipc_mode=host_config.get("IpcMode"), ipc_mode=host_config.get("IpcMode"),
labels=config.get('Labels'), labels=config.get('Labels'),
expected_links=host_config.get('Links'), expected_links=host_config.get('Links'),
mac_address=network.get('MacAddress'), mac_address=config.get('MacAddress', network.get('MacAddress')),
memory_swappiness=host_config.get('MemorySwappiness'), memory_swappiness=host_config.get('MemorySwappiness'),
network_mode=host_config.get('NetworkMode'), network_mode=host_config.get('NetworkMode'),
userns_mode=host_config.get('UsernsMode'), userns_mode=host_config.get('UsernsMode'),