Skip to content

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

Merged
tianon merged 2 commits into
moby:20.10from
ameyag:20.10-win-port-conflict
May 26, 2022
Merged

[20.10 backport] Fix for Windows port conflict with published ports in host mode for overlay.#43644
tianon merged 2 commits into
moby:20.10from
ameyag:20.10-win-port-conflict

Conversation

@ameyag

@ameyag ameyag commented May 25, 2022

Copy link
Copy Markdown
Contributor

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

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@thaJeztah

Copy link
Copy Markdown
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 left a comment

Copy link
Copy Markdown
Member

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
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.

4 participants