Skip to content

Commit

Permalink
Merge pull request #922 from Automattic/update/trivy
Browse files Browse the repository at this point in the history
ci: update trivy to 0.56.1
  • Loading branch information
sjinks authored Oct 7, 2024
2 parents fc32607 + d0c2b03 commit eb42b82
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/actions/build-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ runs:
-v $(pwd)/.cache:/root/.cache \
-v $(pwd):/workdir \
-w /workdir \
aquasec/trivy:0.55.2 image --format json --ignore-unfixed --pkg-types os --scanners vuln ${{ inputs.primaryTag }} --output trivy.json
aquasec/trivy:0.56.1 image --format json --ignore-unfixed --pkg-types os --scanners vuln ${{ inputs.primaryTag }} --db-repository public.ecr.aws/aquasecurity/trivy-db:2 --output trivy.json
sudo chmod a+r -R .cache
- name: Calculate database hash
Expand All @@ -179,12 +179,12 @@ runs:
if: steps.old_hash.outputs.hash != steps.new_hash.outputs.hash && steps.new_hash.outputs.hash != ''

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

- name: Generate SARIF
uses: docker://aquasec/trivy:0.55.2
uses: docker://aquasec/trivy:0.56.1
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 @@ -197,7 +197,7 @@ runs:
continue-on-error: true

- name: Prepare markdown report
uses: docker://aquasec/trivy:0.55.2
uses: docker://aquasec/trivy:0.56.1
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 eb42b82

Please sign in to comment.