Merge pull request #399 from depot/fix-bake-load

Fix `--load` attempting to pull extra targets

Author: jacobwgillespie

Makefile

@@ -4,7 +4,7 @@ bin/depot:
 
 .PHONY: image
 image:
-	docker --context=default buildx build --builder default -t public.ecr.aws/depot/cli:0.0.0-dev --load .
+	docker --context=desktop-linux buildx build --builder desktop-linux -t public.ecr.aws/depot/cli:0.0.0-dev --load .
 
 .PHONY: npm
 npm:

pkg/buildx/commands/bake.go

@@ -202,24 +202,28 @@ func RunBake(dockerCli command.Cli, in BakeOptions, validator BakeValidator, pri
 		// Three concurrent pulls at a time to avoid overwhelming the registry.
 		eg.SetLimit(3)
 		for i := range resp {
-			func(i int, targetsToLoad []string) {
-				eg.Go(func() error {
-					depotResponses := []build.DepotBuildResponse{resp[i]}
-					var err error
-					// Only load images from requested targets to avoid pulling unnecessary images.
-					if slices.Contains(targetsToLoad, resp[i].Name) {
-						reportingPrinter := progresshelper.NewReporter(ctx2, printer, in.buildID, in.token)
-						defer reportingPrinter.Close()
-						if in.DepotOptions.loadUsingRegistry && in.DepotOptions.pullInfo != nil {
-							err = load.DepotLoadFromRegistry(ctx, dockerCli.Client(), in.DepotOptions.pullInfo.Reference, true, pullOpts, reportingPrinter)
-						} else {
-							err = load.DepotFastLoad(ctx2, dockerCli.Client(), depotResponses, pullOpts, reportingPrinter)
+			eg.Go(func() error {
+				depotResponses := []build.DepotBuildResponse{resp[i]}
+				var err error
+				// Only load images from requested targets to avoid pulling unnecessary images.
+				if slices.Contains(targetsToLoad, resp[i].Name) {
+					reportingPrinter := progresshelper.NewReporter(ctx2, printer, in.buildID, in.token)
+					defer reportingPrinter.Close()
+
+					if in.DepotOptions.loadUsingRegistry && in.DepotOptions.pullInfo != nil {
+						target := resp[i].Name
+						pullOpt, ok := pullOpts[target]
+						if ok {
+							pw := progress.WithPrefix(reportingPrinter, target, len(pullOpts) > 1)
+							err = load.PullImages(ctx, dockerCli.Client(), fmt.Sprintf("%s-%s", in.DepotOptions.pullInfo.Reference, target), pullOpt, pw)
 						}
+					} else {
+						err = load.DepotFastLoad(ctx2, dockerCli.Client(), depotResponses, pullOpts, reportingPrinter)
 					}
-					load.DeleteExportLeases(ctx2, depotResponses)
-					return err
-				})
-			}(i, targetsToLoad)
+				}
+				load.DeleteExportLeases(ctx2, depotResponses)
+				return err
+			})
 		}
 
 		err = eg.Wait()

pkg/buildx/commands/build.go

@@ -330,7 +330,13 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.No
 	reportingPrinter := progresshelper.NewReporter(ctx, printer, depotOpts.buildID, depotOpts.token)
 
 	if depotOpts.loadUsingRegistry && depotOpts.pullInfo != nil {
-		err = load.DepotLoadFromRegistry(ctx, dockerCli.Client(), depotOpts.pullInfo.Reference, false, pullOpts, reportingPrinter)
+		for target, pullOpt := range pullOpts {
+			pw := progress.WithPrefix(reportingPrinter, target, len(pullOpts) > 1)
+			err = load.PullImages(ctx, dockerCli.Client(), depotOpts.pullInfo.Reference, pullOpt, pw)
+			if err != nil {
+				break
+			}
+		}
 	} else {
 		err = load.DepotFastLoad(ctx, dockerCli.Client(), resp, pullOpts, reportingPrinter)
 	}

pkg/load/load.go

@@ -75,29 +75,6 @@ func DepotFastLoad(ctx context.Context, dockerapi docker.APIClient, resp []depot
 	return nil
 }
 
-func DepotLoadFromRegistry(ctx context.Context, dockerapi docker.APIClient, reference string, isBake bool, pullOpts map[string]PullOptions, printer progress.Writer) error {
-	if len(pullOpts) == 0 {
-		return nil
-	}
-
-	for target, pullOpt := range pullOpts {
-		pw := progress.WithPrefix(printer, target, len(pullOpts) > 1)
-
-		imageName := reference
-
-		if isBake {
-			imageName = fmt.Sprintf("%s-%s", reference, target)
-		}
-
-		err := PullImages(ctx, dockerapi, imageName, pullOpt, pw)
-		if err != nil {
-			return fmt.Errorf("failed to pull image: %w", err)
-		}
-	}
-
-	return nil
-}
-
 // For now if there is a multi-platform build we try to only download the
 // architecture of the depot CLI host.  If there is not a node with the same
 // architecture as the  depot CLI host, we take the first node in the list.