Fix #19477, clean up the ports when release network #19483
Merged
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
|
LGTM 🐹 |
| @@ -999,6 +999,9 @@ func (daemon *Daemon) releaseNetwork(container *container.Container) { | |||
|
|
|||
| sid := container.NetworkSettings.SandboxID | |||
| settings := container.NetworkSettings.Networks | |||
| if container.NetworkSettings.Ports != nil { | |||
There was a problem hiding this comment.
Maybe just set container.NetworkSettings.Ports = nil no matter what and avoid the if branch.
|
LGTM apart from minor nit, but if we need to merge as-is i'm fine too. |
|
LGTM. @tiborvass +1. |
coolljt0725
force-pushed
the
fix_19477
branch
from
ae7d208 to
6025517
Compare
|
updated as @cpuguy83 's suggestion |
|
LGTM |
Signed-off-by: Lei Jitang <leijitang@huawei.com>
vdemeester
added a commit
that referenced
this pull request
Jan 21, 2016
Fix #19477, clean up the ports when release network
tiborvass
added
status/6-cherry-picked
and removed
status/4-merge
status/5-cherry-pick
status/2-code-review
labels
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Signed-off-by: Lei Jitang leijitang@huawei.com
Closes #19477
ping @ibuildthecloud @aboch @mavenugo