diff --git a/cli/command/container/run.go b/cli/command/container/run.go index 5ef3e8b7bf..ac780533bf 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -324,6 +324,7 @@ func toStatusError(err error) error { if strings.Contains(errMsg, "executable file not found") || strings.Contains(errMsg, "no such file or directory") || strings.Contains(errMsg, "system cannot find the file specified") { return cli.StatusError{ + Cause: err, Status: withHelp(err, "run").Error(), StatusCode: 127, } @@ -331,12 +332,14 @@ func toStatusError(err error) error { if strings.Contains(errMsg, syscall.EACCES.Error()) || strings.Contains(errMsg, syscall.EISDIR.Error()) { return cli.StatusError{ + Cause: err, Status: withHelp(err, "run").Error(), StatusCode: 126, } } return cli.StatusError{ + Cause: err, Status: withHelp(err, "run").Error(), StatusCode: 125, } diff --git a/cli/command/container/run_test.go b/cli/command/container/run_test.go index 4c2ced4f56..9704c8a042 100644 --- a/cli/command/container/run_test.go +++ b/cli/command/container/run_test.go @@ -290,6 +290,7 @@ func TestRunPullTermination(t *testing.T) { select { case cmdErr := <-cmdErrC: assert.Equal(t, cmdErr, cli.StatusError{ + Cause: context.Canceled, StatusCode: 125, Status: "docker: context canceled\n\nRun 'docker run --help' for more information", }) diff --git a/cli/error.go b/cli/error.go index 8c4a5f952b..1d35b4e77d 100644 --- a/cli/error.go +++ b/cli/error.go @@ -6,6 +6,7 @@ import ( // StatusError reports an unsuccessful exit by a command. type StatusError struct { + Cause error Status string StatusCode int } @@ -14,8 +15,15 @@ type StatusError struct { // it is returned as-is, otherwise it generates a generic error-message // based on the StatusCode. func (e StatusError) Error() string { - if e.Status == "" { - return "exit status " + strconv.Itoa(e.StatusCode) + if e.Status != "" { + return e.Status } - return e.Status + if e.Cause != nil { + return e.Cause.Error() + } + return "exit status " + strconv.Itoa(e.StatusCode) +} + +func (e StatusError) Unwrap() error { + return e.Cause }