bake: fix printer reset before metadata written

tonistiigi · tonistiigi · commit cc097db675b4 · 2024-07-03T09:54:09.000-07:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/commands/bake.go b/commands/bake.go
@@ -302,7 +302,6 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
 	}
 
 	err = printer.Wait()
-	printer = nil
 	if err != nil {
 		return err
 	}
diff --git a/util/progress/printer.go b/util/progress/printer.go
@@ -19,9 +19,10 @@ import (
 type Printer struct {
 	status chan *client.SolveStatus
 
-	ready  chan struct{}
-	done   chan struct{}
-	paused chan struct{}
+	ready     chan struct{}
+	done      chan struct{}
+	paused    chan struct{}
+	closeOnce sync.Once
 
 	err          error
 	warnings     []client.VertexWarning
@@ -36,8 +37,10 @@ type Printer struct {
 }
 
 func (p *Printer) Wait() error {
-	close(p.status)
-	<-p.done
+	p.closeOnce.Do(func() {
+		close(p.status)
+		<-p.done
+	})
 	return p.err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,6 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`err = printer.Wait()`
`305`		`- printer = nil`
`306`	`305`	`if err != nil {`
`307`	`306`	`return err`
`308`	`307`	`}`