From 35f5f9e624e44c5e5586dfddacfc87a7b2f02953 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Thu, 25 Feb 2021 01:14:37 +0000 Subject: [PATCH] builder: fix incorrect cache match for inline cache with empty layers See https://github.com/moby/buildkit/pull/1993 Signed-off-by: Tibor Vass (cherry picked from commit 9bf93e90fa9ce74b6f7309a22838da8189838b3b) Signed-off-by: Tibor Vass --- .../builder-next/adapters/localinlinecache/inlinecache.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builder/builder-next/adapters/localinlinecache/inlinecache.go b/builder/builder-next/adapters/localinlinecache/inlinecache.go index 0c51e207e6..c5e19ce2d5 100644 --- 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 {