Skip to content

Commit eb1e962

Browse files
authored
Merge pull request #30 from voxpupuli/docker_scout
switch from trivy to docker scout
2 parents cfbf2e4 + 5b119c3 commit eb1e962

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
actions: read
3030
contents: read
3131
security-events: write
32+
pull-requests: write
3233
needs: setup-matrix
3334
strategy:
3435
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
@@ -52,18 +53,26 @@ jobs:
5253
RUBYGEM_OVERCOMMIT=${{ matrix.rubygem_overcommit }}
5354
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
5455
55-
- name: Run Trivy vulnerability scanner
56-
uses: aquasecurity/trivy-action@master
56+
- name: Login to Docker Hub
57+
uses: docker/login-action@v3
5758
with:
58-
image-ref: 'ci/voxbox-${{ matrix.rubygem_puppet }}:${{ github.sha }}'
59-
format: 'sarif'
60-
output: 'trivy-results-${{ matrix.rubygem_puppet }}.sarif'
61-
severity: 'CRITICAL,HIGH'
59+
username: voxpupulibot
60+
password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}
6261

63-
- name: Upload Trivy scan results to GitHub Security tab
64-
uses: github/codeql-action/upload-sarif@v3
62+
- name: Analyze for critical and high CVEs
63+
id: docker-scout-cves
64+
uses: docker/scout-action@v1
6565
with:
66-
sarif_file: 'trivy-results-${{ matrix.rubygem_puppet }}.sarif'
66+
command: cves
67+
image: 'local://ci/voxbox-${{ matrix.rubygem_puppet }}:${{ github.sha }}'
68+
sarif-file: sarif.output.${{ matrix.rubygem_puppet }}.${{ github.sha }}.json
69+
summary: true
70+
71+
- name: Upload SARIF result
72+
id: upload-sarif
73+
uses: github/codeql-action/upload-sarif@v2
74+
with:
75+
sarif_file: sarif.output.${{ matrix.rubygem_puppet }}.${{ github.sha }}.json
6776

6877
- name: Clone voxpupuli/puppet-example repository
6978
uses: actions/checkout@v4

0 commit comments

Comments
 (0)