diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-30 17:00:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 17:00:22 +0100 |
| commit | e632f3f2588d00184a50a7328d54a31ccf973708 (patch) | |
| tree | e7fb78c6ae6c81a77aac78015e7a0421de6d552c /cmd/podman/images/list.go | |
| parent | 6b5a94cf2831df0633cc03a28f432177c0ee1d7b (diff) | |
| parent | d60a0ddcc1784b2dd807cc8e4d4f3deb0c074171 (diff) | |
| download | podman-e632f3f2588d00184a50a7328d54a31ccf973708.tar.gz podman-e632f3f2588d00184a50a7328d54a31ccf973708.tar.bz2 podman-e632f3f2588d00184a50a7328d54a31ccf973708.zip | |
Merge pull request #8187 from jwhonce/wip/table
Restore --format table header support
Diffstat (limited to 'cmd/podman/images/list.go')
| -rw-r--r-- | cmd/podman/images/list.go | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 489b15086..e24631b24 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -12,6 +12,7 @@ import ( "github.com/containers/common/pkg/report" "github.com/containers/image/v5/docker/reference" + "github.com/containers/podman/v2/cmd/podman/parse" "github.com/containers/podman/v2/cmd/podman/registry" "github.com/containers/podman/v2/pkg/domain/entities" "github.com/docker/go-units" @@ -105,10 +106,10 @@ func images(cmd *cobra.Command, args []string) error { return err } switch { - case listFlag.quiet: - return writeID(imgs) case report.IsJSON(listFlag.format): return writeJSON(imgs) + case listFlag.quiet: + return writeID(imgs) default: if cmd.Flag("format").Changed { listFlag.noHeading = true // V1 compatibility @@ -171,9 +172,13 @@ func writeTemplate(imgs []imageReporter) error { } else { row = report.NormalizeFormat(listFlag.format) } + format := parse.EnforceRange(row) + + tmpl, err := template.New("list").Parse(format) + if err != nil { + return err + } - format := "{{range . }}" + row + "{{end}}" - tmpl := template.Must(template.New("list").Parse(format)) w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) defer w.Flush() |