mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-04 20:51:44 +00:00
ApplyLayer() use RemoveAll to handle removing directories
rmTargetPath can be a directory, so we have to use RemoveAll() or we will fail to whiteout non-empty directories.
This commit is contained in:
+1
-1
@@ -49,7 +49,7 @@ func ApplyLayer(dest string, layer Archive) error {
|
||||
rmTargetPath := filepath.Join(filepath.Dir(fullPath), rmTargetName)
|
||||
// Remove the file targeted by the whiteout
|
||||
log.Printf("Removing whiteout target %s", rmTargetPath)
|
||||
_ = os.Remove(rmTargetPath)
|
||||
_ = os.RemoveAll(rmTargetPath)
|
||||
// Remove the whiteout itself
|
||||
log.Printf("Removing whiteout %s", fullPath)
|
||||
_ = os.RemoveAll(fullPath)
|
||||
|
||||
Reference in New Issue
Block a user