Skip to content

Commit 991a2e4

Browse files
chore(deps): bump docker/bake-action from 5.11.0 to 6.3.0 (#292)
* chore(deps): bump docker/bake-action from 5.11.0 to 6.3.0 Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.11.0 to 6.3.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](docker/bake-action@v5.11.0...v6.3.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: CI bake config * fix: Remove labels from step meta * fix: Add labels * fix: CI config * ci: Add annotations and update ubuntu to 24.04 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oleg Balunenko <oleg.balunenko@gmail.com>
1 parent 18fc047 commit 991a2e4

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

.github/workflows/build-lint.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
[
3030
"Dockerfile",
3131
]
32-
runs-on: "ubuntu-22.04"
32+
runs-on: "ubuntu-24.04"
3333
name: Lint ${{ matrix.dockerfile }}
3434
steps:
3535
- name: Checkout
@@ -45,7 +45,7 @@ jobs:
4545
error_level: 2
4646

4747
check-release-config:
48-
runs-on: 'ubuntu-22.04'
48+
runs-on: 'ubuntu-24.04'
4949
name: Check releaser configs
5050
steps:
5151
- name: Checkout
@@ -71,7 +71,7 @@ jobs:
7171
build:
7272
needs: [ lint-dockerfiles, check-release-config ]
7373
name: Build
74-
runs-on: "ubuntu-22.04"
74+
runs-on: "ubuntu-24.04"
7575
steps:
7676
- name: Checkout repository
7777
uses: actions/checkout@v4
@@ -97,14 +97,17 @@ jobs:
9797
type=semver,pattern={{major}}
9898
9999
- name: Build Docker image
100-
uses: docker/bake-action@v5.11.0
100+
uses: docker/bake-action@v6.3.0
101101
env:
102-
TAGS: ${{ steps.meta.outputs.tags }}
103-
LABELS: ${{ steps.meta.outputs.labels }}
102+
TAGS: ${{ steps.meta.outputs.bake-file-tags }}
103+
LABELS: ${{ steps.meta.outputs.bake-file-labels }}
104+
ANNOTATIONS: ${{ steps.meta.outputs.bake-file-annotations }}
104105
with:
105106
files: |
106107
./docker-bake.hcl
107-
${{ steps.meta.outputs.bake-file }}
108+
cwd://${{ env.TAGS }}
109+
cwd://${{ env.LABELS }}
110+
cwd://${{ env.ANNOTATIONS }}
108111
push: false
109112
pull: true
110113

.github/workflows/release.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
bake-images:
1414
name: Build and push
15-
runs-on: 'ubuntu-22.04'
15+
runs-on: 'ubuntu-24.04'
1616
permissions:
1717
contents: read
1818
packages: write
@@ -52,20 +52,23 @@ jobs:
5252
type=sha
5353
5454
- name: Build and push Docker images
55-
uses: docker/bake-action@v5.11.0
55+
uses: docker/bake-action@v6.3.0
5656
env:
57-
TAGS: ${{ steps.meta.outputs.tags }}
58-
LABELS: ${{ steps.meta.outputs.labels }}
57+
TAGS: ${{ steps.meta.outputs.bake-file-tags }}
58+
LABELS: ${{ steps.meta.outputs.bake-file-labels }}
59+
ANNOTATIONS: ${{ steps.meta.outputs.bake-file-annotations }}
5960
with:
6061
files: |
6162
./docker-bake.hcl
62-
${{ steps.meta.outputs.bake-file }}
63+
cwd://${{ env.TAGS }}
64+
cwd://${{ env.LABELS }}
65+
cwd://${{ env.ANNOTATIONS }}
6366
push: ${{ github.event_name != 'pull_request' }}
6467
pull: true
6568

6669
release-notes:
6770
needs: [ bake-images ]
68-
runs-on: 'ubuntu-22.04'
71+
runs-on: 'ubuntu-24.04'
6972
name: Release notes
7073
steps:
7174
- name: Set up go

docker-bake.hcl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ target "gotools-latest" {
3030
inherits = ["docker-metadata-action"]
3131
dockerfile = "Dockerfile"
3232
context = "."
33-
platforms = ["linux/amd64", "linux/arm64"]
33+
platforms = [
34+
"linux/amd64",
35+
"linux/arm64"
36+
]
3437
labels = {
3538
"org.opencontainers.image.title" = "${IMAGE_TITLE}"
3639
"org.opencontainers.image.description" = "${IMAGE_DESCRIPTION}"

0 commit comments

Comments
 (0)