bake: fix printer reset before metadata written

Signed-off-by: Tonis Tiigi <[email protected]>
docker · Jun 29, 2024 · 5d97a08 · 5d97a08
1 parent bbb9721
commit 5d97a08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/commands/bake.go b/commands/bake.go
@@ -298,7 +298,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
 }