File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -144,7 +144,7 @@ SOURCE_DATE_EPOCH=1709081058 \
144144 --load=false \
145145 --provenance=false \
146146 --build-arg BUILDKIT_DOCKERFILE_CHECK=skip=all \
147- --sbom=generator=" $BASHBREW_BUILDKIT_SBOM_GENERATOR " \
147+ --sbom=" generator=$BASHBREW_BUILDKIT_SBOM_GENERATOR " , " EXTRA_SCANNERS= $BASHBREW_BUILDKIT_EXTRA_SCANNERS " \
148148 --output ' type=oci,tar=false,dest=sbom' \
149149 --platform ' linux/amd64' \
150150 --build-context " fake=oci-layout://$PWD /temp@$originalImageManifest " \
Original file line number Diff line number Diff line change @@ -143,7 +143,7 @@ def build_command:
143143 "docker buildx build --progress=plain" ,
144144 "--provenance=mode=max" ,
145145 if build_should_sbom then
146- "--sbom=generator= \" $BASHBREW_BUILDKIT_SBOM_GENERATOR\" "
146+ "--sbom=\" generator= $BASHBREW_BUILDKIT_SBOM_GENERATOR\" , \" EXTRA_SCANNERS=$BASHBREW_BUILDKIT_EXTRA_SCANNERS "
147147 else empty end ,
148148 "--output " + (
149149 [
@@ -328,7 +328,7 @@ def build_command:
328328 "docker buildx build --progress=plain" ,
329329 "--load=false" , "--provenance=false" , # explicitly disable a few features we want to avoid
330330 "--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=all" , # disable linting (https://github.com/moby/buildkit/pull/4962)
331- "--sbom=generator= \" $BASHBREW_BUILDKIT_SBOM_GENERATOR\" " ,
331+ "--sbom=\" generator= $BASHBREW_BUILDKIT_SBOM_GENERATOR\" , \" EXTRA_SCANNERS=$BASHBREW_BUILDKIT_EXTRA_SCANNERS " ,
332332 "--output 'type=oci,tar=false,dest=sbom'" ,
333333 # 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)
334334 @sh "--platform \( .source.arches [.build.arch ].platformString ) " ,
You can’t perform that action at this time.
0 commit comments