Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

list/tree: Print <untagged> as dangling image name #5352

Merged
merged 2 commits into from
Aug 16, 2024
Merged

list/tree: Print <untagged> as dangling image name #5352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6979ab0
list/tree: Fix some escape codes included in nonTTY
vvoland Aug 16, 2024
351249d
list/tree: Print <untagged> as dangling image name
vvoland Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions cli/command/image/tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,14 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
topNameColor := aec.NewBuilder(aec.BlueF, aec.Underline, aec.Bold).ANSI
normalColor := aec.NewBuilder(aec.DefaultF).ANSI
greenColor := aec.NewBuilder(aec.GreenF).ANSI
untaggedColor := aec.NewBuilder(aec.Faint).ANSI
if !out.IsTerminal() {
headerColor = noColor{}
topNameColor = noColor{}
normalColor = noColor{}
greenColor = 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."))
Expand Down Expand Up @@ -216,7 +218,7 @@ func printImageTree(dockerCLI command.Cli, images []topImage) error {
// Print images
for _, img := range images {
_, _ = fmt.Fprintln(out, "")
printNames(out, columns, img, topNameColor)
printNames(out, columns, img, topNameColor, untaggedColor)
printDetails(out, columns, normalColor, img.Details)
printChildren(out, columns, img, normalColor)
}
Expand Down Expand Up @@ -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 {
if nameIdx != 0 {
_, _ = fmt.Fprintln(out, "")
Expand Down Expand Up @@ -338,8 +344,8 @@ func (h imgColumn) PrintR(clr aec.ANSI, s string) string {

type noColor struct{}

func (a noColor) With(ansi ...aec.ANSI) aec.ANSI {
return aec.NewBuilder(ansi...).ANSI
func (a noColor) With(_ ...aec.ANSI) aec.ANSI {
return a
}

func (a noColor) Apply(s string) string {
Expand Down
Loading