Skip to content

Commit

Permalink
Merge pull request #623 from Automattic/update/trivy
Browse files Browse the repository at this point in the history
ci: update aquasec/trivy from 0.47.0 to 0.48.3
  • Loading branch information
sjinks authored Jan 18, 2024
2 parents f0aa97a + b4c22da commit 465151e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/actions/build-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ runs:
echo "filename=trivy-$(basename "${{ inputs.primaryTag }}" | tr '\\/:' '-').sarif" >> "${GITHUB_OUTPUT}"
- name: Security Scan
uses: docker://aquasec/trivy:0.47.0
uses: docker://aquasec/trivy:0.48.3
with:
args: image --format json --ignore-unfixed ${{ inputs.primaryTag }} --output trivy.json
args: image --format json --ignore-unfixed --vuln-type os ${{ inputs.primaryTag }} --output trivy.json

- name: Print report
uses: docker://aquasec/trivy:0.47.0
uses: docker://aquasec/trivy:0.48.3
with:
args: convert --format=table trivy.json

- name: Generate SARIF
uses: docker://aquasec/trivy:0.47.0
uses: docker://aquasec/trivy:0.48.3
with:
args: convert --format=sarif --output=${{ steps.filename.outputs.filename }} trivy.json
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
Expand All @@ -119,7 +119,7 @@ runs:
continue-on-error: true

- name: Prepare markdown report
uses: docker://aquasec/trivy:0.47.0
uses: docker://aquasec/trivy:0.48.3
with:
args: convert --format=template --template=@.github/actions/build-docker-image/markdown.tpl --output=trivy.md trivy.json
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
Expand Down

0 comments on commit 465151e

Please sign in to comment.