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

Remove extra symlink check

This commit is contained in:
Priya Wadhwa 2018-08-30 10:13:06 -07:00
parent 85393a60c2
commit e0130c5942
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/util/fs_util.go
View File

@ -61,7 +61,6 @@ func GetFSFromImage(root string, img v1.Image) error {
return err return err
} }
tr := tar.NewReader(r) tr := tar.NewReader(r)
symlinks := []*tar.Header{}
for { for {
hdr, err := tr.Next() hdr, err := tr.Next()
if err == io.EOF { if err == io.EOF {
@ -98,18 +97,11 @@ func GetFSFromImage(root string, img v1.Image) error {
logrus.Debugf("skipping symlink from %s to %s because %s is whitelisted", hdr.Linkname, path, hdr.Linkname) logrus.Debugf("skipping symlink from %s to %s because %s is whitelisted", hdr.Linkname, path, hdr.Linkname)
continue continue
} }
symlinks = append(symlinks, hdr)
continue
} }
if err := extractFile(root, hdr, tr); err != nil { if err := extractFile(root, hdr, tr); err != nil {
return err return err
} }
} }
for _, s := range symlinks {
if err := extractFile(root, s, nil); err != nil {
return errors.Wrapf(err, "extracting symlink %s", s.Name)
}
}
} }
return nil return nil
} }