Skip to content

Commit

Permalink
Merge branch 'main' into renovate/docker-metadata-action-5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
davidspek authored Sep 21, 2023
2 parents facac47 + 3a48ac7 commit 0d74502
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
actions: read
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # No shallow clone, we need all history
- name: Set tag output
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
username: [email protected]
password: ${{ secrets.PLURAL_ACCESS_TOKEN }}
- name: Build ${{ steps.tag.outputs.app }} image for security scanning
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ steps.tag.outputs.app }}
file: "${{ steps.tag.outputs.app }}/Dockerfile"
Expand All @@ -134,7 +134,7 @@ jobs:
with:
sarif_file: 'trivy-results.sarif'
- name: Build ${{ steps.tag.outputs.app }} image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ steps.tag.outputs.app }}
file: "${{ steps.tag.outputs.app }}/Dockerfile"
Expand All @@ -153,7 +153,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in IaC mode
uses: aquasecurity/trivy-action@master
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
actions: read
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # No shallow clone, we need all history
- name: Set tag output
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build ${{ steps.tag.outputs.app }} image for security scanning
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ${{ steps.tag.outputs.app }}
file: "${{ steps.tag.outputs.app }}/Dockerfile"
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in IaC mode
uses: aquasecurity/trivy-action@master
with:
Expand All @@ -114,7 +114,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PLURAL_BOT_PAT }}
Expand Down

0 comments on commit 0d74502

Please sign in to comment.