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

templates/gitlab-ci-docker.yml

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ docker-trivy: 
    # Add common trivy arguments

    export trivy_opts="${trivy_opts} --no-progress --severity ${DOCKER_TRIVY_SECURITY_LEVEL_THRESHOLD} ${DOCKER_TRIVY_ARGS}"

    # 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)

    if [[ "$DEFECTDOJO_TRIVY_REPORTS" ]]

    then