Skip to content

[DO NOT MERGE] SBOM on RHEL Edge #39047

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

Closed
wants to merge 2 commits into from
Closed

[DO NOT MERGE] SBOM on RHEL Edge #39047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814fefe
Add /usr/share/rpm/* to the list of allowed folders for SBOM
lebauce Jul 15, 2025
1303e9c
Exclude /sysroot from scan
lebauce Jul 17, 2025
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ replace github.com/vishvananda/netlink => github.com/DataDog/netlink v1.0.1-0.20
// Pull in replacements needed by upstream Trivy
replace (
// Maps to Trivy fork https://github.com/DataDog/trivy/commits/lebauce/container-artifact
github.com/aquasecurity/trivy => github.com/DataDog/trivy v0.0.0-20250324160859-cfe8c0824c78
github.com/aquasecurity/trivy => github.com/DataDog/trivy v0.0.0-20250718092542-0c2d4cbff639
github.com/saracen/walker => github.com/DataDog/walker v0.0.0-20230418153152-7f29bb2dc950
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/util/trivy/trivy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func getDefaultArtifactOption(opts sbom.ScanOptions) artifact.Option {
"/usr/lib/sysimage/rpm/*",
"/var/lib/dpkg/**",
"/var/lib/rpm/*",
"/usr/share/rpm/*",
}
} else if looselyCompareAnalyzers(opts.Analyzers, []string{OSAnalyzers, LanguagesAnalyzers}) {
option.WalkerOption.SkipDirs = append(
Expand All @@ -133,6 +134,7 @@ func getDefaultArtifactOption(opts sbom.ScanOptions) artifact.Option {
"/run/**",
"/sbin/**",
"/sys/**",
"/sysroot/**",
"/tmp/**",
"/usr/bin/**",
"/usr/sbin/**",
Expand Down
Loading