From 09617b89da523827225758e416377b62f38e54c8 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Wed, 9 Jun 2021 15:22:06 +0200 Subject: [PATCH] core: replaced persistent cache mounts with directory Signed-off-by: Sam Alba --- environment/pipeline.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/environment/pipeline.go b/environment/pipeline.go index 08c4f74b..db6e9012 100644 --- a/environment/pipeline.go +++ b/environment/pipeline.go @@ -456,11 +456,16 @@ func (p *Pipeline) mount(ctx context.Context, dest string, mnt *compiler.Value) case "cache": return llb.AddMount( dest, - llb.Scratch(), - llb.AsPersistentCacheDir( - p.canonicalPath(mnt), - llb.CacheMountShared, + llb.Scratch().File( + llb.Mkdir("/cache", fs.FileMode(0755)), + llb.WithCustomName(p.vertexNamef("Mkdir /cache (cache mount %s)", dest)), ), + // FIXME: disabled persistent cache mount (gh issue #495) + // llb.Scratch(), + // llb.AsPersistentCacheDir( + // p.canonicalPath(mnt), + // llb.CacheMountShared, + // ), ), nil case "tmpfs": return llb.AddMount(