From c3542da517a9ea3ad6d34e278ee0bd5ed7898c92 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Fri, 13 Dec 2024 11:52:02 +0000 Subject: [PATCH] disable trivy in CI --- .github/workflows/main.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 51180ee..8b8779c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -32,9 +32,9 @@ jobs: SKIP=1 fi echo "SKIP=$SKIP" >> "$GITHUB_ENV" - - name: Trivy Dockerfile misconfiguration check - if: env.SKIP == '0' - run: ./bin/trivy-misconfig-dockerfile.bash "software/${{ matrix.package }}/Dockerfile" + # - name: Trivy Dockerfile misconfiguration check + # if: env.SKIP == '0' + # run: ./bin/trivy-misconfig-dockerfile.bash "software/${{ matrix.package }}/Dockerfile" - name: run hadolint if: env.SKIP == '0' run: ./bin/hadolint.bash "software/${{ matrix.package }}/Dockerfile" @@ -87,19 +87,19 @@ jobs: set -euxo pipefail docker builder prune --all --force df -h - - name: run trivy - if: env.SKIP == '0' - run: | - set -euxo pipefail - export reports_dir=$(mktemp -d) - echo "reports_dir=$reports_dir" >> "$GITHUB_ENV" - ./bin/trivy-image-scan.bash "$img:$tag" - - name: upload trivy report - if: env.SKIP == '0' && !cancelled() - uses: actions/upload-artifact@v4 - with: - name: 'trivy-reports-${{ matrix.package }}' - path: '${{ env.reports_dir }}/' + # - name: run trivy + # if: env.SKIP == '0' + # run: | + # set -euxo pipefail + # export reports_dir=$(mktemp -d) + # echo "reports_dir=$reports_dir" >> "$GITHUB_ENV" + # ./bin/trivy-image-scan.bash "$img:$tag" + # - name: upload trivy report + # if: env.SKIP == '0' && !cancelled() + # uses: actions/upload-artifact@v4 + # with: + # name: 'trivy-reports-${{ matrix.package }}' + # path: '${{ env.reports_dir }}/' - name: push image if: env.SKIP == '0' && github.ref == 'refs/heads/main' run: |