Skip to content

Commit 2db1648

Browse files
crazy-maxcrazy-max
authored
Merge pull request #21735 from crazy-max/bake-v6
update bake-action to v6
2 parents 7e1a59e + 7f3611a commit 2db1648

File tree

10 files changed

+27
-45
lines changed

10 files changed

+27
-45
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ jobs:
2323
releaser:
2424
runs-on: ubuntu-24.04
2525
steps:
26-
-
27-
name: Checkout
28-
uses: actions/checkout@v4
2926
-
3027
name: Set up Docker Buildx
3128
uses: docker/setup-buildx-action@v3
@@ -34,7 +31,7 @@ jobs:
3431
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
3532
-
3633
name: Build
37-
uses: docker/bake-action@v5
34+
uses: docker/bake-action@v6
3835
with:
3936
files: |
4037
docker-bake.hcl
@@ -56,8 +53,9 @@ jobs:
5653
uses: docker/setup-buildx-action@v3
5754
-
5855
name: Build
59-
uses: docker/bake-action@v5
56+
uses: docker/bake-action@v6
6057
with:
58+
source: .
6159
files: |
6260
docker-bake.hcl
6361
targets: release
@@ -66,8 +64,9 @@ jobs:
6664
*.cache-to=type=gha,scope=build,mode=max
6765
-
6866
name: Check Cloudfront config
69-
uses: docker/bake-action@v5
67+
uses: docker/bake-action@v6
7068
with:
69+
source: .
7170
targets: aws-cloudfront-update
7271
env:
7372
DRY_RUN: true
@@ -99,20 +98,18 @@ jobs:
9998
- dockerfile-lint
10099
- path-warnings
101100
steps:
102-
-
103-
name: Checkout
104-
uses: actions/checkout@v4
105101
-
106102
name: Set up Docker Buildx
107103
uses: docker/setup-buildx-action@v3
108104
-
109105
name: Validate
110-
uses: docker/bake-action@v5
106+
uses: docker/bake-action@v6
111107
with:
112108
files: |
113109
docker-bake.hcl
114110
targets: ${{ matrix.target }}
115111
set: |
112+
*.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
116113
*.cache-to=type=gha,scope=validate-${{ matrix.target }},mode=max
117114
*.cache-from=type=gha,scope=validate-${{ matrix.target }}
118115
*.cache-from=type=gha,scope=build

‎.github/workflows/deploy.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ jobs:
9090
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
9191
-
9292
name: Build website
93-
uses: docker/bake-action@v5
93+
uses: docker/bake-action@v6
9494
with:
95+
source: .
9596
files: |
9697
docker-bake.hcl
9798
targets: release
@@ -127,8 +128,9 @@ jobs:
127128
-
128129
name: Update S3 config
129130
if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }}
130-
uses: docker/bake-action@v5
131+
uses: docker/bake-action@v6
131132
with:
133+
source: .
132134
files: |
133135
docker-bake.hcl
134136
targets: aws-s3-update-config
@@ -141,8 +143,9 @@ jobs:
141143
-
142144
name: Update Cloudfront config
143145
if: ${{ env.DOCS_CLOUDFRONT_ID != '' }}
144-
uses: docker/bake-action@v5
146+
uses: docker/bake-action@v6
145147
with:
148+
source: .
146149
files: |
147150
docker-bake.hcl
148151
targets: aws-cloudfront-update

‎.github/workflows/validate-upstream.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ jobs:
9090
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
9191
-
9292
name: Validate
93-
uses: docker/bake-action@v5
93+
uses: docker/bake-action@v6
9494
with:
95+
source: .
9596
files: |
9697
docker-bake.hcl
9798
targets: validate-upstream

‎content/manuals/build/bake/remote-definition.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,8 @@ and use the `cwd://` prefix for the metadata Bake file:
174174

175175
```yml
176176
- name: Build
177-
uses: docker/bake-action@v4
177+
uses: docker/bake-action@v6
178178
with:
179-
source: "${{ github.server_url }}/${{ github.repository }}.git#${{ github.ref }}"
180179
files: |
181180
./docker-bake.hcl
182181
cwd://${{ steps.meta.outputs.bake-file }}

‎content/manuals/build/ci/github-actions/annotations.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ jobs:
7272
docker:
7373
runs-on: ubuntu-latest
7474
steps:
75-
- name: Checkout
76-
uses: actions/checkout@v4
77-
7875
- name: Login to Docker Hub
7976
uses: docker/login-action@v3
8077
with:
@@ -91,12 +88,12 @@ jobs:
9188
images: ${{ env.IMAGE_NAME }}
9289

9390
- name: Build
94-
uses: docker/bake-action@v5
91+
uses: docker/bake-action@v6
9592
with:
9693
files: |
9794
./docker-bake.hcl
98-
${{ steps.meta.outputs.bake-file-tags }}
99-
${{ steps.meta.outputs.bake-file-annotations }}
95+
cwd://${{ steps.meta.outputs.bake-file-tags }}
96+
cwd://${{ steps.meta.outputs.bake-file-annotations }}
10097
push: true
10198
```
10299

