Don't print "context canceled" if user terminated

Without breaking API compatibility, this patch allows us to know whether a returned `cli/StatusError` was caused by a context cancellation or not, which we can use to provide a nicer UX and not print the Go "context canceled" error message if this is the cause. Signed-off-by: Laura Brehm <[email protected]>
docker · Jan 29, 2025 · e98f488 · e98f488
1 parent bdd70c1
commit e98f488
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/cli/command/container/run.go b/cli/command/container/run.go
@@ -324,19 +324,22 @@ 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,
 		}
 	}
 
 	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/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
 }
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -30,7 +30,7 @@ import (
 
 func main() {
 	err := dockerMain(context.Background())
-	if err != nil && !errdefs.IsCancelled(err) {
+	if err != nil && !errdefs.IsCancelled(err) && !errors.Is(err, context.Canceled) {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 		os.Exit(getExitCode(err))
 	}