From ed5ad08108ae40cfb6700ea915b4ed1389b167a8 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 20 Jan 2025 20:36:57 +0100 Subject: [PATCH 1/4] update buildkit to 0.19.0 and buildx to 0.20.0 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- dev.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa3efad3..707de427 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ on: env: NODE_VERSION: "20" BUILDX_VERSION: "edge" - BUILDKIT_IMAGE: "moby/buildkit:v0.18.2" + BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" jobs: test: diff --git a/dev.Dockerfile b/dev.Dockerfile index 3fa136d7..f19b2c98 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -16,7 +16,7 @@ ARG NODE_VERSION=20 ARG DOCKER_VERSION=27.2.1 -ARG BUILDX_VERSION=0.19.3 +ARG BUILDX_VERSION=0.20.0 ARG COMPOSE_VERSION=2.32.4 ARG UNDOCK_VERSION=0.8.0 From 4b68aa828ad4e32a9d26b7587bd703fa655ba92e Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:25:43 +0100 Subject: [PATCH 2/4] bake: fix attest disabled attribute Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/.fixtures/bake-03-default.json | 2 +- src/buildx/bake.ts | 3 +++ src/types/buildx/bake.ts | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/__tests__/.fixtures/bake-03-default.json b/__tests__/.fixtures/bake-03-default.json index 89ddf047..2f29ff22 100644 --- a/__tests__/.fixtures/bake-03-default.json +++ b/__tests__/.fixtures/bake-03-default.json @@ -9,7 +9,7 @@ "type": "provenance" }, { - "disabled": "true", + "disabled": true, "type": "sbom" } ], diff --git a/src/buildx/bake.ts b/src/buildx/bake.ts index ebb67e0c..36cc0cdd 100644 --- a/src/buildx/bake.ts +++ b/src/buildx/bake.ts @@ -238,6 +238,9 @@ export class Bake { case 'type': attestEntry.type = value; break; + case 'disabled': + attestEntry.disabled = Util.parseBool(value); + break; default: attestEntry[key] = value; } diff --git a/src/types/buildx/bake.ts b/src/types/buildx/bake.ts index 9f647c07..0bbba86a 100644 --- a/src/types/buildx/bake.ts +++ b/src/types/buildx/bake.ts @@ -52,7 +52,8 @@ export interface Target { export interface AttestEntry { type: string; - [key: string]: string; + disabled?: string | boolean; + [key: string]: string | boolean | undefined; } export interface CacheEntry { From 0bcd5b25a271da8d1d5d984d9cde024bcde22031 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:30:40 +0100 Subject: [PATCH 3/4] bake: fix missing default target in group's default targets Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/.fixtures/bake-03-default.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/__tests__/.fixtures/bake-03-default.json b/__tests__/.fixtures/bake-03-default.json index 2f29ff22..887cfdad 100644 --- a/__tests__/.fixtures/bake-03-default.json +++ b/__tests__/.fixtures/bake-03-default.json @@ -1,4 +1,11 @@ { + "group": { + "default": { + "targets": [ + "default" + ] + } + }, "target": { "default": { "context": ".", From dd0f91b30b7bdd5125e4e28b313e28e309f506db Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 22 Jan 2025 15:25:04 -0800 Subject: [PATCH 4/4] update buildx to v0.20.1 Signed-off-by: Tonis Tiigi --- dev.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index f19b2c98..7be36e3e 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -16,7 +16,7 @@ ARG NODE_VERSION=20 ARG DOCKER_VERSION=27.2.1 -ARG BUILDX_VERSION=0.20.0 +ARG BUILDX_VERSION=0.20.1 ARG COMPOSE_VERSION=2.32.4 ARG UNDOCK_VERSION=0.8.0