Merge pull request moby#3558 from jedevc/sbom-tmp-dir

tonistiigi · web-flow · commit 30ab7d89abff · 2023-01-31T16:53:43.000-08:00
sbom: always create tmp directory for scanner image
diff --git a/frontend/attestations/sbom/sbom.go b/frontend/attestations/sbom/sbom.go
@@ -78,6 +78,8 @@ func CreateSBOMScanner(ctx context.Context, resolver llb.ImageMetaResolver, scan
 		}
 
 		runscan := llb.Image(scanner).Run(runOpts...)
+		runscan.AddMount("/tmp", llb.Scratch(), llb.Tmpfs())
+
 		runscan.AddMount(path.Join(srcDir, "core", CoreSBOMName), ref, llb.Readonly)
 		for k, extra := range extras {
 			runscan.AddMount(path.Join(srcDir, "extras", ExtraSBOMPrefix+k), extra, llb.Readonly)

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ func CreateSBOMScanner(ctx context.Context, resolver llb.ImageMetaResolver, scan`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`runscan := llb.Image(scanner).Run(runOpts...)`
	`81`	`+ runscan.AddMount("/tmp", llb.Scratch(), llb.Tmpfs())`
	`82`	`+`
`81`	`83`	`runscan.AddMount(path.Join(srcDir, "core", CoreSBOMName), ref, llb.Readonly)`
`82`	`84`	`for k, extra := range extras {`
`83`	`85`	`runscan.AddMount(path.Join(srcDir, "extras", ExtraSBOMPrefix+k), extra, llb.Readonly)`