Skip to content

Commit 6b5cda4

Browse files
authored
Merge branch 'main' into dependabot/github_actions/docker/setup-qemu-action-3.5.0
2 parents 9f6ecf7 + 48723f7 commit 6b5cda4

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/docker-build-push.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
2525
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
26-
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
26+
- uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
2727
id: meta
2828
with:
2929
images: ${{ github.repository_owner }}/${{ env.IMAGE }}
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
username: ${{ secrets.DOCKERHUB_USERNAME }}
4343
password: ${{ secrets.DOCKERHUB_TOKEN }}
44-
- uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
44+
- uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
4545
id: build
4646
with:
4747
context: ${{ env.IMAGE }}
@@ -52,8 +52,10 @@ jobs:
5252
tags: ${{ steps.meta.outputs.tags }}
5353
labels: ${{ steps.meta.outputs.labels }}
5454
- name: Install cosign
55+
if: github.ref == 'refs/heads/main'
5556
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
5657
- name: Sign the Docker image
58+
if: github.ref == 'refs/heads/main'
5759
working-directory: ${{ env.IMAGE }}
5860
env:
5961
DIGEST: ${{ steps.build.outputs.digest }}

.github/workflows/docker-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
- uses: docker/setup-qemu-action@5964de0df58d5ad28b04d8fe2e6b80ad47105b91 # v3.5.0
2222
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
23-
- uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
23+
- uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
2424
id: meta
2525
with:
2626
images: ${{ github.repository_owner }}/${{ env.IMAGE }}
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
username: ${{ secrets.DOCKERHUB_USERNAME }}
3838
password: ${{ secrets.DOCKERHUB_TOKEN }}
39-
- uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
39+
- uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
4040
id: build
4141
with:
4242
context: ${{ env.IMAGE }}

0 commit comments

Comments
 (0)