Rebase from master

orange-cloudfoundry · Sep 5, 2023 · 9adc74b · 9adc74b
2 parents de0b905 + 5c2563a
commit 9adc74b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -35,7 +35,12 @@ jobs:
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54 # 0.11.2
         with:
+<<<<<<< HEAD
           image-ref: 'ghcr.io/orange-cloudfoundry/dex:release-orange'
+=======
+          #input: image
+          scan-type: 'fs'
+>>>>>>> 5c2563af879aa07fdf1ab3653f1ee48cc7a45bf7
           format: sarif
           output: trivy-results.sarif