From a5107b7eb062ea0d405c531eba30170b37e1c32a Mon Sep 17 00:00:00 2001 From: Hu Keping Date: Wed, 8 Jul 2015 04:10:29 +0800 Subject: [PATCH] Format the output of docker history Once there have '\t' in the "CREATED BY" section, it will possibly cause a messy output of docker history. Signed-off-by: Hu Keping Upstream-commit: 6353f3a7b58fe7ef1cb33660003c1d7205f2e6c0 Component: engine --- components/engine/api/client/history.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/api/client/history.go b/components/engine/api/client/history.go index 925add6640..2c443efd3c 100644 --- a/components/engine/api/client/history.go +++ b/components/engine/api/client/history.go @@ -3,6 +3,7 @@ package client import ( "encoding/json" "fmt" + "strings" "text/tabwriter" "time" @@ -57,9 +58,9 @@ func (cli *DockerCli) CmdHistory(args ...string) error { } if *noTrunc { - fmt.Fprintf(w, "%s\t", entry.CreatedBy) + fmt.Fprintf(w, "%s\t", strings.Replace(entry.CreatedBy, "\t", " ", -1)) } else { - fmt.Fprintf(w, "%s\t", stringutils.Truncate(entry.CreatedBy, 45)) + fmt.Fprintf(w, "%s\t", stringutils.Truncate(strings.Replace(entry.CreatedBy, "\t", " ", -1), 45)) } if *human {