Make sure docker kill exit with failure in case of error

This commit is contained in:
Guillaume J. Charmes 2013-11-11 09:15:51 -08:00
parent 402a58a75a
commit 8149439d95
No known key found for this signature in database
GPG key ID: B33E4642CB6E3FF3

View file

@ -892,14 +892,17 @@ func (cli *DockerCli) CmdKill(args ...string) error {
return nil
}
failure := []error{}
for _, name := range args {
_, _, err := cli.call("POST", "/containers/"+name+"/kill", nil)
if err != nil {
fmt.Fprintf(cli.err, "%s\n", err)
if _, _, err := cli.call("POST", "/containers/"+name+"/kill", nil); err != nil {
failure = append(failure, err)
} else {
fmt.Fprintf(cli.out, "%s\n", name)
}
}
if len(failure) != 0 {
return fmt.Errorf("Some container failed to get killed: %v\n", failure)
}
return nil
}