diff --git a/pkg/cmd/builder/build.go b/pkg/cmd/builder/build.go index 9d1f0f7b05f..aee9ae7ac61 100644 --- a/pkg/cmd/builder/build.go +++ b/pkg/cmd/builder/build.go @@ -25,6 +25,7 @@ import ( "os" "os/exec" "path/filepath" + "runtime" "strconv" "strings" @@ -61,18 +62,22 @@ func (p platformParser) DefaultSpec() platforms.Platform { } func Build(ctx context.Context, client *containerd.Client, options types.BuilderBuildOptions) error { - buildctlBinary, buildctlArgs, needsLoading, metaFile, tags, cleanup, err := generateBuildctlArgs(ctx, client, options) + buildCtlArgs, err := generateBuildctlArgs(ctx, client, options) if err != nil { return err } - if cleanup != nil { - defer cleanup() + if buildCtlArgs.Cleanup != nil { + defer buildCtlArgs.Cleanup() } + buildctlBinary := buildCtlArgs.BuildctlBinary + buildctlArgs := buildCtlArgs.BuildctlArgs + log.L.Debugf("running %s %v", buildctlBinary, buildctlArgs) buildctlCmd := exec.Command(buildctlBinary, buildctlArgs...) buildctlCmd.Env = os.Environ() + needsLoading := buildCtlArgs.NeedsLoading var buildctlStdout io.Reader if needsLoading { buildctlStdout, err = buildctlCmd.StdoutPipe() @@ -95,6 +100,26 @@ func Build(ctx context.Context, client *containerd.Client, options types.Builder if err != nil { return err } + + if buildCtlArgs.DestFile == "" { + log.L.Debug("no tar file specified") + } else { + // Separate TTY (image loading) buildctl output and tarball output + // Write buildctl output to stdout + if _, err := io.Copy(os.Stdout, buildctlStdout); err != nil { + return err + } + + // Open the tar file + reader, err := os.Open(buildCtlArgs.DestFile) + if err != nil { + return fmt.Errorf("failed to open tar file: %v", err) + } + defer reader.Close() + buildctlStdout = reader + } + + // Load the image into the containerd image store if err = loadImage(ctx, buildctlStdout, options.GOptions.Namespace, options.GOptions.Address, options.GOptions.Snapshotter, options.Stdout, platMC, options.Quiet); err != nil { return err } @@ -105,7 +130,7 @@ func Build(ctx context.Context, client *containerd.Client, options types.Builder } if options.IidFile != "" { - id, err := getDigestFromMetaFile(metaFile) + id, err := getDigestFromMetaFile(buildCtlArgs.MetaFile) if err != nil { return err } @@ -114,6 +139,7 @@ func Build(ctx context.Context, client *containerd.Client, options types.Builder } } + tags := buildCtlArgs.Tags if len(tags) > 1 { log.L.Debug("Found more than 1 tag") imageService := client.ImageService() @@ -160,7 +186,11 @@ func loadImage(ctx context.Context, in io.Reader, namespace, address, snapshotte client.Close() }() r := &readCounter{Reader: in} - imgs, err := client.Import(ctx, r, containerd.WithDigestRef(archive.DigestTranslator(snapshotter)), containerd.WithSkipDigestRef(func(name string) bool { return name != "" }), containerd.WithImportPlatform(platMC)) + imgs, err := client.Import(ctx, r, + containerd.WithDigestRef(archive.DigestTranslator(snapshotter)), + containerd.WithSkipDigestRef(func(name string) bool { return name != "" }), + containerd.WithImportPlatform(platMC), + ) if err != nil { if r.N == 0 { // Avoid confusing "unrecognized image format" @@ -192,23 +222,40 @@ func loadImage(ctx context.Context, in io.Reader, namespace, address, snapshotte return nil } -func generateBuildctlArgs(ctx context.Context, client *containerd.Client, options types.BuilderBuildOptions) (buildCtlBinary string, - buildctlArgs []string, needsLoading bool, metaFile string, tags []string, cleanup func(), err error) { +type BuildctlArgsResult struct { + BuildctlArgs []string + BuildctlBinary string + Cleanup func() + DestFile string + MetaFile string + NeedsLoading bool // Specifies whether the image needs to be loaded into the containerd image store + Tags []string +} +func generateBuildctlArgs(ctx context.Context, client *containerd.Client, options types.BuilderBuildOptions) (result BuildctlArgsResult, err error) { buildctlBinary, err := buildkitutil.BuildctlBinary() if err != nil { - return "", nil, false, "", nil, nil, err + return result, err } + result.BuildctlBinary = buildctlBinary + + // FIXME: Find a better path + // Set the default destination file + defaultDestFile, err := filepath.Abs("output.tar") + if err != nil { + return result, fmt.Errorf("failed to set the default destination file path: %v", err) + } + var defaultDest string output := options.Output if output == "" { info, err := client.Server(ctx) if err != nil { - return "", nil, false, "", nil, nil, err + return result, err } sharable, err := isImageSharable(options.BuildKitHost, options.GOptions.Namespace, info.UUID, options.GOptions.Snapshotter, options.Platform) if err != nil { - return "", nil, false, "", nil, nil, err + return result, err } if sharable { output = "type=image,unpack=true" // ensure the target stage is unlazied (needed for any snapshotters) @@ -219,7 +266,6 @@ func generateBuildctlArgs(ctx context.Context, client *containerd.Client, option // TODO: consider using type=oci for single-options.Platform build too output = "type=oci" } - needsLoading = true } } else { if !strings.Contains(output, "type=") { @@ -227,17 +273,28 @@ func generateBuildctlArgs(ctx context.Context, client *containerd.Client, option // type=local,dest=