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] vendor: github.com/moby/libnetwork dcdf8f176d1e13ad719e913e796fb698d846de98 #44476

Merged
merged 1 commit into from Dec 8, 2022
Merged

[20.10] vendor: github.com/moby/libnetwork dcdf8f176d1e13ad719e913e796fb698d846de98 #44476

merged 1 commit into from Dec 8, 2022

Conversation

sbuckfelder
Copy link

@sbuckfelder sbuckfelder commented Nov 16, 2022 •
edited by thaJeztah

Signed-off-by: Scott Buckfelder buckscot@amazon.com

Issue : #44423
fixes #43054

Merges in commit moby/libnetwork#2668 which is a backport of functionality.

Note For Reviewers : I also updated the hack/dockerfile/install/proxy.installer file to now reference moby/libnetwork as opposed to docker/libnetwork. I'm not terribly confident this was the correct thing to do.

neersighted
neersighted requested changes Nov 16, 2022
View reviewed changes
Copy link
Member

@neersighted neersighted left a comment

Choose a reason for hiding this comment

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

Updating repository references is fine, but the import path is still docker/libnetwork and cannot change.

Everything but the git clone needs to revert to the old name.

@neersighted
Copy link
Member

Also, could you please rephrase your commit message to conform to the repo convention for vendoring? e.g. 2570784

@sbuckfelder sbuckfelder changed the title Revert: Added API to set ephemeral port allocator range [20.10] vendor: github.com/moby/libnetwork dcdf8f176d1e13ad719e913e796fb698d846de98 Nov 17, 2022
@sbuckfelder
Copy link
Author

Also, could you please rephrase your commit message to conform to the repo convention for vendoring? e.g. 2570784

Updated in new rev

@sbuckfelder
Copy link
Author

Updating repository references is fine, but the import path is still docker/libnetwork and cannot change.

Everything but the git clone needs to revert to the old name.

I believe I was able to follow this advice in the new rev, please let me know if not.

@neersighted
Copy link
Member

This looks good from a changes made standpoint, but fails the vendoring checks. Did you vendor by hand instead of using vndr?

The result of vndr differs

You should run hack/vendor.sh every time you touch vendoring; fix that and this should be good to go.

@thaJeztah thaJeztah added status/2-code-review area/networking status/failing-ci Indicates that the PR in its current state fails the test suite kind/bugfix PR's that fix bugs labels Nov 17, 2022
@thaJeztah thaJeztah added this to the 20.10.22 milestone Nov 17, 2022
@thaJeztah
[20.10] vendor: github.com/moby/libnetwork dcdf8f176d1e13ad719e913e79…
72b9ba4 
…6fb698d846de98

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Scott Buckfelder <buckscot@amazon.com>
@thaJeztah
Copy link
Member

I amended the commit and ran vendor

thaJeztah
thaJeztah approved these changes Nov 23, 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 (assuming CI is happy)

@thaJeztah thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Nov 23, 2022
@thaJeztah thaJeztah merged commit 6112b23 into moby:20.10 Dec 8, 2022
@thaJeztah thaJeztah mentioned this pull request Dec 8, 2022
Closed
paralin added a commit to skiffos/buildroot that referenced this pull request Jan 13, 2023
@paralin
package/docker-engine: bump version to 20.10.22
f6d2818 
Bug fixes and enhancements

 - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569)
 - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476).
 - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862).
 - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564).

https://github.com/moby/moby/releases/tag/v20.10.22

Signed-off-by: Christian Stewart <christian@paral.in>
paralin added a commit to skiffos/buildroot that referenced this pull request Jan 13, 2023
@paralin
package/docker-engine: bump version to 20.10.22
a69faa7 
Bug fixes and enhancements

 - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569)
 - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476).
 - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862).
 - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564).

https://github.com/moby/moby/releases/tag/v20.10.22

Signed-off-by: Christian Stewart <christian@paral.in>
arnout pushed a commit to buildroot/buildroot that referenced this pull request Jan 14, 2023
@paralin @jacmet
package/docker-engine: bump version to 20.10.22
de51efc 
Bug fixes and enhancements

 - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569)
 - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476).
 - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862).
 - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564).

https://github.com/moby/moby/releases/tag/v20.10.22

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
arnout pushed a commit to buildroot/buildroot that referenced this pull request Jan 15, 2023
@paralin @jacmet
package/docker-engine: bump version to 20.10.22
400edb0 
Bug fixes and enhancements

 - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569)
 - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476).
 - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862).
 - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564).

https://github.com/moby/moby/releases/tag/v20.10.22

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit de51efc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
arnout pushed a commit to buildroot/buildroot that referenced this pull request Jan 15, 2023
@paralin @jacmet
package/docker-engine: bump version to 20.10.22
e4adf41 
Bug fixes and enhancements

 - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569)
 - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476).
 - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862).
 - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564).

https://github.com/moby/moby/releases/tag/v20.10.22

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit de51efc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neersighted neersighted neersighted approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

Assignees
No one assigned
Labels
area/networking kind/bugfix PR's that fix bugs status/2-code-review
Projects
None yet
Milestone
20.10.22
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sbuckfelder @neersighted @thaJeztah