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/__tests__/.fixtures/bake-03-default.json b/__tests__/.fixtures/bake-03-default.json index 89ddf047..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": ".", @@ -9,7 +16,7 @@ "type": "provenance" }, { - "disabled": "true", + "disabled": true, "type": "sbom" } ], diff --git a/dev.Dockerfile b/dev.Dockerfile index 3fa136d7..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.19.3 +ARG BUILDX_VERSION=0.20.1 ARG COMPOSE_VERSION=2.32.4 ARG UNDOCK_VERSION=0.8.0 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 {