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

Merge pull request #1147 from tejal29/small_perf 

small perf optimizing. Only remove whiteout path if it needs to be included in base image
This commit is contained in:
Tejal Desai 2020-03-23 18:12:39 -07:00 committed by GitHub
parent d5d20b6087 67db51810b
commit 5da32d3f18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/util/fs_util.go
View File

@ -161,18 +161,15 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e
dir := filepath.Dir(path) dir := filepath.Dir(path)
if strings.HasPrefix(base, ".wh.") { if strings.HasPrefix(base, ".wh.") {
logrus.Debugf("Whiting out %s", path)
name := strings.TrimPrefix(base, ".wh.")
if err := os.RemoveAll(filepath.Join(dir, name)); err != nil {
return nil, errors.Wrapf(err, "removing whiteout %s", hdr.Name)
}
if !cfg.includeWhiteout { if !cfg.includeWhiteout {
logrus.Debug("not including whiteout files") logrus.Debug("not including whiteout files")
continue continue
} }
logrus.Debugf("Whiting out %s", path)
name := strings.TrimPrefix(base, ".wh.")
if err := os.RemoveAll(filepath.Join(dir, name)); err != nil {
return nil, errors.Wrapf(err, "removing whiteout %s", hdr.Name)
}
} }
if err := cfg.extractFunc(root, hdr, tr); err != nil { if err := cfg.extractFunc(root, hdr, tr); err != nil {