Skip to content
Snippets Groups Projects
Commit 659a0b53 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '42-error-when-generating-trivy-report-2' into 'master'

Resolve "Error when generating Trivy report"

Closes #42

See merge request to-be-continuous/docker!51
parents 6fd57cec 294ed0e9
Branches
Tags
No related merge requests found
...@@ -655,7 +655,7 @@ docker-trivy: ...@@ -655,7 +655,7 @@ docker-trivy:
# Add common trivy arguments # Add common trivy arguments
export trivy_opts="${trivy_opts} --no-progress --severity ${DOCKER_TRIVY_SECURITY_LEVEL_THRESHOLD} ${DOCKER_TRIVY_ARGS}" export trivy_opts="${trivy_opts} --no-progress --severity ${DOCKER_TRIVY_SECURITY_LEVEL_THRESHOLD} ${DOCKER_TRIVY_ARGS}"
# GitLab format (no fail) # GitLab format (no fail)
trivy ${trivy_opts} --format template --exit-code 0 --template "@contrib/gitlab.tpl" --output reports/docker-trivy-${basename}.gitlab.json $DOCKER_SNAPSHOT_IMAGE trivy ${trivy_opts} --format template --exit-code 0 --template "@/contrib/gitlab.tpl" --output reports/docker-trivy-${basename}.gitlab.json $DOCKER_SNAPSHOT_IMAGE
# JSON format (no fail) # JSON format (no fail)
if [[ "$DEFECTDOJO_TRIVY_REPORTS" ]] if [[ "$DEFECTDOJO_TRIVY_REPORTS" ]]
then then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment