bake: contexts support with x-bake

Signed-off-by: CrazyMax <[email protected]>
docker · Aug 4, 2022 · b63111f · b63111f
1 parent 18023d7
commit b63111f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/bake/compose.go b/bake/compose.go
@@ -141,16 +141,17 @@ func flatten(in compose.MappingWithEquals) compose.Mapping {
 // xbake Compose build extension provides fields not (yet) available in
 // Compose build specification: https://github.com/compose-spec/compose-spec/blob/master/build.md
 type xbake struct {
-	Tags          stringArray `yaml:"tags,omitempty"`
-	CacheFrom     stringArray `yaml:"cache-from,omitempty"`
-	CacheTo       stringArray `yaml:"cache-to,omitempty"`
-	Secrets       stringArray `yaml:"secret,omitempty"`
-	SSH           stringArray `yaml:"ssh,omitempty"`
-	Platforms     stringArray `yaml:"platforms,omitempty"`
-	Outputs       stringArray `yaml:"output,omitempty"`
-	Pull          *bool       `yaml:"pull,omitempty"`
-	NoCache       *bool       `yaml:"no-cache,omitempty"`
-	NoCacheFilter stringArray `yaml:"no-cache-filter,omitempty"`
+	Tags          stringArray       `yaml:"tags,omitempty"`
+	CacheFrom     stringArray       `yaml:"cache-from,omitempty"`
+	CacheTo       stringArray       `yaml:"cache-to,omitempty"`
+	Secrets       stringArray       `yaml:"secret,omitempty"`
+	SSH           stringArray       `yaml:"ssh,omitempty"`
+	Platforms     stringArray       `yaml:"platforms,omitempty"`
+	Outputs       stringArray       `yaml:"output,omitempty"`
+	Pull          *bool             `yaml:"pull,omitempty"`
+	NoCache       *bool             `yaml:"no-cache,omitempty"`
+	NoCacheFilter stringArray       `yaml:"no-cache-filter,omitempty"`
+	Contexts      map[string]string `yaml:"contexts,omitempty"`
 	// don't forget to update documentation if you add a new field:
 	// docs/guides/bake/compose-file.md#extension-field-with-x-bake
 }
@@ -217,6 +218,9 @@ func (t *Target) composeExtTarget(exts map[string]interface{}) error {
 	if len(xb.NoCacheFilter) > 0 {
 		t.NoCacheFilter = dedupString(append(t.NoCacheFilter, xb.NoCacheFilter...))
 	}
+	if len(xb.Contexts) > 0 {
+		t.Contexts = dedupMap(t.Contexts, xb.Contexts)
+	}
 
 	return nil
 }
@@ -263,3 +267,21 @@ func composeToBuildkitSecret(inp compose.ServiceSecretConfig, psecret compose.Se
 
 	return strings.Join(bkattrs, ","), nil
 }
+
+func dedupMap(ms ...map[string]string) map[string]string {
+	if len(ms) == 0 {
+		return nil
+	}
+	res := map[string]string{}
+	for _, m := range ms {
+		if len(m) == 0 {
+			continue
+		}
+		for k, v := range m {
+			if _, ok := res[k]; !ok {
+				res[k] = v
+			}
+		}
+	}
+	return res
+}
diff --git a/bake/compose_test.go b/bake/compose_test.go
@@ -267,6 +267,8 @@ services:
         CT_ECR: foo
         CT_TAG: bar
       x-bake:
+        contexts:
+          alpine: docker-image://alpine:3.13
         tags:
           - ct-addon:foo
           - ct-addon:alp
@@ -308,6 +310,7 @@ services:
 	require.Equal(t, c.Targets[0].CacheFrom, []string{"user/app:cache", "type=local,src=path/to/cache"})
 	require.Equal(t, c.Targets[0].CacheTo, []string{"user/app:cache", "type=local,dest=path/to/cache"})
 	require.Equal(t, c.Targets[0].Pull, newBool(true))
+	require.Equal(t, c.Targets[0].Contexts, map[string]string{"alpine": "docker-image://alpine:3.13"})
 	require.Equal(t, c.Targets[1].Tags, []string{"ct-fake-aws:bar"})
 	require.Equal(t, c.Targets[1].Secrets, []string{"id=mysecret,src=/local/secret", "id=mysecret2,src=/local/secret2"})
 	require.Equal(t, c.Targets[1].SSH, []string{"default"})

diff --git a/docs/guides/bake/compose-file.md b/docs/guides/bake/compose-file.md
@@ -209,6 +209,7 @@ Complete list of valid fields for `x-bake`:
 
 * `cache-from`
 * `cache-to`
+* `contexts`
 * `no-cache`
 * `no-cache-filter`
 * `output`