Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.10 backport] Fix for Windows port conflict with published ports in host mode for overlay. #43644

Merged
merged 2 commits into from May 26, 2022

Conversation

ameyag
Copy link
Contributor

@ameyag ameyag commented May 25, 2022

Backporting: #43634

Vendoring libnetwork for moby/libnetwork#2658
Full libnetwork diff:
moby/libnetwork@339b972...2dab562

Vendoring moby branch hcsshim for microsoft/hcsshim#1371
Full hcsshim diff: microsoft/hcsshim@64a2b71...a11a2c4

ameyag added 2 commits May 25, 2022
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
Copy link
Member

@thaJeztah thaJeztah left a comment

LGTM

@thaJeztah
Copy link
Member

thaJeztah commented May 26, 2022

Hmm.. looks like this test may be flaky (on Windows); posting as a comment to keep an eye on that one

=== RUN   TestExecWithCloseStdin
    exec_test.go:76: failed to read the content in time
--- FAIL: TestExecWithCloseStdin (16.60s)

I kicked CI again

tianon
tianon approved these changes May 26, 2022
@tianon tianon merged commit 90033ab into moby:20.10 May 26, 2022
2 checks passed
Copy link
Member

@cpuguy83 cpuguy83 left a comment

LGTM

@ameyag ameyag deleted the 20.10-win-port-conflict branch May 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants