Skip to content

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

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

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

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
15 changes: 14 additions & 1 deletion cmd/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,20 @@ 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() {
pluginmanager.RunCLICommandHooks(ctx, dockerCli, cmd, subCommand, cmdErrorMessage(err))
errMessage := cmdErrorMessage(err)

// If the command produced an error that has yet to be printed,
// print it before running hooks, so that hook output (such as
// "What's next" hints) is shown after the error message instead
// of before it. The error is replaced with a silent error that
// only carries the exit-code, so that main does not print the
// error a second time.
if err != nil && !errdefs.IsCanceled(err) && err.Error() != "" {
_, _ = fmt.Fprintln(dockerCli.Err(), err)
err = cli.StatusError{StatusCode: getExitCode(err)}
}

pluginmanager.RunCLICommandHooks(ctx, dockerCli, cmd, subCommand, errMessage)
}

return err
Expand Down