mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-04 04:31:28 +00:00
archive.ApplyLayer() remove files recursively
Some aufs metadata are directories, and whiteouts can be for directories, so use os.RemoveAll() for these.
This commit is contained in:
+2
-2
@@ -35,7 +35,7 @@ func ApplyLayer(dest string, layer Archive) error {
|
||||
return err
|
||||
} else if matched {
|
||||
log.Printf("Removing aufs metadata %s", fullPath)
|
||||
_ = os.Remove(fullPath)
|
||||
_ = os.RemoveAll(fullPath)
|
||||
}
|
||||
|
||||
filename := filepath.Base(path)
|
||||
@@ -47,7 +47,7 @@ func ApplyLayer(dest string, layer Archive) error {
|
||||
_ = os.Remove(rmTargetPath)
|
||||
// Remove the whiteout itself
|
||||
log.Printf("Removing whiteout %s", fullPath)
|
||||
_ = os.Remove(fullPath)
|
||||
_ = os.RemoveAll(fullPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user