bake: use controller to build

With this change we are now passing a list of controller options
to run a build and returns a map of responses and result context
as bake can handle a list of targets.

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

bake/bake.go

@@ -15,7 +15,6 @@ import (
 	composecli "github.com/compose-spec/compose-go/cli"
 	"github.com/docker/buildx/bake/hclparser"
 	"github.com/docker/buildx/build"
-	cbuild "github.com/docker/buildx/controller/build"
 	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/util/buildflags"
 	hcl "github.com/hashicorp/hcl/v2"
@@ -908,18 +907,14 @@ func (t *Target) GetName(ectx *hcl.EvalContext, block *hcl.Block, loadDeps func(
 	return value.AsString(), nil
 }
 
-func TargetsToBuildOpt(m map[string]*Target, inp *Input) (map[string]build.Options, error) {
-	m2 := make(map[string]build.Options, len(m))
+func TargetsToControllerOptions(m map[string]*Target, inp *Input) (map[string]controllerapi.BuildOptions, error) {
+	m2 := make(map[string]controllerapi.BuildOptions, len(m))
 	for k, v := range m {
 		opts, err := toControllerOpt(v, inp)
 		if err != nil {
 			return nil, err
 		}
-		bo, err := cbuild.ToBuildOpts(*opts, nil)
-		if err != nil {
-			return nil, err
-		}
-		m2[k] = *bo
+		m2[k] = *opts
 	}
 	return m2, nil
 }

bake/bake_test.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/buildx/controller/pb"
 	"github.com/stretchr/testify/require"
 )
 
@@ -390,7 +391,7 @@ func TestHCLCwdPrefix(t *testing.T) {
 	_, ok := m["app"]
 	require.True(t, ok)
 
-	_, err = TargetsToBuildOpt(m, &Input{})
+	_, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 
 	require.Equal(t, "test", *m["app"].Dockerfile)
@@ -421,7 +422,7 @@ func TestOverrideMerge(t *testing.T) {
 	_, ok := m["app"]
 	require.True(t, ok)
 
-	_, err = TargetsToBuildOpt(m, &Input{})
+	_, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 
 	require.Equal(t, []string{"linux/arm", "linux/ppc64le"}, m["app"].Platforms)
@@ -456,7 +457,7 @@ func TestReadContexts(t *testing.T) {
 	_, ok := m["app"]
 	require.True(t, ok)
 
-	bo, err := TargetsToBuildOpt(m, &Input{})
+	bo, err := TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 
 	ctxs := bo["app"].Inputs.NamedContexts
@@ -472,7 +473,7 @@ func TestReadContexts(t *testing.T) {
 	_, ok = m["app"]
 	require.True(t, ok)
 
-	bo, err = TargetsToBuildOpt(m, &Input{})
+	bo, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 
 	ctxs = bo["app"].Inputs.NamedContexts
@@ -490,7 +491,7 @@ func TestReadContexts(t *testing.T) {
 	_, ok = m["app"]
 	require.True(t, ok)
 
-	bo, err = TargetsToBuildOpt(m, &Input{})
+	bo, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 
 	ctxs = bo["app"].Inputs.NamedContexts
@@ -1325,7 +1326,7 @@ func TestHCLNullVars(t *testing.T) {
 	_, ok := m["default"]
 	require.True(t, ok)
 
-	_, err = TargetsToBuildOpt(m, &Input{})
+	_, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
 	require.Equal(t, map[string]*string{"com.docker.app.baz": ptrstr("foo")}, m["default"].Labels)
@@ -1360,7 +1361,7 @@ func TestJSONNullVars(t *testing.T) {
 	_, ok := m["default"]
 	require.True(t, ok)
 
-	_, err = TargetsToBuildOpt(m, &Input{})
+	_, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
 	require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, m["default"].Args)
 }
@@ -1432,21 +1433,34 @@ func TestAttestDuplicates(t *testing.T) {
 	require.Equal(t, []string{"type=sbom,foo=bar", "type=provenance,mode=max"}, m["default"].Attest)
 	require.NoError(t, err)
 
-	opts, err := TargetsToBuildOpt(m, &Input{})
+	opts, err := TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
-	require.Equal(t, map[string]*string{
-		"sbom":       ptrstr("type=sbom,foo=bar"),
-		"provenance": ptrstr("type=provenance,mode=max"),
+	require.Equal(t, []*pb.Attest{
+		{
+			Type:  "sbom",
+			Attrs: "type=sbom,foo=bar",
+		},
+		{
+			Type:  "provenance",
+			Attrs: "type=provenance,mode=max",
+		},
 	}, opts["default"].Attests)
 
 	m, _, err = ReadTargets(ctx, []File{fp}, []string{"default"}, []string{"*.attest=type=sbom,disabled=true"}, nil)
 	require.Equal(t, []string{"type=sbom,disabled=true", "type=provenance,mode=max"}, m["default"].Attest)
 	require.NoError(t, err)
 
-	opts, err = TargetsToBuildOpt(m, &Input{})
+	opts, err = TargetsToControllerOptions(m, &Input{})
 	require.NoError(t, err)
-	require.Equal(t, map[string]*string{
-		"sbom":       nil,
-		"provenance": ptrstr("type=provenance,mode=max"),
+	require.Equal(t, []*pb.Attest{
+		{
+			Type:     "sbom",
+			Disabled: true,
+			Attrs:    "type=sbom,disabled=true",
+		},
+		{
+			Type:  "provenance",
+			Attrs: "type=provenance,mode=max",
+		},
 	}, opts["default"].Attests)
 }

build/build.go

@@ -668,7 +668,7 @@ func Build(ctx context.Context, nodes []builder.Node, opt map[string]Options, do
 	return BuildWithResultHandler(ctx, nodes, opt, docker, configDir, w, nil)
 }
 
-func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer, resultHandleFunc func(driverIndex int, rCtx *ResultHandle)) (resp map[string]*client.SolveResponse, err error) {
+func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[string]Options, docker *dockerutil.Client, configDir string, w progress.Writer, resultHandleFunc func(target string, rCtx *ResultHandle)) (resp map[string]*client.SolveResponse, err error) {
 	if len(nodes) == 0 {
 		return nil, errors.Errorf("driver required for build")
 	}
@@ -938,7 +938,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 					if resultHandleFunc != nil {
 						var resultHandle *ResultHandle
 						resultHandle, rr, err = NewResultHandle(ctx, cc, so, "buildx", buildFunc, ch)
-						resultHandleFunc(dp.driverIndex, resultHandle)
+						resultHandleFunc(k, resultHandle)
 					} else {
 						rr, err = c.Build(ctx, so, "buildx", buildFunc, ch)
 					}

commands/bake.go

@@ -11,11 +11,11 @@ import (
 	"github.com/docker/buildx/bake"
 	"github.com/docker/buildx/build"
 	"github.com/docker/buildx/builder"
+	cbuild "github.com/docker/buildx/controller/build"
+	controllerapi "github.com/docker/buildx/controller/pb"
 	"github.com/docker/buildx/util/buildflags"
 	"github.com/docker/buildx/util/cobrautil/completion"
-	"github.com/docker/buildx/util/confutil"
 	"github.com/docker/buildx/util/desktop"
-	"github.com/docker/buildx/util/dockerutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/docker/buildx/util/tracing"
 	"github.com/docker/cli/cli/command"
@@ -31,10 +31,8 @@ type bakeOptions struct {
 	sbom       string
 	provenance string
 
-	builder      string
-	metadataFile string
-	exportPush   bool
-	exportLoad   bool
+	controllerapi.CommonOptions
+	//control.ControlOptions
 }
 
 func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
@@ -69,12 +67,12 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 	}
 
 	overrides := in.overrides
-	if in.exportPush {
-		if in.exportLoad {
+	if in.ExportPush {
+		if in.ExportLoad {
 			return errors.Errorf("push and load may not be set together at the moment")
 		}
 		overrides = append(overrides, "*.push=true")
-	} else if in.exportLoad {
+	} else if in.ExportLoad {
 		overrides = append(overrides, "*.output=type=docker")
 	}
 	if cFlags.noCache != nil {
@@ -102,7 +100,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 	// instance only needed for reading remote bake files or building
 	if url != "" || !in.printOnly {
 		b, err := builder.New(dockerCli,
-			builder.WithName(in.builder),
+			builder.WithName(in.Builder),
 			builder.WithContextPathHash(contextPathHash),
 		)
 		if err != nil {
@@ -176,11 +174,19 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 	}
 
 	// this function can update target context string from the input so call before printOnly check
-	bo, err := bake.TargetsToBuildOpt(tgts, inp)
+	opts, err := bake.TargetsToControllerOptions(tgts, inp)
 	if err != nil {
 		return err
 	}
 
+	// set builder name and context hash for all targets
+	updatedOpts := make(map[string]controllerapi.BuildOptions, len(opts))
+	for i, opt := range opts {
+		opt.Opts.Builder = in.Builder
+		opt.Inputs.ContextPathHash = contextPathHash
+		updatedOpts[i] = opt
+	}
+
 	if in.printOnly {
 		dt, err := json.MarshalIndent(struct {
 			Group  map[string]*bake.Group  `json:"group,omitempty"`
@@ -201,17 +207,17 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 		return nil
 	}
 
-	resp, err := build.Build(ctx, nodes, bo, dockerutil.NewClient(dockerCli), confutil.ConfigDir(dockerCli), printer)
+	resp, _, err := cbuild.RunBuilds(ctx, dockerCli, updatedOpts, os.Stdin, printer, false)
 	if err != nil {
 		return wrapBuildError(err, true)
 	}
 
-	if len(in.metadataFile) > 0 {
+	if len(in.MetadataFile) > 0 {
 		dt := make(map[string]interface{})
 		for t, r := range resp {
 			dt[t] = decodeExporterResponse(r.ExporterResponse)
 		}
-		if err := writeMetadataFile(in.metadataFile, dt); err != nil {
+		if err := writeMetadataFile(in.MetadataFile, dt); err != nil {
 			return err
 		}
 	}
@@ -235,8 +241,8 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 			if !cmd.Flags().Lookup("pull").Changed {
 				cFlags.pull = nil
 			}
-			options.builder = rootOpts.builder
-			options.metadataFile = cFlags.metadataFile
+			options.Builder = rootOpts.builder
+			options.MetadataFile = cFlags.metadataFile
 			// Other common flags (noCache, pull and progress) are processed in runBake function.
 			return runBake(dockerCli, args, options, cFlags)
 		},
@@ -246,9 +252,9 @@ func bakeCmd(dockerCli command.Cli, rootOpts *rootOptions) *cobra.Command {
 	flags := cmd.Flags()
 
 	flags.StringArrayVarP(&options.files, "file", "f", []string{}, "Build definition file")
-	flags.BoolVar(&options.exportLoad, "load", false, `Shorthand for "--set=*.output=type=docker"`)
+	flags.BoolVar(&options.ExportLoad, "load", false, `Shorthand for "--set=*.output=type=docker"`)
 	flags.BoolVar(&options.printOnly, "print", false, "Print the options without building")
-	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--set=*.output=type=registry"`)
+	flags.BoolVar(&options.ExportPush, "push", false, `Shorthand for "--set=*.output=type=registry"`)
 	flags.StringVar(&options.sbom, "sbom", "", `Shorthand for "--set=*.attest=type=sbom"`)
 	flags.StringVar(&options.provenance, "provenance", "", `Shorthand for "--set=*.attest=type=provenance"`)
 	flags.StringArrayVar(&options.overrides, "set", nil, `Override target value (e.g., "targetpattern.key=value")`)

commands/build.go

@@ -94,8 +94,12 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error
 	var err error
 
 	inputs := controllerapi.Inputs{
-		ContextPath:    o.contextPath,
-		DockerfileName: o.dockerfileName,
+		ContextPath:     o.contextPath,
+		ContextPathHash: o.contextPath,
+		DockerfileName:  o.dockerfileName,
+	}
+	if absContextPath, err := filepath.Abs(inputs.ContextPathHash); err == nil {
+		inputs.ContextPathHash = absContextPath
 	}
 	inputs.NamedContexts, err = buildflags.ParseContextNames(o.contexts)
 	if err != nil {
@@ -218,13 +222,9 @@ func runBuild(dockerCli command.Cli, options buildOptions) (err error) {
 		}
 	}
 
-	contextPathHash := options.contextPath
-	if absContextPath, err := filepath.Abs(contextPathHash); err == nil {
-		contextPathHash = absContextPath
-	}
 	b, err := builder.New(dockerCli,
 		builder.WithName(options.Builder),
-		builder.WithContextPathHash(contextPathHash),
+		builder.WithContextPathHash(opts.Inputs.ContextPathHash),
 	)
 	if err != nil {
 		return err