docker
/
buildx
mirror of https://github.com/docker/buildx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bake: fix printer reset before metadata written 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2024-06-28 18:21:19 -07:00
parent 35313e865f
commit cc097db675
No known key found for this signature in database
GPG Key ID: AFA9DE5F8AB7AF39
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
commands/bake.go
View File

@ -302,7 +302,6 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
} }
err = printer.Wait() err = printer.Wait()
printer = nil
if err != nil { if err != nil {
return err return err
} }

13
util/progress/printer.go
View File

@ -19,9 +19,10 @@ import (
type Printer struct { type Printer struct {
status chan *client.SolveStatus status chan *client.SolveStatus
ready chan struct{} ready chan struct{}
done chan struct{} done chan struct{}
paused chan struct{} paused chan struct{}
closeOnce sync.Once
err error err error
warnings []client.VertexWarning warnings []client.VertexWarning
@ -36,8 +37,10 @@ type Printer struct {
} }
func (p *Printer) Wait() error { func (p *Printer) Wait() error {
close(p.status) p.closeOnce.Do(func() {
<-p.done close(p.status)
<-p.done
})
return p.err return p.err
} }