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

Jump to bottom

Send list of extra SBOM scanner to use #17699

Merged
merged 1 commit into from
Oct 18, 2024
+7 −5
Merged

Send list of extra SBOM scanner to use #17699

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
10 changes: 6 additions & 4 deletions .bin/bashbrew-buildkit-env-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ _bashbrew_buildkit_env_setup() {
buildxBuilder="$("$binDir/docker-buildx-ensure.sh")" # reminder: this script *requires* BASHBREW_ARCH (to avoid "accidental amd64" mistakes)
vars="$(_jq_setenv <<<"$vars" BUILDX_BUILDER "$buildxBuilder")"

local sbomTag
local sbomGenerator
# https://hub.docker.com/r/docker/scout-sbom-indexer/tags
sbomTag="$(grep <<<"$externalPins" -m1 '^docker/scout-sbom-indexer:')"
sbomTag="$(_resolve_external_pins "$sbomTag")"
vars="$(_jq_setenv <<<"$vars" BASHBREW_BUILDKIT_SBOM_GENERATOR "$sbomTag")"
sbomGenerator="$(grep <<<"$externalPins" -m1 '^docker/scout-sbom-indexer:')"
sbomGenerator="$(_resolve_external_pins "$sbomGenerator")"
# https://github.com/moby/buildkit/pull/5372 - "EXTRA_SCANNERS" is an optional parameter to the Scout SBOM Indexer
sbomGenerator+=',"EXTRA_SCANNERS=php-composer-lock,erlang-otp-application,lua-rock-cataloger,swipl-pack-cataloger,opam-cataloger"'
vars="$(_jq_setenv <<<"$vars" BASHBREW_BUILDKIT_SBOM_GENERATOR "$sbomGenerator")"
;;
esac

Expand Down
1 change: 1 addition & 0 deletions .external-pins/docker/scout-sbom-indexer___1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256:4fa68d539eb5a99e75a93dfbefe5a4dfacd9c90c4577925f492670c6a1b06894
1 change: 0 additions & 1 deletion .external-pins/docker/scout-sbom-indexer___1-doi
View file
Open in desktop

This file was deleted.

Loading