clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8661 from estesp/8555-start-exit-code

Browse Source 
Return container exit code with start -a/-i
This commit is contained in:
Michael Crosby
2014-10-21 16:22:15 -07:00
parent a07ee0db62 65edb07065
commit 95d1cd0bde
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/commands.go
+12 -3
View File
@@ -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
}