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

vendor: github.com/docker/cli v24.0.4 #1959

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Conversation

thaJeztah
Copy link
Member

full diff: docker/cli@v24.0.2...v24.0.4

notable changes:

full diff: docker/cli@v24.0.2...v24.0.4

notable changes:

- ssh: fix error on commandconn close, add ping and default
- commandconn: return original error while closing

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@crazy-max
Copy link
Member

Oups commented on the wrong PR, see #1960 (review)

This hook was added in 278f94a and
72758fe to suppress spurious warnings
printed by the CLI's cli/connhelper/commandconn package;
https://github.com/docker/cli/blob/3fb4fb83dfb5db0c0753a8316f21aea54dab32c5/cli/connhelper/commandconn/commandconn.go#L203-L214

Those logs were removed in docker/cli@a5ebe22
so we can remove the hook.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Comment on lines -55 to -65
// filter out useless commandConn.CloseWrite warning message that can occur
// when listing builder instances with "buildx ls" for those that are
// unreachable: "commandConn.CloseWrite: commandconn: failed to wait: signal: killed"
// https://github.com/docker/cli/blob/3fb4fb83dfb5db0c0753a8316f21aea54dab32c5/cli/connhelper/commandconn/commandconn.go#L203-L214
logrus.AddHook(logutil.NewFilter([]logrus.Level{
logrus.WarnLevel,
},
"commandConn.CloseWrite:",
"commandConn.CloseRead:",
))

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed the hook; #1960 (review)

@crazy-max crazy-max merged commit f5719f3 into docker:master Jul 19, 2023
59 checks passed
@thaJeztah thaJeztah deleted the update_cli branch July 19, 2023 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants