From d19687a4159b2a81231d2fa5ae3e7bce6801dcd6 Mon Sep 17 00:00:00 2001 From: Evgeny Gusarov Date: Fri, 17 Apr 2026 15:36:29 +0300 Subject: [PATCH 1/3] Del setup trivy action --- .github/workflows/docker.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 42656878..c83edde5 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -53,12 +53,6 @@ jobs: - id: commit-hash uses: prompt/actions-commit-hash@01d19a83c242e1851c9aa6cf9625092ecd095d09 # v2 - - name: Trivy Setup - uses: aquasecurity/setup-trivy@3fb12ec12f41e471780db15c232d5dd185dcb514 # v0.2.6 - with: - cache: true - version: v0.68.2 - - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0 with: From edc6cceb83a8b917d0218c436d44a7507206cbc2 Mon Sep 17 00:00:00 2001 From: Evgeny Gusarov Date: Fri, 17 Apr 2026 16:46:13 +0300 Subject: [PATCH 2/3] Revert "Del setup trivy action" This reverts commit d19687a4159b2a81231d2fa5ae3e7bce6801dcd6. --- .github/workflows/docker.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index c83edde5..42656878 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -53,6 +53,12 @@ jobs: - id: commit-hash uses: prompt/actions-commit-hash@01d19a83c242e1851c9aa6cf9625092ecd095d09 # v2 + - name: Trivy Setup + uses: aquasecurity/setup-trivy@3fb12ec12f41e471780db15c232d5dd185dcb514 # v0.2.6 + with: + cache: true + version: v0.68.2 + - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0 with: From 82d50a905774bf708661f44beb3e0ecb1528679e Mon Sep 17 00:00:00 2001 From: Evgeny Gusarov Date: Fri, 17 Apr 2026 16:49:10 +0300 Subject: [PATCH 3/3] Add skip-setup-trivy: true --- .github/workflows/docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 42656878..967a8637 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -68,5 +68,6 @@ jobs: vuln-type: "os,library" severity: "CRITICAL,HIGH" ignore-unfixed: true + skip-setup-trivy: true env: TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db