From 7d2d94fc6dbb3210b58b21c205dc8a41775ba108 Mon Sep 17 00:00:00 2001 From: Shishir Mahajan Date: Fri, 18 Dec 2020 17:25:42 +0000 Subject: [PATCH] exit(1) when killing a stopped/unknown container Signed-off-by: Shishir Mahajan --- kill.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kill.go b/kill.go index 66ae2ce2f0d..aebd113e7c7 100644 --- a/kill.go +++ b/kill.go @@ -20,6 +20,7 @@ package main import ( "context" "fmt" + "os" "strings" "syscall" @@ -74,7 +75,7 @@ func killAction(clicontext *cli.Context) error { if err := killContainer(ctx, clicontext, client, shortID, ID, signal); err != nil { if errdefs.IsNotFound(err) { fmt.Fprintf(clicontext.App.ErrWriter, "Error response from daemon: Cannot kill container: %s: No such container: %s\n", shortID, shortID) - return nil + os.Exit(1) } return err } @@ -104,7 +105,7 @@ func killContainer(ctx context.Context, clicontext *cli.Context, client *contain switch status.Status { case containerd.Created, containerd.Stopped: fmt.Fprintf(clicontext.App.ErrWriter, "Error response from daemon: Cannot kill container: %s: Container %s is not running\n", shortID, shortID) - return nil + os.Exit(1) case containerd.Paused, containerd.Pausing: paused = true default: