From 32f6358d787572e8ca2607c6a746dd0ade27fe09 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Mon, 22 Nov 2021 20:56:29 -0800
Subject: [PATCH] bake: add no-cache-filter

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 bake/bake.go                  | 23 +++++++++++++++--------
 bake/compose.go               |  8 ++++++++
 docs/reference/buildx_bake.md |  4 ++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/bake/bake.go b/bake/bake.go
index 242b2984..114cc3a8 100644
--- a/bake/bake.go
+++ b/bake/bake.go
@@ -524,7 +524,7 @@ type Target struct {
 	Pull             *bool             `json:"pull,omitempty" hcl:"pull,optional"`
 	NoCache          *bool             `json:"no-cache,omitempty" hcl:"no-cache,optional"`
 	NetworkMode      *string           `json:"-" hcl:"-"`
-
+	NoCacheFilter    []string          `json:"no-cache-filter,omitempty" hcl:"no-cache-filter,optional"`
 	// IMPORTANT: if you add more fields here, do not forget to update newOverrides and README.
 }
 
@@ -536,6 +536,7 @@ func (t *Target) normalize() {
 	t.CacheFrom = removeDupes(t.CacheFrom)
 	t.CacheTo = removeDupes(t.CacheTo)
 	t.Outputs = removeDupes(t.Outputs)
+	t.NoCacheFilter = removeDupes(t.NoCacheFilter)
 
 	for k, v := range t.Contexts {
 		if v == "" {
@@ -608,6 +609,9 @@ func (t *Target) Merge(t2 *Target) {
 	if t2.NetworkMode != nil {
 		t.NetworkMode = t2.NetworkMode
 	}
+	if t2.NoCacheFilter != nil { // merge
+		t.NoCacheFilter = append(t.NoCacheFilter, t2.NoCacheFilter...)
+	}
 	t.Inherits = append(t.Inherits, t2.Inherits...)
 }
 
@@ -666,6 +670,8 @@ func (t *Target) AddOverrides(overrides map[string]Override) error {
 				return errors.Errorf("invalid value %s for boolean key no-cache", value)
 			}
 			t.NoCache = &noCache
+		case "no-cache-filter":
+			t.NoCacheFilter = o.ArrValue
 		case "pull":
 			pull, err := strconv.ParseBool(value)
 			if err != nil {
@@ -776,13 +782,14 @@ func toBuildOpt(t *Target, inp *Input) (*build.Options, error) {
 	t.Context = &bi.ContextPath
 
 	bo := &build.Options{
-		Inputs:      bi,
-		Tags:        t.Tags,
-		BuildArgs:   t.Args,
-		Labels:      t.Labels,
-		NoCache:     noCache,
-		Pull:        pull,
-		NetworkMode: networkMode,
+		Inputs:        bi,
+		Tags:          t.Tags,
+		BuildArgs:     t.Args,
+		Labels:        t.Labels,
+		NoCache:       noCache,
+		NoCacheFilter: t.NoCacheFilter,
+		Pull:          pull,
+		NetworkMode:   networkMode,
 	}
 
 	platforms, err := platformutil.Parse(t.Platforms)
diff --git a/bake/compose.go b/bake/compose.go
index 07f2f158..aecd88f9 100644
--- a/bake/compose.go
+++ b/bake/compose.go
@@ -194,6 +194,14 @@ func (t *Target) composeExtTarget(exts map[string]interface{}) error {
 				if res, ok := val.(bool); ok {
 					t.NoCache = &res
 				}
+			case "no-cache-filter":
+				if res, k := val.(string); k {
+					t.NoCacheFilter = append(t.NoCacheFilter, res)
+				} else {
+					for _, res := range val.([]interface{}) {
+						t.NoCacheFilter = append(t.NoCacheFilter, res.(string))
+					}
+				}
 			default:
 				return fmt.Errorf("compose file invalid: unkwown %s field for x-bake", key)
 			}
diff --git a/docs/reference/buildx_bake.md b/docs/reference/buildx_bake.md
index 01439f45..8b3e7180 100644
--- a/docs/reference/buildx_bake.md
+++ b/docs/reference/buildx_bake.md
@@ -340,7 +340,7 @@ target "db" {
 Complete list of valid target fields:
 
 `args`, `cache-from`, `cache-to`, `context`, `contexts`, `dockerfile`, `inherits`, `labels`,
-`no-cache`, `output`, `platform`, `pull`, `secrets`, `ssh`, `tags`, `target`
+`no-cache`, `no-cache-filter`, `output`, `platform`, `pull`, `secrets`, `ssh`, `tags`, `target`
 
 ### Global scope attributes
 
@@ -982,7 +982,7 @@ $ docker buildx bake --print
 Complete list of valid fields for `x-bake`:
 
 `tags`, `cache-from`, `cache-to`, `secret`, `ssh`, `platforms`, `output`,
-`pull`, `no-cache`
+`pull`, `no-cache`, `no-cache-filter`
 
 ### Built-in variables