Merge pull request #572 from crazy-max/update-buildkit-buildx

update buildkit to 0.19.0 and buildx to 0.20.1
docker · Jan 23, 2025 · 2c62255 · 2c62255
2 parents ed7e9a4 + dd0f91b
commit 2c62255
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 {