Skip to content

cmd/docker: print command error before running plugin hooks #6976

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
olabie2 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

cmd/docker: print command error before running plugin hooks #6976

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
16 changes: 15 additions & 1 deletion cmd/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,24 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
cmd.SetArgs(args)
err = cmd.ExecuteContext(ctx)

// Capture the error message before we may consume the error below;
// plugin hooks still need to see the original message.
errMessage := cmdErrorMessage(err)

// Print the command's error before invoking plugin hooks so that the
// "What's next" hint (and any other hook output) is rendered after
// the command's error output, not before it.
if err != nil && !errdefs.IsCanceled(err) && !errors.As(err, &errCtxSignalTerminated{}) && err.Error() != "" {
_, _ = fmt.Fprintln(dockerCli.Err(), err)
// Replace the error with a status-only one so that main()
// does not print the same message a second time.
err = cli.StatusError{StatusCode: getExitCode(err)}
}

// 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() {
pluginmanager.RunCLICommandHooks(ctx, dockerCli, cmd, subCommand, cmdErrorMessage(err))
pluginmanager.RunCLICommandHooks(ctx, dockerCli, cmd, subCommand, errMessage)
}

return err
Expand Down
Loading