JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2390 from ktock/overlaydiff-fuse-overlayfs 

Do not enable overlayfs differ for fuse-overlayfs-snapshotter
master
Tõnis Tiigi 2021-10-03 22:03:44 -07:00 committed by GitHub
parent d429b0b326 9ffd7f24cb
commit ee1ad6893a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cache/blobs.go vendored
View File

@ -126,8 +126,13 @@ func computeBlobChain(ctx context.Context, sr *immutableRef, createIfNeeded bool
} else if !isTypeWindows(sr) { } else if !isTypeWindows(sr) {
enableOverlay, fallback = true, true enableOverlay, fallback = true, true
switch sr.cm.ManagerOpt.Snapshotter.Name() { switch sr.cm.ManagerOpt.Snapshotter.Name() {
case "overlayfs", "fuse-overlayfs", "stargz": case "overlayfs", "stargz":
logWarnOnErr = true // snapshotter should support overlay diff. so print warn log on failure // overlayfs-based snapshotters should support overlay diff. so print warn log on failure.
logWarnOnErr = true
case "fuse-overlayfs":
// not supported with fuse-overlayfs snapshotter which doesn't provide overlayfs mounts.
// TODO: add support for fuse-overlayfs
enableOverlay = false
} }
} }
if enableOverlay { if enableOverlay {