Merge branch 'main' into e2e-test-restructure

digitalservicebund · Nov 22, 2024 · 1478141 · 1478141
2 parents c96346c + 98b1211
commit 1478141
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -12,29 +12,29 @@ env:
   CONTAINER_IMAGE_VERSION: latest
 
 jobs:
-  reset-trivy-cache:
-    runs-on: ubuntu-latest
-    steps:
-      # TODO with latest release 0.24.0 there is no environment variable for resetting cache anymore
-      # GH issue: https://github.com/aquasecurity/trivy-action/issues/372
-      #
-      # - name: Remove all caches and database of the trivy scanner
-      #   uses: aquasecurity/trivy-action@f781cce5aab226378ee181d764ab90ea0be3cdd8 # v0.25.0
-      #   env:
-      #     TRIVY_RESET: true
-      #     TRIVY_DEBUG: true
-      #   with:
-      #     scan-type: "image"
-      - name: Download trivy vulnerabilities DB
-        uses: aquasecurity/trivy-action@f781cce5aab226378ee181d764ab90ea0be3cdd8 # v0.25.0
-        env:
-          TRIVY_DEBUG: true
-          TRIVY_DOWNLOAD_DB_ONLY: true
-        with:
-          scan-type: "image"
+  # reset-trivy-cache:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     # TODO with latest release 0.24.0 there is no environment variable for resetting cache anymore
+  #     # GH issue: https://github.com/aquasecurity/trivy-action/issues/372
+  #     #
+  #     - name: Remove all caches and database of the trivy scanner
+  #       uses: aquasecurity/trivy-action@f781cce5aab226378ee181d764ab90ea0be3cdd8 # v0.25.0
+  #       env:
+  #         TRIVY_RESET: true
+  #         TRIVY_DEBUG: true
+  #       with:
+  #         scan-type: "image"
+  #     - name: Download trivy vulnerabilities DB
+  #       uses: aquasecurity/trivy-action@f781cce5aab226378ee181d764ab90ea0be3cdd8 # v0.25.0
+  #       env:
+  #         TRIVY_DEBUG: true
+  #         TRIVY_DOWNLOAD_DB_ONLY: true
+  #       with:
+  #         scan-type: "image"
   vulnerability-scan-backend:
     runs-on: ubuntu-latest
-    needs: reset-trivy-cache
+    # needs: reset-trivy-cache
     strategy:
       matrix:
         container-name: