From 959ffec79b352e5591dde19ffbb183acf1f7a42a Mon Sep 17 00:00:00 2001 From: "Joel D. Elkins" Date: Thu, 21 Jul 2022 17:17:26 -0500 Subject: [PATCH] Add RUNNING column to `ls` output --- cmd/ls.go | 4 ++-- internal/pkg/container/container.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/ls.go b/cmd/ls.go index da16c49..2d1eb5a 100644 --- a/cmd/ls.go +++ b/cmd/ls.go @@ -47,9 +47,9 @@ ccl ls squid`, w := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 4, ' ', 0) defer w.Flush() - fmt.Fprintf(w, "CATEGORY\tNAME\tIMAGE\n") + fmt.Fprintf(w, "CATEGORY\tNAME\tIMAGE\tRUNNING\n") for _, c := range conts { - fmt.Fprintf(w, "%s\t%s\t%s\n", c.Category, c.Name, c.Image) + fmt.Fprintf(w, "%s\t%s\t%s\t%v\n", c.Category, c.Name, c.Image, c.IsRunning()) } }, } diff --git a/internal/pkg/container/container.go b/internal/pkg/container/container.go index f92e242..8d755c4 100644 --- a/internal/pkg/container/container.go +++ b/internal/pkg/container/container.go @@ -85,7 +85,7 @@ func (c *Container) RecreateCommands() []command.Command { wasRunning := false return []command.Command{ command.NewFunc("stash_run_state", func() string { - wasRunning = c.isRunning() + wasRunning = c.IsRunning() runMsg := "not running. Will not start it after recreating." if wasRunning { runMsg = "running. Will restart after recreating." @@ -114,7 +114,7 @@ func (c *Container) StartCommands() []command.Command { } return []command.Command{ command.NewConditional("start_unless_running", - c.isRunning, + c.IsRunning, command.NewNop(), command.NewSet(c.upCommands), ), @@ -129,7 +129,7 @@ func (c *Container) RestartCommands() []command.Command { } } -func (c *Container) isRunning() bool { +func (c *Container) IsRunning() bool { pid, err := c.Pid() if err != nil { return false @@ -141,7 +141,7 @@ func (c *Container) UpdateCommands() []command.Command { wasRunning := false return []command.Command{ command.NewFunc("stash_run_state", func() string { - wasRunning = c.isRunning() + wasRunning = c.IsRunning() runMsg := "not running" if wasRunning { runMsg = "running" @@ -161,7 +161,7 @@ func (c *Container) UpdateCommands() []command.Command { func (c *Container) StopCommands() []command.Command { return []command.Command{ command.NewConditional("stop_if_running", - c.isRunning, + c.IsRunning, command.NewShell("podman stop "+c.Name), command.NewNop(), ),