dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

progressui: allow caller to customise "Building" string

Browse Source 
In clients which are doinging multiple builds or phases it can be useful to say
something more specific here (e.g. "Building first image", "Probing" etc)

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2018-08-08 14:53:04 +01:00
parent 47c4888ab1
commit ccc559bc43
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/buildctl/build.go
View File

@@ -228,7 +228,7 @@ func build(clicontext *cli.Context) error {
}
}
// not using shared context to not disrupt display but let is finish reporting errors
return progressui.DisplaySolveStatus(context.TODO(), c, os.Stdout, displayCh)
return progressui.DisplaySolveStatus(context.TODO(), "", c, os.Stdout, displayCh)
})
return eg.Wait()

2
examples/build-using-dockerfile/main.go
View File

@@ -92,7 +92,7 @@ func action(clicontext *cli.Context) error {
c = cn
}
// not using shared context to not disrupt display but let is finish reporting errors
return progressui.DisplaySolveStatus(context.TODO(), c, os.Stdout, ch)
return progressui.DisplaySolveStatus(context.TODO(), "", c, os.Stdout, ch)
})
eg.Go(func() error {
if err := loadDockerTar(pipeR); err != nil {

11
util/progress/progressui/display.go
View File

@@ -16,13 +16,17 @@ import (
"golang.org/x/time/rate"
)
func DisplaySolveStatus(ctx context.Context, c console.Console, w io.Writer, ch chan *client.SolveStatus) error {
func DisplaySolveStatus(ctx context.Context, phase string, c console.Console, w io.Writer, ch chan *client.SolveStatus) error {
modeConsole := c != nil
disp := &display{c: c}
disp := &display{c: c, phase: phase}
printer := &textMux{w: w}
if disp.phase == "" {
disp.phase = "Building"
}
t := newTrace(w)
var done bool
@@ -323,6 +327,7 @@ func addTime(tm *time.Time, d time.Duration) *time.Time {
type display struct {
c console.Console
phase string
lineCount int
repeated bool
}
@@ -359,7 +364,7 @@ func (disp *display) print(d displayInfo, all bool) {
fmt.Fprint(disp.c, aec.Hide)
defer fmt.Fprint(disp.c, aec.Show)
out := fmt.Sprintf("[+] Building %.1fs (%d/%d) %s", time.Since(d.startTime).Seconds(), d.countCompleted, d.countTotal, statusStr)
out := fmt.Sprintf("[+] %s %.1fs (%d/%d) %s", disp.phase, time.Since(d.startTime).Seconds(), d.countCompleted, d.countTotal, statusStr)
out = align(out, "", width)
fmt.Fprintln(disp.c, out)
lineCount := 0