From a52e1003c49fddd442cc9137985e18a931427550 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Mon, 11 Nov 2013 09:15:51 -0800 Subject: [PATCH] Make sure docker kill exit with failure in case of error Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0 Component: engine --- components/engine/commands.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index 12cc713654..e00e251b1e 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -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 }