Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5352 from vvoland/c8d-multiplatform-list-2 

list/tree: Print <untagged> as dangling image name
This commit is contained in:
Paweł Gronowski 2024-08-16 16:56:08 +02:00 committed by GitHub
parent cab8a2e830 351249dce9
commit 8675f4c177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/command/image/tree.go
View File

@ -123,12 +123,14 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
topNameColor := aec.NewBuilder(aec.BlueF, aec.Underline, aec.Bold).ANSI topNameColor := aec.NewBuilder(aec.BlueF, aec.Underline, aec.Bold).ANSI
normalColor := aec.NewBuilder(aec.DefaultF).ANSI normalColor := aec.NewBuilder(aec.DefaultF).ANSI
greenColor := aec.NewBuilder(aec.GreenF).ANSI greenColor := aec.NewBuilder(aec.GreenF).ANSI
untaggedColor := aec.NewBuilder(aec.Faint).ANSI
if !out.IsTerminal() { if !out.IsTerminal() {
headerColor = noColor{} headerColor = noColor{}
topNameColor = noColor{} topNameColor = noColor{}
normalColor = noColor{} normalColor = noColor{}
greenColor = noColor{} greenColor = noColor{}
warningColor = noColor{} warningColor = noColor{}
untaggedColor = noColor{}
} }
_, _ = fmt.Fprintln(out, warningColor.Apply("WARNING: This is an experimental feature. The output may change and shouldn't be depended on.")) _, _ = fmt.Fprintln(out, warningColor.Apply("WARNING: This is an experimental feature. The output may change and shouldn't be depended on."))
@ -216,7 +218,7 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
// Print images // Print images
for _, img := range images { for _, img := range images {
_, _ = fmt.Fprintln(out, "") _, _ = fmt.Fprintln(out, "")
printNames(out, columns, img, topNameColor) printNames(out, columns, img, topNameColor, untaggedColor)
printDetails(out, columns, normalColor, img.Details) printDetails(out, columns, normalColor, img.Details)
printChildren(out, columns, img, normalColor) printChildren(out, columns, img, normalColor)
} }
@ -258,7 +260,11 @@ func printChildren(out *streams.Out, headers []imgColumn, img topImage, normalCo
} }
} }
func printNames(out *streams.Out, headers []imgColumn, img topImage, color aec.ANSI) { func printNames(out *streams.Out, headers []imgColumn, img topImage, color, untaggedColor aec.ANSI) {
if len(img.Names) == 0 {
_, _ = fmt.Fprint(out, headers[0].Print(untaggedColor, "<untagged>"))
}
for nameIdx, name := range img.Names { for nameIdx, name := range img.Names {
if nameIdx != 0 { if nameIdx != 0 {
_, _ = fmt.Fprintln(out, "") _, _ = fmt.Fprintln(out, "")
@ -338,8 +344,8 @@ func (h imgColumn) PrintR(clr aec.ANSI, s string) string {
type noColor struct{} type noColor struct{}
func (a noColor) With(ansi ...aec.ANSI) aec.ANSI { func (a noColor) With(_ ...aec.ANSI) aec.ANSI {
return aec.NewBuilder(ansi...).ANSI return a
} }
func (a noColor) Apply(s string) string { func (a noColor) Apply(s string) string {