Fix network connect dulicate mac-address #17860
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
when a container created with --mac-address, the newer endpoint created by docker network connect will has the same mac address with the exists endpoint. And fix a typo in the comment of method ConnectToNetwork. Signed-off-by: Lei Jitang <leijitang@huawei.com>
| @@ -797,7 +797,7 @@ func (daemon *Daemon) updateNetwork(container *Container) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (container *Container) buildCreateEndpointOptions(n libnetwork.Network) ([]libnetwork.EndpointOption, error) { | |||
| func (container *Container) buildCreateEndpointOptions(n libnetwork.Network, controller libnetwork.NetworkController) ([]libnetwork.EndpointOption, error) { | |||
There was a problem hiding this comment.
Can we avoid passing the libnetwork.controller and simply check for n.Name() == "bridge"
The bridge string has been anyway hard-coded all over this file.
Another PR should take care of replacing those with a daemon constant.
|
needs rebase |
|
@aboch @coolljt0725 PTAL at the updated changes for #17858 |
|
we can close this PR once #17858 is merged |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when a container created with --mac-address, the newer endpoint created
by docker network connect will has the same mac address with the exists
endpoint. And fix a typo in the comment of method ConnectToNetwork.
Signed-off-by: Lei Jitang leijitang@huawei.com