diff --git a/.bin/bashbrew-buildkit-env-setup.sh b/.bin/bashbrew-buildkit-env-setup.sh index 74e7797cb6..fcc9aca6e2 100755 --- a/.bin/bashbrew-buildkit-env-setup.sh +++ b/.bin/bashbrew-buildkit-env-setup.sh @@ -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 diff --git a/.external-pins/docker/scout-sbom-indexer___1 b/.external-pins/docker/scout-sbom-indexer___1 new file mode 100644 index 0000000000..975b4d9a5d --- /dev/null +++ b/.external-pins/docker/scout-sbom-indexer___1 @@ -0,0 +1 @@ +sha256:4fa68d539eb5a99e75a93dfbefe5a4dfacd9c90c4577925f492670c6a1b06894 diff --git a/.external-pins/docker/scout-sbom-indexer___1-doi b/.external-pins/docker/scout-sbom-indexer___1-doi deleted file mode 100644 index 24d41f6157..0000000000 --- a/.external-pins/docker/scout-sbom-indexer___1-doi +++ /dev/null @@ -1 +0,0 @@ -sha256:45ba05d54d01ed53a964a0f09d9d638a3af7c0c15448cafd58995ef3ce27ee09