bake: support composable attributes

Signed-off-by: CrazyMax <[email protected]>
docker · Nov 27, 2024 · aa2455e · aa2455e
1 parent 670488c
commit aa2455e
Show file tree

Hide file tree

Showing 8 changed files with 362 additions and 143 deletions.
diff --git a/__tests__/.fixtures/bake-01-overrides.json b/__tests__/.fixtures/bake-01-overrides.json
@@ -22,7 +22,9 @@
         "linux/amd64"
       ],
       "output": [
-        "type=docker"
+        {
+          "type": "docker"
+        }
       ]
     }
   }

diff --git a/__tests__/.fixtures/bake-01-validate.json b/__tests__/.fixtures/bake-01-validate.json
@@ -22,7 +22,9 @@
         "GO_VERSION": "1.20"
       },
       "output": [
-        "type=cacheonly"
+        {
+          "type": "cacheonly"
+        }
       ]
     },
     "validate-docs": {
@@ -36,7 +38,9 @@
       },
       "target": "validate",
       "output": [
-        "type=cacheonly"
+        {
+          "type": "cacheonly"
+        }
       ]
     },
     "validate-vendor": {
@@ -48,7 +52,9 @@
       },
       "target": "validate",
       "output": [
-        "type=cacheonly"
+        {
+          "type": "cacheonly"
+        }
       ]
     }
   }

diff --git a/__tests__/.fixtures/bake-03-default.json b/__tests__/.fixtures/bake-03-default.json
@@ -0,0 +1,38 @@
+{
+  "target": {
+    "default": {
+      "context": ".",
+      "dockerfile": "Dockerfile",
+      "cache-from": [
+        {
+          "scope": "build",
+          "type": "gha"
+        },
+        {
+          "ref": "user/repo:cache",
+          "type": "registry"
+        }
+      ],
+      "cache-to": [
+        {
+          "mode": "max",
+          "scope": "build",
+          "type": "gha"
+        },
+        {
+          "type": "inline"
+        }
+      ],
+      "output": [
+        {
+          "dest": "./release-out",
+          "type": "local"
+        },
+        {
+          "ref": "user/app",
+          "type": "registry"
+        }
+      ]
+    }
+  }
+}
diff --git a/__tests__/.fixtures/bake-03.hcl b/__tests__/.fixtures/bake-03.hcl
@@ -0,0 +1,14 @@
+target "default" {
+  cache-from = [
+    "type=gha,scope=build",
+    "user/repo:cache",
+  ]
+  cache-to = [
+    "type=gha,scope=build,mode=max",
+    "type=inline"
+  ]
+  output = [
+    "./release-out",
+    "type=registry,ref=user/app"
+  ]
+}
diff --git a/__tests__/.fixtures/bake-buildx-0.10.4-binaries-cross.json b/__tests__/.fixtures/bake-buildx-0.10.4-binaries-cross.json
@@ -29,7 +29,10 @@
         "windows/arm64"
       ],
       "output": [
-        "./bin/build"
+        {
+          "dest": "./bin/build",
+          "type": "local"
+        }
       ]
     }
   }