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

Jump to bottom

[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
Merged

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

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
vendor: libnetwork 2dab5620d4462865c6151e573b3e7fa5d3b8458b
27f8322 
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
@ameyag
vendor: hcsshim a11a2c44e8a4aa9d66314b1d759ef582df5ab5e8
87ead7f 
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
@ameyag ameyag requested a review from tianon as a code owner May 25, 2022 22:40
@thaJeztah thaJeztah added this to the 20.10.17 milestone May 25, 2022
thaJeztah
thaJeztah approved these changes May 25, 2022
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

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 merged commit 90033ab into moby:20.10 May 26, 2022
cpuguy83
cpuguy83 approved these changes May 26, 2022
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ameyag ameyag deleted the 20.10-win-port-conflict branch May 26, 2022 18:38
@breakings breakings mentioned this pull request Jun 8, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tianon tianon tianon approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees
No one assigned
Labels
area/networking platform/windows status/2-code-review
Projects
None yet
Milestone
20.10.17
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ameyag @thaJeztah @tianon @cpuguy83