Merge pull request #3708 from creack/fix_run_exit_code

Fix issue with exit code in non-tty mode.
Upstream-commit: 3cb5bc5ae524531e0285661aec5f1542d6d09d51
Component: engine

components/engine/commands.go

@@ -2168,9 +2168,18 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 			return err
 		}
 	} else {
-		// No Autoremove: Simply retrieve the exit code
-		if _, status, err = getExitCode(cli, runResult.ID); err != nil {
-			return err
+		if !config.Tty {
+			// In non-tty mode, we can't dettach, so we know we need to wait.
+			if status, err = waitForExit(cli, runResult.ID); err != nil {
+				return err
+			}
+		} else {
+			// In TTY mode, there is a race. If the process dies too slowly, the state can be update after the getExitCode call
+			// and result in a wrong exit code.
+			// No Autoremove: Simply retrieve the exit code
+			if _, status, err = getExitCode(cli, runResult.ID); err != nil {
+				return err
+			}
 		}
 	}
 	if status != 0 {