builder: fix incorrect cache match for inline cache with empty layers

See moby/buildkit#1993 Signed-off-by: Tibor Vass <[email protected]>
thaJeztah · Feb 25, 2021 · 9bf93e9 · 9bf93e9
1 parent 9962a3f
commit 9bf93e9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/builder/builder-next/adapters/localinlinecache/inlinecache.go b/builder/builder-next/adapters/localinlinecache/inlinecache.go
@@ -22,6 +22,11 @@ import (
 	"github.com/pkg/errors"
 )
 
+func init() {
+	// See https://github.com/moby/buildkit/pull/1993.
+	v1.EmptyLayerRemovalSupported = false
+}
+
 // ResolveCacheImporterFunc returns a resolver function for local inline cache
 func ResolveCacheImporterFunc(sm *session.Manager, resolverFunc docker.RegistryHosts, cs content.Store, rs reference.Store, is imagestore.Store) remotecache.ResolveCacheImporterFunc {