From a521f71e79786762e1e746994390b3d546bfe2de Mon Sep 17 00:00:00 2001
From: Dunklas <dunklas@gmail.com>
Date: Tue, 28 Jun 2022 08:58:10 +0200
Subject: [PATCH] Update version of trivy to v0.29.2 (#123)

* Update trivy to v0.29.2
* Include image subcommand when running trivy
Otherwise, trivy fails with error 'FATAL	flag provided but not defined: -reset'

Co-authored-by: Rickard Andersson <rickard.andersson@devies.se>
---
 gitops-v2/build/main.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitops-v2/build/main.yaml b/gitops-v2/build/main.yaml
index ef07b05..dd970cb 100644
--- a/gitops-v2/build/main.yaml
+++ b/gitops-v2/build/main.yaml
@@ -48,8 +48,8 @@ parameters:
         tag: "v1.18.0"
         sha: "f9bc9de12438b463ca84e77fde70b07b155d4da07ca21bc3f4354a62c6199db4"
       trivy:
-        tag: "v0.20.2"
-        sha: "38a6de48e21a34e0fa0d2cf63439c0afcbbae0e78fb3feada7a84a9cf6e7f60c"
+        tag: "v0.29.2"
+        sha: "d9d0fdb351dfea340e6621b2f9cbd4e1b86ecc83f05a9d31ce265839259c7576"
       horusec:
         tag: "v2.5.0"
         sha: "94bbfcb65db40d802b0c5b5b5a7f31bc89d4bd25ba6cbff3fa5debe3313d1b1f"
@@ -152,9 +152,9 @@ stages:
               tar xzvf trivy_${TRIVY_TAG:1}_Linux-64bit.tar.gz
               chmod +x trivy
               # Run
-              ./trivy --reset --no-progress
-              ./trivy --exit-code 0 --no-progress --input ${IMAGE_ID}.tar
-              ./trivy --exit-code 1 --no-progress --ignore-unfixed --input ${IMAGE_ID}.tar
+              ./trivy image --reset --no-progress
+              ./trivy image --exit-code 0 --no-progress --input ${IMAGE_ID}.tar
+              ./trivy image --exit-code 1 --no-progress --ignore-unfixed --input ${IMAGE_ID}.tar
             displayName: Image scan
             continueOnError: ${{ parameters.imageScan.ignoreRuleViolations }}
             env: