public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix https://github.com/GoogleContainerTools/kaniko/issues/756

This commit is contained in:
Антон Костенко 2019-09-10 00:44:27 +02:00
parent 38c05bae6d
commit a1cc42bdb7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/util/fs_util.go
View File

@ -121,6 +121,10 @@ func DeleteFilesystem() error {
logrus.Info("Deleting filesystem...") logrus.Info("Deleting filesystem...")
return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, _ error) error { return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, _ error) error {
if CheckWhitelist(path) { if CheckWhitelist(path) {
if ! isExist(path) {
logrus.Debugf("Path %s whitelisted, but not exists", path)
return nil
}
if info.IsDir() { if info.IsDir() {
return filepath.SkipDir return filepath.SkipDir
} }
@ -137,6 +141,13 @@ func DeleteFilesystem() error {
return os.RemoveAll(path) return os.RemoveAll(path)
}) })
} }
// isExists returns tru if path exists
func isExist(path string) bool {
if _, err := os.Stat(path); err == nil {
return true
}
return false
}
// ChildDirInWhitelist returns true if there is a child file or directory of the path in the whitelist // ChildDirInWhitelist returns true if there is a child file or directory of the path in the whitelist
func childDirInWhitelist(path string) bool { func childDirInWhitelist(path string) bool {