From ba264138d62e79f3f740b272e4b6152fa0fc5199 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:27:37 +0200 Subject: [PATCH] build: don't generate metadata file when print flag is used Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- commands/build.go | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/commands/build.go b/commands/build.go index 6f151d496bf..cb43e89b0ce 100644 --- a/commands/build.go +++ b/commands/build.go @@ -122,27 +122,26 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error } opts := controllerapi.BuildOptions{ - Allow: o.allow, - Annotations: o.annotations, - BuildArgs: buildArgs, - CgroupParent: o.cgroupParent, - ContextPath: o.contextPath, - DockerfileName: o.dockerfileName, - ExtraHosts: o.extraHosts, - Labels: labels, - NetworkMode: o.networkMode, - NoCacheFilter: o.noCacheFilter, - Platforms: o.platforms, - ShmSize: int64(o.shmSize), - Tags: o.tags, - Target: o.target, - Ulimits: dockerUlimitToControllerUlimit(o.ulimits), - Builder: o.builder, - NoCache: o.noCache, - Pull: o.pull, - ExportPush: o.exportPush, - ExportLoad: o.exportLoad, - WithProvenanceResponse: len(o.metadataFile) > 0, + Allow: o.allow, + Annotations: o.annotations, + BuildArgs: buildArgs, + CgroupParent: o.cgroupParent, + ContextPath: o.contextPath, + DockerfileName: o.dockerfileName, + ExtraHosts: o.extraHosts, + Labels: labels, + NetworkMode: o.networkMode, + NoCacheFilter: o.noCacheFilter, + Platforms: o.platforms, + ShmSize: int64(o.shmSize), + Tags: o.tags, + Target: o.target, + Ulimits: dockerUlimitToControllerUlimit(o.ulimits), + Builder: o.builder, + NoCache: o.noCache, + Pull: o.pull, + ExportPush: o.exportPush, + ExportLoad: o.exportLoad, } // TODO: extract env var parsing to a method easily usable by library consumers @@ -207,6 +206,8 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error return nil, err } + opts.WithProvenanceResponse = opts.PrintFunc == nil && len(o.metadataFile) > 0 + return &opts, nil } @@ -365,15 +366,14 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions) return errors.Wrap(err, "writing image ID file") } } - if options.metadataFile != "" { - if err := writeMetadataFile(options.metadataFile, decodeExporterResponse(resp.ExporterResponse)); err != nil { - return err - } - } if opts.PrintFunc != nil { if err := printResult(opts.PrintFunc, resp.ExporterResponse); err != nil { return err } + } else if options.metadataFile != "" { + if err := writeMetadataFile(options.metadataFile, decodeExporterResponse(resp.ExporterResponse)); err != nil { + return err + } } return nil }