Merge pull request #2368 from crazy-max/ansi-color

Enhance ANSI colors for progress ui
moby · Sep 24, 2021 · 1031116 · 1031116
2 parents deb1440 + 165e705
commit 1031116
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/util/progress/progressui/display.go b/util/progress/progressui/display.go
@@ -519,11 +519,11 @@ func (disp *display) print(d displayInfo, width, height int, all bool) {
 
 		out = align(out, timer, width)
 		if j.completedTime != nil {
-			color := aec.BlueF
+			color := colorRun
 			if j.isCanceled {
-				color = aec.YellowF
+				color = colorCancel
 			} else if j.hasError {
-				color = aec.RedF
+				color = colorError
 			}
 			out = aec.Apply(out, color)
 		}

diff --git a/util/progress/progressui/term.go b/util/progress/progressui/term.go
@@ -0,0 +1,12 @@
+//go:build !windows
+// +build !windows
+
+package progressui
+
+import "github.com/morikuni/aec"
+
+var (
+	colorRun    = aec.BlueF
+	colorCancel = aec.YellowF
+	colorError  = aec.RedF
+)
diff --git a/util/progress/progressui/term_windows.go b/util/progress/progressui/term_windows.go
@@ -0,0 +1,12 @@
+//go:build windows
+// +build windows
+
+package progressui
+
+import "github.com/morikuni/aec"
+
+var (
+	colorRun    = aec.CyanF
+	colorCancel = aec.YellowF
+	colorError  = aec.RedF
+)