Return container exit code with start -a/-i

estesp · estesp · commit 65edb07065e9 · 2014-10-18T23:00:20.000-04:00
Addresses moby#8555 Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
diff --git a/api/client/commands.go b/api/client/commands.go
@@ -619,13 +619,13 @@ func (cli *DockerCli) CmdStart(args ...string) error {
 			return fmt.Errorf("You cannot start and attach multiple containers at once.")
 		}
 
-		steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
+		stream, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)
 		if err != nil {
 			return err
 		}
 
 		env := engine.Env{}
-		if err := env.Decode(steam); err != nil {
+		if err := env.Decode(stream); err != nil {
 			return err
 		}
 		config := env.GetSubEnv("Config")
@@ -681,7 +681,16 @@ func (cli *DockerCli) CmdStart(args ...string) error {
 				log.Errorf("Error monitoring TTY size: %s", err)
 			}
 		}
-		return <-cErr
+		if attchErr := <-cErr; attchErr != nil {
+			return attchErr
+		}
+		_, status, err := getExitCode(cli, cmd.Arg(0))
+		if err != nil {
+			return err
+		}
+		if status != 0 {
+			return &utils.StatusError{StatusCode: status}
+		}
 	}
 	return nil
 }
diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go
@@ -1,7 +1,9 @@
 package main
 
 import (
+	"fmt"
 	"os/exec"
+	"strings"
 	"testing"
 	"time"
 )
@@ -36,3 +38,33 @@ func TestStartAttachReturnsOnError(t *testing.T) {
 
 	logDone("start - error on start with attach exits")
 }
+
+// gh#8555: Exit code should be passed through when using start -a
+func TestStartAttachCorrectExitCode(t *testing.T) {
+	defer deleteAllContainers()
+
+	runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", "sleep 2; exit 1")
+	out, _, _, err := runCommandWithStdoutStderr(runCmd)
+	if err != nil {
+		t.Fatalf("failed to run container: %v, output: %q", err, out)
+	}
+
+	out = stripTrailingCharacters(out)
+
+	// make sure the container has exited before trying the "start -a"
+	waitCmd := exec.Command(dockerBinary, "wait", out)
+	if out, _, err = runCommandWithOutput(waitCmd); err != nil {
+		t.Fatal(out, err)
+	}
+
+	startCmd := exec.Command(dockerBinary, "start", "-a", out)
+	startOut, exitCode, err := runCommandWithOutput(startCmd)
+	if err != nil && !strings.Contains("exit status 1", fmt.Sprintf("%s", err)) {
+		t.Fatalf("start command failed unexpectedly with error: %v, output: %q", err, startOut)
+	}
+	if exitCode != 1 {
+		t.Fatalf("start -a did not respond with proper exit code: expected 1, got %d", exitCode)
+	}
+
+	logDone("start - correct exit code returned with -a")
+}

Original file line number	Diff line number	Diff line change
`@@ -619,13 +619,13 @@ func (cli *DockerCli) CmdStart(args ...string) error {`
`619`	`619`	`return fmt.Errorf("You cannot start and attach multiple containers at once.")`
`620`	`620`	`}`
`621`	`621`
`622`		`- steam, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)`
	`622`	`+ stream, _, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, false)`
`623`	`623`	`if err != nil {`
`624`	`624`	`return err`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`env := engine.Env{}`
`628`		`- if err := env.Decode(steam); err != nil {`
	`628`	`+ if err := env.Decode(stream); err != nil {`
`629`	`629`	`return err`
`630`	`630`	`}`
`631`	`631`	`config := env.GetSubEnv("Config")`
`@@ -681,7 +681,16 @@ func (cli *DockerCli) CmdStart(args ...string) error {`
`681`	`681`	`log.Errorf("Error monitoring TTY size: %s", err)`
`682`	`682`	`}`
`683`	`683`	`}`
`684`		`- return <-cErr`
	`684`	`+ if attchErr := <-cErr; attchErr != nil {`
	`685`	`+ return attchErr`
	`686`	`+ }`
	`687`	`+ _, status, err := getExitCode(cli, cmd.Arg(0))`
	`688`	`+ if err != nil {`
	`689`	`+ return err`
	`690`	`+ }`
	`691`	`+ if status != 0 {`
	`692`	`+ return &utils.StatusError{StatusCode: status}`
	`693`	`+ }`
`685`	`694`	`}`
`686`	`695`	`return nil`
`687`	`696`	`}`