Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add way to specify extra SBOM scanner #86

Closed
wants to merge 1 commit into from
Closed

Add way to specify extra SBOM scanner #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .test/meta-commands/out.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ SOURCE_DATE_EPOCH=1709081058 \
--load=false \
--provenance=false \
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=all \
--sbom=generator="$BASHBREW_BUILDKIT_SBOM_GENERATOR" \
--sbom="generator=$BASHBREW_BUILDKIT_SBOM_GENERATOR","EXTRA_SCANNERS=$BASHBREW_BUILDKIT_EXTRA_SCANNERS" \
--output 'type=oci,tar=false,dest=sbom' \
--platform 'linux/amd64' \
--build-context "fake=oci-layout://$PWD/temp@$originalImageManifest" \
Expand Down
4 changes: 2 additions & 2 deletions meta.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def build_command:
"docker buildx build --progress=plain",
"--provenance=mode=max",
if build_should_sbom then
"--sbom=generator=\"$BASHBREW_BUILDKIT_SBOM_GENERATOR\""
"--sbom=\"generator=$BASHBREW_BUILDKIT_SBOM_GENERATOR\",\"EXTRA_SCANNERS=$BASHBREW_BUILDKIT_EXTRA_SCANNERS"
else empty end,
"--output " + (
[
Expand Down Expand Up @@ -328,7 +328,7 @@ def build_command:
"docker buildx build --progress=plain",
"--load=false", "--provenance=false", # explicitly disable a few features we want to avoid
"--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=all", # disable linting (https://github.com/moby/buildkit/pull/4962)
"--sbom=generator=\"$BASHBREW_BUILDKIT_SBOM_GENERATOR\"",
"--sbom=\"generator=$BASHBREW_BUILDKIT_SBOM_GENERATOR\",\"EXTRA_SCANNERS=$BASHBREW_BUILDKIT_EXTRA_SCANNERS",
"--output 'type=oci,tar=false,dest=sbom'",
# TODO also add appropriate "--tag" lines (which would give us a mostly correct "subject" block in the generated SBOM, but we'd then need to replace instances of ${sbomImageManifest#*:} with ${originalImageManifest#*:} for their values to be correct)
@sh "--platform \(.source.arches[.build.arch].platformString)",
Expand Down
Loading