Skip to content

Commit 4e217ae

Browse files
authored
Merge pull request docker#5737 from crazy-max/bake-v6
ci: update bake-action to v6
2 parents 8e365dd + cc57190 commit 4e217ae

File tree

4 files changed

+15
-29
lines changed

4 files changed

+15
-29
lines changed

.github/workflows/build.yml

+10-21
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,12 @@ jobs:
6161
- ""
6262
- glibc
6363
steps:
64-
-
65-
name: Checkout
66-
uses: actions/checkout@v4
67-
with:
68-
fetch-depth: 0
6964
-
7065
name: Set up Docker Buildx
7166
uses: docker/setup-buildx-action@v3
7267
-
7368
name: Build
74-
uses: docker/bake-action@v5
69+
uses: docker/bake-action@v6
7570
with:
7671
targets: ${{ matrix.target }}
7772
set: |
@@ -104,8 +99,12 @@ jobs:
10499
if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }}
105100
steps:
106101
-
107-
name: Checkout
108-
uses: actions/checkout@v4
102+
name: Login to DockerHub
103+
if: github.event_name != 'pull_request'
104+
uses: docker/login-action@v3
105+
with:
106+
username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}
107+
password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
109108
-
110109
name: Set up QEMU
111110
uses: docker/setup-qemu-action@v3
@@ -123,20 +122,13 @@ jobs:
123122
type=ref,event=branch
124123
type=ref,event=pr
125124
type=sha
126-
-
127-
name: Login to DockerHub
128-
if: github.event_name != 'pull_request'
129-
uses: docker/login-action@v3
130-
with:
131-
username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}
132-
password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
133125
-
134126
name: Build and push image
135-
uses: docker/bake-action@v5
127+
uses: docker/bake-action@v6
136128
with:
137129
files: |
138130
./docker-bake.hcl
139-
${{ steps.meta.outputs.bake-file }}
131+
cwd://${{ steps.meta.outputs.bake-file }}
140132
targets: bin-image-cross
141133
push: ${{ github.event_name != 'pull_request' }}
142134
set: |
@@ -170,15 +162,12 @@ jobs:
170162
matrix:
171163
platform: ${{ fromJson(needs.prepare-plugins.outputs.matrix) }}
172164
steps:
173-
-
174-
name: Checkout
175-
uses: actions/checkout@v4
176165
-
177166
name: Set up Docker Buildx
178167
uses: docker/setup-buildx-action@v3
179168
-
180169
name: Build
181-
uses: docker/bake-action@v5
170+
uses: docker/bake-action@v6
182171
with:
183172
targets: plugins-cross
184173
set: |

.github/workflows/test.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ jobs:
2727
ctn:
2828
runs-on: ubuntu-24.04
2929
steps:
30-
-
31-
name: Checkout
32-
uses: actions/checkout@v4
3330
-
3431
name: Set up Docker Buildx
3532
uses: docker/setup-buildx-action@v3
3633
-
3734
name: Test
38-
uses: docker/bake-action@v5
35+
uses: docker/bake-action@v6
3936
with:
4037
targets: test-coverage
4138
-

.github/workflows/validate.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,9 @@ jobs:
3535
- validate-vendor
3636
- update-authors # ensure authors update target runs fine
3737
steps:
38-
-
39-
name: Checkout
40-
uses: actions/checkout@v4
4138
-
4239
name: Run
43-
uses: docker/bake-action@v5
40+
uses: docker/bake-action@v6
4441
with:
4542
targets: ${{ matrix.target }}
4643

docker-bake.hcl

+3
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,19 @@ target "update-authors" {
141141
}
142142

143143
target "test" {
144+
inherits = ["_common"]
144145
target = "test"
145146
output = ["type=cacheonly"]
146147
}
147148

148149
target "test-coverage" {
150+
inherits = ["_common"]
149151
target = "test-coverage"
150152
output = ["build/coverage"]
151153
}
152154

153155
target "e2e-image" {
156+
inherits = ["_common"]
154157
target = "e2e"
155158
output = ["type=docker"]
156159
tags = ["${IMAGE_NAME}"]

0 commit comments

Comments
 (0)