docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Separate io.Writer from console.File for NewPrinter

Browse Source 
Signed-off-by: Edgar Lee <edgarl@netflix.com>
This commit is contained in:
Edgar Lee 2022-02-05 13:57:33 -08:00
parent 595285736c
commit 2d7540fb0a
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/bake.go
View File

@ -76,7 +76,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
ctx2, cancel := context.WithCancel(context.TODO()) ctx2, cancel := context.WithCancel(context.TODO())
defer cancel() defer cancel()
printer := progress.NewPrinter(ctx2, os.Stderr, in.progress) printer := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
defer func() { defer func() {
if printer != nil { if printer != nil {

2
commands/build.go
View File

@ -239,7 +239,7 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, opts map[string]bu
ctx2, cancel := context.WithCancel(context.TODO()) ctx2, cancel := context.WithCancel(context.TODO())
defer cancel() defer cancel()
printer := progress.NewPrinter(ctx2, os.Stderr, progressMode) printer := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
resp, err := build.Build(ctx, dis, opts, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer) resp, err := build.Build(ctx, dis, opts, dockerAPI(dockerCli), confutil.ConfigDir(dockerCli), printer)
err1 := printer.Wait() err1 := printer.Wait()

2
commands/util.go
View File

@ -414,7 +414,7 @@ func boot(ctx context.Context, ngi *nginfo) (bool, error) {
return false, nil return false, nil
} }
printer := progress.NewPrinter(context.TODO(), os.Stderr, "auto") printer := progress.NewPrinter(context.TODO(), os.Stderr, os.Stderr, "auto")
baseCtx := ctx baseCtx := ctx
eg, _ := errgroup.WithContext(ctx) eg, _ := errgroup.WithContext(ctx)

3
util/progress/printer.go
View File

@ -41,7 +41,7 @@ func (p *Printer) Warnings() []client.VertexWarning {
return p.warnings return p.warnings
} }
func NewPrinter(ctx context.Context, out console.File, mode string) *Printer { func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string) *Printer {
statusCh := make(chan *client.SolveStatus) statusCh := make(chan *client.SolveStatus)
doneCh := make(chan struct{}) doneCh := make(chan struct{})
@ -56,7 +56,6 @@ func NewPrinter(ctx context.Context, out console.File, mode string) *Printer {
go func() { go func() {
var c console.Console var c console.Console
var w io.Writer = out
switch mode { switch mode {
case PrinterModeQuiet: case PrinterModeQuiet:
w = ioutil.Discard w = ioutil.Discard