1 files changed, 24 insertions, 7 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 49e77abd2..82434e9cc 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -18,6 +18,7 @@ import (
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -47,7 +48,10 @@ func init() {
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: psCommand,
 	})
-	flags := psCommand.Flags()
+	listFlagSet(psCommand.Flags())
+}
+
+func listFlagSet(flags *pflag.FlagSet) {
 	flags.BoolVarP(&listOpts.All, "all", "a", false, "Show all the containers, default is only running containers")
 	flags.StringSliceVarP(&filters, "filter", "f", []string{}, "Filter output based on conditions given")
 	flags.StringVar(&listOpts.Format, "format", "", "Pretty-print containers to JSON or using a Go template")
@@ -165,14 +169,14 @@ func ps(cmd *cobra.Command, args []string) error {
 		responses = append(responses, psReporter{r})
 	}
 
-	headers, row := createPsOut()
+	headers, format := createPsOut()
 	if cmd.Flag("format").Changed {
-		row = listOpts.Format
-		if !strings.HasPrefix(row, "\n") {
-			row += "\n"
+		format = listOpts.Format
+		if !strings.HasPrefix(format, "\n") {
+			format += "\n"
 		}
 	}
-	format := "{{range . }}" + row + "{{end}}"
+	format = "{{range . }}" + format + "{{end}}"
 	if !listOpts.Quiet && !cmd.Flag("format").Changed {
 		format = headers + format
 	}
@@ -223,7 +227,7 @@ func createPsOut() (string, string) {
 	}
 	headers := defaultHeaders
 	row += "{{.ID}}"
-	row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.State}}\t{{.Ports}}\t{{.Names}}"
+	row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
 
 	if listOpts.Pod {
 		headers += "\tPOD ID\tPODNAME"
@@ -247,6 +251,14 @@ type psReporter struct {
 	entities.ListContainer
 }
 
+// ImageID returns the ID of the container
+func (l psReporter) ImageID() string {
+	if !noTrunc {
+		return l.ListContainer.ImageID[0:12]
+	}
+	return l.ListContainer.ImageID
+}
+
 // ID returns the ID of the container
 func (l psReporter) ID() string {
 	if !noTrunc {
@@ -282,6 +294,11 @@ func (l psReporter) State() string {
 	return state
 }
 
+// Status is a synonym for State()
+func (l psReporter) Status() string {
+	return l.State()
+}
+
 // Command returns the container command in string format
 func (l psReporter) Command() string {
 	return strings.Join(l.ListContainer.Command, " ")