Merge pull request #594 from samalba/disable-cache-mount
Disable cache mount
This commit is contained in:
commit
d19dd4d193
@ -456,11 +456,16 @@ func (p *Pipeline) mount(ctx context.Context, dest string, mnt *compiler.Value)
|
|||||||
case "cache":
|
case "cache":
|
||||||
return llb.AddMount(
|
return llb.AddMount(
|
||||||
dest,
|
dest,
|
||||||
llb.Scratch(),
|
llb.Scratch().File(
|
||||||
llb.AsPersistentCacheDir(
|
llb.Mkdir("/cache", fs.FileMode(0755)),
|
||||||
p.canonicalPath(mnt),
|
llb.WithCustomName(p.vertexNamef("Mkdir /cache (cache mount %s)", dest)),
|
||||||
llb.CacheMountShared,
|
|
||||||
),
|
),
|
||||||
|
// FIXME: disabled persistent cache mount (gh issue #495)
|
||||||
|
// llb.Scratch(),
|
||||||
|
// llb.AsPersistentCacheDir(
|
||||||
|
// p.canonicalPath(mnt),
|
||||||
|
// llb.CacheMountShared,
|
||||||
|
// ),
|
||||||
), nil
|
), nil
|
||||||
case "tmpfs":
|
case "tmpfs":
|
||||||
return llb.AddMount(
|
return llb.AddMount(
|
||||||
|
@ -113,10 +113,10 @@ import (
|
|||||||
"\(dest)": o
|
"\(dest)": o
|
||||||
// FIXME: support source path
|
// FIXME: support source path
|
||||||
}
|
}
|
||||||
for dest in cache {
|
for dest, _ in cache {
|
||||||
"\(dest)": "cache"
|
"\(dest)": "cache"
|
||||||
}
|
}
|
||||||
for dest in tmpfs {
|
for dest, _ in tmpfs {
|
||||||
"\(dest)": "tmpfs"
|
"\(dest)": "tmpfs"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user