‎content/manuals/build/ci/github-actions/build-summary.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ or [Docker Buildx Bake](https://github.com/marketplace/actions/docker-buildx-bak
2020
GitHub Actions:
2121

2222
- `docker/build-push-action@v6`
23-
- `docker/bake-action@v5`
23+
- `docker/bake-action@v6`
2424

2525
To view the job summary, open the details page for the job in GitHub after the
2626
job has finished. The summary is available for both failed and successful

‎content/manuals/build/ci/github-actions/checks.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ jobs:
7878
docker:
7979
runs-on: ubuntu-latest
8080
steps:
81-
- name: Checkout
82-
uses: actions/checkout@v4
83-
8481
- name: Login to Docker Hub
8582
uses: docker/login-action@v3
8683
with:
@@ -91,12 +88,12 @@ jobs:
9188
uses: docker/setup-buildx-action@v3
9289
9390
- name: Validate build configuration
94-
uses: docker/bake-action@v5
91+
uses: docker/bake-action@v6
9592
with:
9693
targets: validate-build
9794
9895
- name: Build
99-
uses: docker/bake-action@v5
96+
uses: docker/bake-action@v6
10097
with:
10198
targets: build
10299
push: true

‎content/manuals/build/ci/github-actions/multi-platform.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,6 @@ jobs:
350350
platform=${{ matrix.platform }}
351351
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
352352
353-
- name: Checkout
354-
uses: actions/checkout@v4
355-
356353
- name: Download meta bake definition
357354
uses: actions/download-artifact@v4
358355
with:
@@ -373,11 +370,11 @@ jobs:
373370
374371
- name: Build
375372
id: bake
376-
uses: docker/bake-action@v5
373+
uses: docker/bake-action@v6
377374
with:
378375
files: |
379376
./docker-bake.hcl
380-
/tmp/bake-meta.json
377+
cwd:///tmp/bake-meta.json
381378
targets: image
382379
set: |
383380
*.tags=

‎content/manuals/build/ci/github-actions/reproducible-builds.md‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,11 @@ jobs:
5656
docker:
5757
runs-on: ubuntu-latest
5858
steps:
59-
- name: Checkout
60-
uses: actions/checkout@v4
61-
6259
- name: Set up Docker Buildx
6360
uses: docker/setup-buildx-action@v3
6461
6562
- name: Build
66-
uses: docker/bake-action@v5
63+
uses: docker/bake-action@v6
6764
env:
6865
SOURCE_DATE_EPOCH: 0
6966
```
@@ -115,17 +112,14 @@ jobs:
115112
docker:
116113
runs-on: ubuntu-latest
117114
steps:
118-
- name: Checkout
119-
uses: actions/checkout@v4
120-
121115
- name: Set up Docker Buildx
122116
uses: docker/setup-buildx-action@v3
123117
124118
- name: Get Git commit timestamps
125119
run: echo "TIMESTAMP=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
126120
127121
- name: Build
128-
uses: docker/bake-action@v5
122+
uses: docker/bake-action@v6
129123
env:
130124
SOURCE_DATE_EPOCH: ${{ env.TIMESTAMP }}
131125
```

‎content/manuals/build/ci/github-actions/secrets.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ jobs:
198198
docker:
199199
runs-on: ubuntu-latest
200200
steps:
201-
- name: Checkout
202-
uses: actions/checkout@v4
203-
204201
- name: Set up SSH
205202
uses: MrSquaare/ssh-setup-action@2d028b70b5e397cf8314c6eaea229a6c3e34977a # v3.1.0
206203
with:
@@ -209,7 +206,7 @@ jobs:
209206
private-key-name: github-ppk
210207
211208
- name: Build
212-
uses: docker/bake-action@v5
209+
uses: docker/bake-action@v6
213210
with:
214211
set: |
215212
*.ssh=default

0 commit comments

Comments
 (0)