mirror of
https://github.com/containers/podman.git
synced 2025-08-05 19:02:37 +08:00

We were pinned to a specific commit to ensure that tests kept passing. Hopefully they pass now, as we need to grab latest runc for CVE fixes. Also grab Buildah main to fix a build issue on FreeBSD. After a botched manual vendor, I used Ed's treadmill script and squashed it into this commit to make Git happy. Thanks bunches Ed. Signed-off-by: Matt Heon <mheon@redhat.com>
1.1 KiB
1.1 KiB
####> This option file is used in: ####> podman farm build ####> If file is edited, make sure the changes ####> are applicable to all of those.
--sbom-merge-strategy=method
If more than one --sbom-scanner-command value is being used, use the specified method to merge the output from later commands with output from earlier commands. Recognized values include:
- cat Concatenate the files.
- merge-cyclonedx-by-component-name-and-version Merge the "component" fields of JSON documents, ignoring values from documents when the combination of their "name" and "version" values is already present. Documents are processed in the order in which they are generated, which is the order in which the commands that generate them were specified.
- merge-spdx-by-package-name-and-versioninfo Merge the "package" fields of JSON documents, ignoring values from documents when the combination of their "name" and "versionInfo" values is already present. Documents are processed in the order in which they are generated, which is the order in which the commands that generate them were specified.