Commit 9861bbf8 authored by Girija Saint-Ange's avatar Girija Saint-Ange
Browse files

Merge branch '93-trivy-option-vuln-type-is-deprecated' into 'master' 

Resolve "Trivy option --vuln-type is deprecated"

Closes #93

See merge request to-be-continuous/docker!128
parents fb54cf5f 76d0f3f5

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
        {

          "name": "DOCKER_TRIVY_ARGS",

          "description": "Additional `trivy client` arguments",

          "default": "--ignore-unfixed --vuln-type os --exit-on-eol 1 --detection-priority comprehensive",

          "default": "--ignore-unfixed --pkg-types os --exit-on-eol 1 --detection-priority comprehensive",

          "advanced": true

        },

        {

templates/gitlab-ci-docker.yml

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ spec: 
      default: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL

    trivy-args:

      description: Additional `trivy client` arguments

      default: --ignore-unfixed --vuln-type os --exit-on-eol 1 --detection-priority comprehensive

      default: --ignore-unfixed --pkg-types os --exit-on-eol 1 --detection-priority comprehensive

    trivy-db-repository:

      description: Custom OCI repository to retrieve Trivy Database from

      default: ''