Skip to content

cli: print command errors before next-step hooks #7175

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.

Sign up for GitHub

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

Open
locker95 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −0
Open

cli: print command errors before next-step hooks #7175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions cmd/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,18 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
if err != nil || pluginmanager.IsPluginCommand(ccmd) {
err := tryPluginRun(ctx, dockerCli, cmd, args[0], envs)
if ccmd != nil && dockerCli.Out().IsTerminal() && dockerCli.HooksEnabled() && !errdefs.IsNotFound(err) {
// Print failure before next-step hints so they appear after the error.
if err != nil {
if msg := err.Error(); msg != "" {
_, _ = fmt.Fprintln(dockerCli.Err(), err)
}
}
errMessage := cmdErrorMessage(err)
pluginmanager.RunPluginHooks(ctx, dockerCli, cmd, ccmd, args, errMessage)
if err != nil {
// Already printed; keep exit code without a second print in main.
return cli.StatusError{StatusCode: getExitCode(err)}
}
}
if err == nil {
return nil
Expand All @@ -546,7 +556,18 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
// If the command is being executed in an interactive terminal
// and hook are enabled, run the plugin hooks.
if subCommand != nil && dockerCli.Out().IsTerminal() && dockerCli.HooksEnabled() {
// Print the command error before next-step hints. main() would
// otherwise print the error after hooks return (issue #6973).
if err != nil {
if msg := err.Error(); msg != "" {
_, _ = fmt.Fprintln(dockerCli.Err(), err)
}
}
pluginmanager.RunCLICommandHooks(ctx, dockerCli, cmd, subCommand, cmdErrorMessage(err))
if err != nil {
// Already printed; keep exit code without a second print in main.
return cli.StatusError{StatusCode: getExitCode(err)}
}
}

return err
Expand Down