containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5748 from baude/v2imageformat 

podmanv2 images user format
This commit is contained in:
OpenShift Merge Robot 2020-04-09 03:00:40 +02:00 committed by GitHub
parent f71e4d3d3e 90884ac2d2
commit 1229350377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/podmanV2/images/list.go
View File

@ -130,6 +130,9 @@ func writeJSON(imageS []*entities.ImageSummary) error {
} }
func writeTemplate(imageS []*entities.ImageSummary, err error) error { func writeTemplate(imageS []*entities.ImageSummary, err error) error {
var (
hdr, row string
)
type image struct { type image struct {
entities.ImageSummary entities.ImageSummary
Repository string `json:"repository,omitempty"` Repository string `json:"repository,omitempty"`
@ -148,10 +151,15 @@ func writeTemplate(imageS []*entities.ImageSummary, err error) error {
listFlag.readOnly = true listFlag.readOnly = true
} }
} }
if len(listFlag.format) < 1 {
hdr, row := imageListFormat(listFlag) hdr, row = imageListFormat(listFlag)
} else {
row = listFlag.format
if !strings.HasSuffix(row, "\n") {
row += "\n"
}
}
format := hdr + "{{range . }}" + row + "{{end}}" format := hdr + "{{range . }}" + row + "{{end}}"
tmpl := template.Must(template.New("list").Funcs(report.PodmanTemplateFuncs()).Parse(format)) tmpl := template.Must(template.New("list").Funcs(report.PodmanTemplateFuncs()).Parse(format))
w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
defer w.Flush() defer w.Flush()