mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-10 05:27:07 +08:00
Merge pull request #2422 from crazy-max/skip-provenance-internal
build: don't generate metadata file when print flag is used
This commit is contained in:
@ -142,7 +142,6 @@ func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error
|
|||||||
Pull: o.pull,
|
Pull: o.pull,
|
||||||
ExportPush: o.exportPush,
|
ExportPush: o.exportPush,
|
||||||
ExportLoad: o.exportLoad,
|
ExportLoad: o.exportLoad,
|
||||||
WithProvenanceResponse: len(o.metadataFile) > 0,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: extract env var parsing to a method easily usable by library consumers
|
// 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
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opts.WithProvenanceResponse = opts.PrintFunc == nil && len(o.metadataFile) > 0
|
||||||
|
|
||||||
return &opts, nil
|
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")
|
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 opts.PrintFunc != nil {
|
||||||
if err := printResult(opts.PrintFunc, resp.ExporterResponse); err != nil {
|
if err := printResult(opts.PrintFunc, resp.ExporterResponse); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
} else if options.metadataFile != "" {
|
||||||
|
if err := writeMetadataFile(options.metadataFile, decodeExporterResponse(resp.ExporterResponse)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user