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

Merge pull request #461 from priyawadhwa/etc-bug 

Only return filepath.SkipDir for directories
This commit is contained in:
priyawadhwa 2018-11-19 22:15:26 -08:00 committed by GitHub
parent a7599d1563 2a359f547c
commit ade42d9105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration/dockerfiles/Dockerfile_test_whitelist Normal file
View File

@ -0,0 +1,11 @@
# Make sure that whitelisting (specifically, filepath.SkipDir) works correctly, and that /var/test/testfile and
# /etc/test/testfile end up in the final image
FROM debian@sha256:38236c068c393272ad02db100e09cac36a5465149e2924a035ee60d6c60c38fe
RUN mkdir -p /var/test \
&& mkdir -p /etc/test \
&& touch /var/test/testfile \
&& touch /etc/test/testfile \
&& ls -lah /var/test \
&& ls -lah /etc/test;

3
pkg/snapshot/snapshot.go
View File

@ -147,9 +147,12 @@ func (s *Snapshotter) TakeSnapshotFS() (string, error) {
return err return err
} }
if util.IsInWhitelist(path) { if util.IsInWhitelist(path) {
if util.IsDestDir(path) {
logrus.Infof("Skipping paths under %s, as it is a whitelisted directory", path) logrus.Infof("Skipping paths under %s, as it is a whitelisted directory", path)
return filepath.SkipDir return filepath.SkipDir
} }
return nil
}
memFs[path] = info memFs[path] = info
return nil return nil