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

code review comments

This commit is contained in:
Tejal Desai 2020-01-22 16:27:06 -08:00
parent b271eb8ab9
commit bb129e9c88
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/snapshot/snapshot.go
View File

@ -170,7 +170,7 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
filesToAdd := []string{} filesToAdd := []string{}
for path := range memFs { for path := range memFs {
if util.CheckWhitelist(path) { if util.CheckWhitelist(path) {
logrus.Infof("Not adding %s to layer, as it's whitelisted", path) logrus.Tracef("Not adding %s to layer, as it's whitelisted", path)
continue continue
} }
// Only add changed files. // Only add changed files.
@ -183,7 +183,7 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
logrus.Debugf("Adding files %s to layer, because it was changed.", files) logrus.Tracef("Adding files %s to layer, because it was changed.", files)
filesToAdd = append(filesToAdd, files...) filesToAdd = append(filesToAdd, files...)
} }
} }

5
pkg/util/fs_util.go
View File

@ -719,8 +719,9 @@ func getSymlink(path string) error {
return nil return nil
} }
// otiai10Cpy.Copy in case the src file is a symlink, will copy the target // For cross stage dependencies kaniko must persist the referenced path so that it can be used in
// file at destination instead of creating a symlink. See #915 for more details. // the dependent stage. For symlinks we copy the target path because copying the symlink would
// result in a dead link
func CopyFileOrSymlink(src string, destDir string) error { func CopyFileOrSymlink(src string, destDir string) error {
destFile := filepath.Join(destDir, src) destFile := filepath.Join(destDir, src)
if fi, _ := os.Lstat(src); IsSymlink(fi) { if fi, _ := os.Lstat(src); IsSymlink(fi) {