Merge "Fix option conflict in Zun CNI for recent Docker"
This commit is contained in:
commit
37ad1eb9d1
@ -110,7 +110,6 @@ class ZunCNI(network.Network):
|
||||
container.save(self.context)
|
||||
|
||||
host_config['network_mode'] = 'none'
|
||||
container_kwargs['mac_address'] = port['mac_address']
|
||||
|
||||
# We manipulate entrypoint and command parameters in here.
|
||||
token = (container.entrypoint or []) + (container.command or [])
|
||||
|
Loading…
x
Reference in New Issue
Block a user