Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/dot-github/workf…
Browse files Browse the repository at this point in the history
…lows/docker/metadata-action-5.6.1
  • Loading branch information
SaptarshiSarkar12 authored Nov 20, 2024
2 parents 0ce15c9 + fdfa850 commit 0a57831
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
docker compose build ${{ matrix.image_name_suffix }}
- name: Run Trivy security scan
if: matrix.os == 'ubuntu-latest'
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@0.29.0
continue-on-error: true
with:
image-ref: "drifty-${{ matrix.image_name_suffix }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ jobs:
run: docker build -t ${{ matrix.image_name }} -f Docker/prod/${{ matrix.docker_context }}/Dockerfile build/${{ matrix.docker_context }}

- name: Run Trivy security scan
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@0.29.0
continue-on-error: true
with:
image-ref: ${{ matrix.image_name }}
Expand Down

0 comments on commit 0a57831

Please sign in to comment.