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

Merge pull request #6 from alexlarsson/fix-ApplyLayer-remove 

archive.ApplyLayer() remove files recursively
This commit is contained in:
Solomon Hykes 2013-11-08 11:46:55 -08:00
parent c1563de7a1 484804abff
commit 78ef0bd998
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archive/diff.go
View File

@ -35,7 +35,7 @@ func ApplyLayer(dest string, layer Archive) error {
return err return err
} else if matched { } else if matched {
log.Printf("Removing aufs metadata %s", fullPath) log.Printf("Removing aufs metadata %s", fullPath)
_ = os.Remove(fullPath) _ = os.RemoveAll(fullPath)
} }
filename := filepath.Base(path) filename := filepath.Base(path)
@ -47,7 +47,7 @@ func ApplyLayer(dest string, layer Archive) error {
_ = os.Remove(rmTargetPath) _ = os.Remove(rmTargetPath)
// Remove the whiteout itself // Remove the whiteout itself
log.Printf("Removing whiteout %s", fullPath) log.Printf("Removing whiteout %s", fullPath)
_ = os.Remove(fullPath) _ = os.RemoveAll(fullPath)
} }
return nil return nil
}) })