Merge pull request #38 from kbase/trivy_update

jsfillman · web-flow · commit 38a4eba9175e · 2023-01-30T19:40:03.000-08:00
update to using the up-to-date version of trivy for the table output
diff --git a/.github/workflows/reusable_trivy-scans.yml b/.github/workflows/reusable_trivy-scans.yml
@@ -14,8 +14,8 @@ jobs:
           git config --global --add safe.directory $GITHUB_WORKSPACE;
           docker build -t trivy-test .
 
-      - name: Run Trivy vulnerability scanner - v0.2.1
-        uses: aquasecurity/trivy-action@0.2.1
+      - name: Run Trivy vulnerability scanner, output as table
+        uses: aquasecurity/trivy-action@master
         with:
           image-ref: 'trivy-test'
           format: 'table'
@@ -35,8 +35,9 @@ jobs:
           # If above doesn't find errors, return pass message:
           echo "Did not find core log4j errors, yay!"
 
-      - name: Run Trivy vulnerability scanner - Latest
+      - name: Rerun Trivy vulnerability scanner for GitHub security
         uses: aquasecurity/trivy-action@master
+        if: always()
         with:
           image-ref: 'trivy-test'
           format: 'sarif'
