diff --git a/.gitea/workflows/run-trivy-scan.yaml b/.gitea/workflows/run-trivy-scan.yaml index fc50985..29b162e 100644 --- a/.gitea/workflows/run-trivy-scan.yaml +++ b/.gitea/workflows/run-trivy-scan.yaml @@ -37,8 +37,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - uses: ./setup-trivy - - uses: ./setup-db + - name: Checkout trivy-actions + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + repository: https://gitea.t000-n.de/t.behrendt/trivy-actions + path: trivy-actions + - uses: ./trivy-actions/setup-trivy + - uses: ./trivy-actions/setup-db - run: | trivy config --cache-dir "$TRIVY_CACHE_DIR" --exit-code 0 --format sarif --output config-sarif.json . env: @@ -53,11 +58,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - uses: ./setup-trivy - - uses: ./setup-db + - name: Checkout trivy-actions + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + repository: https://gitea.t000-n.de/t.behrendt/trivy-actions + path: trivy-actions + - uses: ./trivy-actions/setup-trivy + - uses: ./trivy-actions/setup-db - name: Get images from files id: get-images - uses: ./get-images-from-files + uses: ./trivy-actions/get-images-from-files with: files: ${{ inputs.image-scan-files }} - name: Pull images @@ -97,7 +107,7 @@ jobs: TRIVY_CACHE_DIR: ${{ runner.temp }}/trivy - name: Merge image SARIF files if: steps.get-images.outputs.images != '[]' && steps.scan.outputs.count != '0' - uses: ./merge-sarif-files + uses: ./trivy-actions/merge-sarif-files with: files: ${{ steps.scan.outputs.files }} output-file: image-sarif.json @@ -135,6 +145,11 @@ jobs: with: name: image-sarif path: image-sarif-artifact + - name: Checkout trivy-actions + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + repository: https://gitea.t000-n.de/t.behrendt/trivy-actions + path: trivy-actions - name: Build merge file list id: file-list run: | @@ -150,7 +165,7 @@ jobs: echo "EOF" >> "$GITHUB_OUTPUT" - name: Merge SARIF files id: merge-step - uses: ./merge-sarif-files + uses: ./trivy-actions/merge-sarif-files with: files: ${{ steps.file-list.outputs.files }} output-file: merged-sarif.json