Skip to content

Print message if container is not running. #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Dec 14, 2020
+3 −2
Merged

Print message if container is not running. #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions kill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func killAction(clicontext *cli.Context) error {
argIDs := clicontext.Args().Slice()

return idutil.WalkContainers(ctx, client, argIDs, func(ctx context.Context, client *containerd.Client, shortID, ID string) error {
if err := killContainer(ctx, client, shortID, ID, signal); err != nil {
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
Expand All @@ -83,7 +83,7 @@ func killAction(clicontext *cli.Context) error {
})
}

func killContainer(ctx context.Context, client *containerd.Client, shortID, id string, signal syscall.Signal) error {
func killContainer(ctx context.Context, clicontext *cli.Context, client *containerd.Client, shortID, id string, signal syscall.Signal) error {
container, err := client.LoadContainer(ctx, id)
if err != nil {
return err
Expand All @@ -103,6 +103,7 @@ func killContainer(ctx context.Context, client *containerd.Client, shortID, id s

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
case containerd.Paused, containerd.Pausing:
paused = true
Expand Down