builder: fix incorrect cache match for inline cache with empty layers
See https://github.com/moby/buildkit/pull/1993
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 9bf93e90fa9ce74b6f7309a22838da8189838b3b)
Signed-off-by: Tibor Vass <tibor@docker.com>
diff --git a/builder/builder-next/adapters/localinlinecache/inlinecache.go b/builder/builder-next/adapters/localinlinecache/inlinecache.go
index 0c51e20..c5e19ce 100644
--- a/builder/builder-next/adapters/localinlinecache/inlinecache.go
+++ b/builder/builder-next/adapters/localinlinecache/inlinecache.go
@@ -22,6 +22,11 @@
"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 {
