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

fix: use additional skip-files arg in scan job understood by Trivy #860

Merged
merged 2 commits into from
Mar 18, 2024
Merged

fix: use additional skip-files arg in scan job understood by Trivy #860

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
80d301e
fix: use skip-files arg in scan jobb understood by Trivy
erikgb Mar 17, 2024
edbaa64
keep original skip-files too
erikgb Mar 18, 2024
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: 2 additions & 0 deletions internal/controller/stas/testdata/scan-job/expected-scan-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ spec:
- rootfs
- --skip-files
- /var/run/image-scanner/trivy
- --skip-files
- run/image-scanner/trivy
- /
command:
- /var/run/image-scanner/trivy
Expand Down
3 changes: 3 additions & 0 deletions internal/trivy/scan_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ func (f *filesystemScanJobBuilder) container(spec stasv1alpha1.ContainerImageSca
string(f.TrivyCommand),
"--skip-files",
FsScanTrivyBinaryPath,
// FIXME: Somehow Trivy strips off the first part of the path
"--skip-files",
"run/image-scanner/trivy",
erikgb marked this conversation as resolved.
Show resolved Hide resolved
"/",
}
container.Env = []corev1.EnvVar{
Expand Down
Loading