From aee9eebf349dd6d8634e4ea7d5624e276c6da0a2 Mon Sep 17 00:00:00 2001 From: Laura Brehm Date: Fri, 29 Nov 2024 16:59:36 +0000 Subject: [PATCH] run: return error code when only STDIN attached During a `docker run`, the CLI has some different behavior/output depending on whether the run is "detached" or not. In some cases, the CLI is checking whether either `stdin`, `stdout` or `stderr` are attached, but in other cases we're only checking `stdout` and `stderr`, which leads to some inconsistencies: ``` $ docker run -a stdout --rm --name test alpine top [docker kill test] exit status 137 $ docker run -a stderr --rm --name test alpine top [docker kill test] exit status 137 $ docker run -a stdin --rm --name test alpine top 56820d94a89b96889478241ae68920323332c6d4cf9b51ba9340cba01e9e0565 [docker kill test] [no exit code] ``` Since we're not checking for whether `stdin` is attached when deciding whether to early exit without receiving on `statusChan`, the `docker run -a stdin` is falling into the "detached mode" logic, which simply prints the container ID and doesn't print/return the exit code. This patch makes the "attached" checks consistent. Signed-off-by: Laura Brehm --- cli/command/container/run.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/command/container/run.go b/cli/command/container/run.go index bb0340ed1b..76369a0c31 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -161,7 +161,8 @@ func runContainer(ctx context.Context, dockerCli command.Cli, runOpts *runOption waitDisplayID chan struct{} errCh chan error ) - if !config.AttachStdout && !config.AttachStderr { + attach := config.AttachStdin || config.AttachStdout || config.AttachStderr + if !attach { // Make this asynchronous to allow the client to write to stdin before having to read the ID waitDisplayID = make(chan struct{}) go func() { @@ -169,7 +170,6 @@ func runContainer(ctx context.Context, dockerCli command.Cli, runOpts *runOption _, _ = fmt.Fprintln(stdout, containerID) }() } - attach := config.AttachStdin || config.AttachStdout || config.AttachStderr if attach { detachKeys := dockerCli.ConfigFile().DetachKeys if runOpts.detachKeys != "" { @@ -234,7 +234,7 @@ func runContainer(ctx context.Context, dockerCli command.Cli, runOpts *runOption } // Detached mode: wait for the id to be displayed and return. - if !config.AttachStdout && !config.AttachStderr { + if !attach { // Detached mode <-waitDisplayID return nil