bake: make --load use oci exporter with moby containerd store

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

commands/bake.go

@@ -37,6 +37,7 @@ type bakeOptions struct {
 
 func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags commonFlags) (err error) {
 	ctx := appcontext.Context()
+	docker := dockerutil.NewClient(dockerCli)
 
 	ctx, end, err := tracing.TraceCurrentCommand(ctx, "bake")
 	if err != nil {
@@ -73,7 +74,15 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions, cFlags com
 		}
 		overrides = append(overrides, "*.push=true")
 	} else if in.exportLoad {
-		overrides = append(overrides, "*.output=type=docker")
+		dockerFeatures, err := docker.Features(ctx, "")
+		if err != nil {
+			return err
+		}
+		if dockerFeatures[dockerutil.OCIImporter] {
+			overrides = append(overrides, "*.output=type=oci")
+		} else {
+			overrides = append(overrides, "*.output=type=docker")
+		}
 	}
 	if cFlags.noCache != nil {
 		overrides = append(overrides, fmt.Sprintf("*.no-cache=%t", *cFlags.noCache))
@@ -191,7 +200,7 @@ 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 := build.Build(ctx, nodes, bo, docker, confutil.ConfigDir(dockerCli), printer)
 	if err != nil {
 		return wrapBuildError(err, true)
 	}