Skip to content

fix: added extra args in trivy cmds #5146

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

Merged
merged 4 commits into from
May 22, 2024
Merged

fix: added extra args in trivy cmds #5146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
560d949
added extra args
ashishdevtron May 21, 2024
4176a4f
Merge branch 'main' into query-fix
ashishdevtron May 21, 2024
77dc964
Merge branch 'main' into query-fix
ashishdevtron May 21, 2024
2e2d68d
Merge branch 'main' into query-fix
ashishdevtron May 22, 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: 1 addition & 1 deletion scripts/sql/247_trivy_ca_cert_support.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
UPDATE public.scan_tool_step
SET cli_command = 'trivy image -f json -o {{.OUTPUT_FILE_PATH}} --timeout {{.timeout}} {{.IMAGE_NAME}} --username {{.USERNAME}} --password {{.PASSWORD}}'
SET cli_command = 'trivy image -f json -o {{.OUTPUT_FILE_PATH}} --timeout {{.timeout}} {{.IMAGE_NAME}} --username {{.USERNAME}} --password {{.PASSWORD}} {{.EXTRA_ARGS}}'
WHERE id = 1;
2 changes: 1 addition & 1 deletion scripts/sql/247_trivy_ca_cert_support.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
UPDATE public.scan_tool_step
SET cli_command = '{{if .CA_CERT_FILE_PATH}} SSL_CERT_FILE={{.CA_CERT_FILE_PATH}} {{end}} trivy {{if .insecure}} --insecure {{end}} image -f json -o {{.OUTPUT_FILE_PATH}} --timeout {{.timeout}} {{
.IMAGE_NAME}} --username {{.USERNAME}} --password {{.PASSWORD}}'
.IMAGE_NAME}} --username {{.USERNAME}} --password {{.PASSWORD}} {{.EXTRA_ARGS}}'
WHERE id = 1;