feat: upload boot and load vertices to depot

Signed-off-by: Chris Goller <[email protected]>

pkg/buildx/commands/bake.go

@@ -52,7 +52,13 @@ func RunBake(dockerCli command.Cli, in BakeOptions, validator BakeValidator) (er
 
 	ctx2, cancel := context.WithCancel(context.TODO())
 
-	printer, finish, err := depotprogress.NewProgress(ctx2, in.buildID, in.token, depotprogress.NewProgressMode(in.progress))
+	buildxprinter, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, in.progress)
+	if err != nil {
+		cancel()
+		return err
+	}
+
+	printer, finish, err := depotprogress.NewProgress(ctx2, in.buildID, in.token, depotprogress.NewProgressMode(in.progress), buildxprinter)
 	if err != nil {
 		cancel()
 		return err

pkg/buildx/commands/build.go

@@ -200,7 +200,13 @@ func (c nopCloser) Close() error { return nil }
 func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.Node, opts map[string]build.Options, depotOpts DepotOptions, progressMode, metadataFile string, exportLoad, allowNoOutput bool) (imageIDs []string, res *build.ResultContext, err error) {
 	ctx2, cancel := context.WithCancel(context.TODO())
 
-	printer, finish, err := depotprogress.NewProgress(ctx2, depotOpts.buildID, depotOpts.token, depotprogress.NewProgressMode(progressMode))
+	buildxprinter, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode)
+	if err != nil {
+		cancel()
+		return nil, nil, err
+	}
+
+	printer, finish, err := depotprogress.NewProgress(ctx2, depotOpts.buildID, depotOpts.token, depotprogress.NewProgressMode(progressMode), buildxprinter)
 	if err != nil {
 		cancel()
 		return nil, nil, err
@@ -267,7 +273,7 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.No
 	linter := NewLinter(NewLintFailureMode(depotOpts.lint, depotOpts.lintFailOn), clients, buildxNodes)
 	dockerfileHandlers := depotbuild.NewDockerfileHandlers(uploader, linter)
 
-	resp, err := depotbuild.DepotBuildWithResultHandler(ctx, buildxNodes, opts, dockerClient, dockerConfigDir, printer, dockerfileHandlers, func(driverIndex int, gotRes *build.ResultContext) {
+	resp, err := depotbuild.DepotBuildWithResultHandler(ctx, buildxNodes, opts, dockerClient, dockerConfigDir, buildxprinter, dockerfileHandlers, func(driverIndex int, gotRes *build.ResultContext) {
 		mu.Lock()
 		defer mu.Unlock()
 		if res == nil || driverIndex < idx {

pkg/cmd/buildctl/dial-stdio.go

@@ -19,6 +19,7 @@ import (
 	"github.com/depot/cli/pkg/machine"
 	"github.com/depot/cli/pkg/progress"
 	cliv1 "github.com/depot/cli/pkg/proto/depot/cli/v1"
+	buildxprogress "github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 	"github.com/spf13/cobra"
 )
@@ -141,7 +142,15 @@ func run() error {
 
 			ctx2 := context.TODO()
 			ctx2, cancelStatus = context.WithCancel(ctx2)
-			state.Reporter, finishStatus, _ = progress.NewProgress(ctx2, build.ID, build.Token, progress.Quiet)
+
+			buildxprinter, err := buildxprogress.NewPrinter(ctx2, os.Stderr, os.Stderr, "quiet")
+			if err != nil {
+				state.Err = fmt.Errorf("unable to create buildx printer: %w", err)
+				cancel()
+				return
+			}
+
+			state.Reporter, finishStatus, _ = progress.NewProgress(ctx2, build.ID, build.Token, progress.Quiet, buildxprinter)
 			state.Reporter.AddListener(listener)
 
 			state.SummaryURL = build.BuildURL

pkg/progress/progress.go

@@ -2,7 +2,6 @@ package progress
 
 import (
 	"context"
-	"os"
 	"sort"
 	"strings"
 	"sync"
@@ -50,13 +49,9 @@ type Listener func(s *client.SolveStatus)
 // Use the ctx to cancel the long running go routine.
 // Make sure to run FinishFn to flush remaining build timings to the server _AFTER_ ctx has been canceled.
 // NOTE: this means that you need to defer the FinishFn before deferring the cancel.
-func NewProgress(ctx context.Context, buildID, token string, mode ProgressMode) (*Progress, FinishFn, error) {
+func NewProgress(ctx context.Context, buildID, token string, mode ProgressMode, p *progress.Printer) (*Progress, FinishFn, error) {
 	// Buffer up to 1024 vertex slices before blocking the build.
 	const channelBufferSize = 1024
-	p, err := progress.NewPrinter(ctx, os.Stderr, os.Stderr, mode.String())
-	if err != nil {
-		return nil, func() {}, err
-	}
 
 	progress := &Progress{
 		buildID:  buildID,