This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[18.09 backport] Handle the error case when a container reattaches to the same network #278
Merged
andrewhsu
merged 2 commits into
docker:18.09
from
thaJeztah:18.09_backport_attach_to_existing_network_error
Sep 23, 2019
Merged
[18.09 backport] Handle the error case when a container reattaches to the same network #278
andrewhsu
merged 2 commits into
docker:18.09
from
thaJeztah:18.09_backport_attach_to_existing_network_error
Sep 23, 2019
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
cpuguy83
approved these changes
Jun 12, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Janky failed on a flaky; (tracked through moby#38521)
RS1 failed on https://jenkins.dockerproject.org/job/Docker-PRs-WoW-RS1/25585/console, which will be fixed once #263 is merged
|
thaJeztah
force-pushed
the
18.09_backport_attach_to_existing_network_error
branch
from
June 18, 2019 12:36
4e3a9fe
to
073ee4a
Compare
rebased, because #263 was merged |
exp CI failure is a flaky test
|
kolyshkin
approved these changes
Aug 7, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
thaJeztah
force-pushed
the
18.09_backport_attach_to_existing_network_error
branch
from
August 8, 2019 16:13
073ee4a
to
f11f583
Compare
rebased to trigger CI |
retries to attach to a network, it is already connected to Fixes - docker/for-linux#632 Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit 871acb1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit 31e8fcc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.09_backport_attach_to_existing_network_error
branch
from
August 27, 2019 21:57
f11f583
to
a6a3d6c
Compare
rebased again to trigger CI |
thaJeztah
deleted the
18.09_backport_attach_to_existing_network_error
branch
September 23, 2019 17:12
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
backport of moby#39137 for 18.09
fixes docker/for-linux#632
Signed-off-by: Arko Dasgupta arko.dasgupta@docker.com
- What I did
Made sure the Networks context is manipulated in the scenario when a container attempts to attach to an a network it is already connected to
- How I did it
When attaching to a network in
findAndAttachNetwork
make sure you return with an error when that network is already part ofcontainer.NetworkSettings.Networks
- How to verify it
Followed the same steps in the issue and made sure it is resolved
- Description for the changelog
Fix an issue where connecting a container to a network it's already connected to removes its IP address.
- A picture of a cute animal (not mandatory but encouraged)