commit
200a0eabdd
|
|
@ -134,7 +134,7 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
|
||||||
Callback: func(path string, ent *godirwalk.Dirent) error {
|
Callback: func(path string, ent *godirwalk.Dirent) error {
|
||||||
if util.IsInWhitelist(path) {
|
if util.IsInWhitelist(path) {
|
||||||
if util.IsDestDir(path) {
|
if util.IsDestDir(path) {
|
||||||
logrus.Debugf("Skipping paths under %s, as it is a whitelisted directory", path)
|
logrus.Tracef("Skipping paths under %s, as it is a whitelisted directory", path)
|
||||||
return filepath.SkipDir
|
return filepath.SkipDir
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -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.Debugf("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.
|
||||||
|
|
@ -179,7 +179,7 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
|
||||||
return nil, nil, fmt.Errorf("could not check if file has changed %s %s", path, err)
|
return nil, nil, fmt.Errorf("could not check if file has changed %s %s", path, err)
|
||||||
}
|
}
|
||||||
if fileChanged {
|
if fileChanged {
|
||||||
logrus.Debugf("Adding %s to layer, because it was changed.", path)
|
logrus.Tracef("Adding %s to layer, because it was changed.", path)
|
||||||
filesToAdd = append(filesToAdd, path)
|
filesToAdd = append(filesToAdd, path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ func ExtractFile(dest string, hdr *tar.Header, tr io.Reader) error {
|
||||||
}
|
}
|
||||||
switch hdr.Typeflag {
|
switch hdr.Typeflag {
|
||||||
case tar.TypeReg:
|
case tar.TypeReg:
|
||||||
logrus.Debugf("creating file %s", path)
|
logrus.Tracef("creating file %s", path)
|
||||||
// It's possible a file is in the tar before its directory,
|
// It's possible a file is in the tar before its directory,
|
||||||
// or a file was copied over a directory prior to now
|
// or a file was copied over a directory prior to now
|
||||||
fi, err := os.Stat(dir)
|
fi, err := os.Stat(dir)
|
||||||
|
|
@ -510,7 +510,7 @@ func CopyDir(src, dest, buildcontext string) ([]string, error) {
|
||||||
}
|
}
|
||||||
destPath := filepath.Join(dest, file)
|
destPath := filepath.Join(dest, file)
|
||||||
if fi.IsDir() {
|
if fi.IsDir() {
|
||||||
logrus.Debugf("Creating directory %s", destPath)
|
logrus.Tracef("Creating directory %s", destPath)
|
||||||
|
|
||||||
mode := fi.Mode()
|
mode := fi.Mode()
|
||||||
uid := int(fi.Sys().(*syscall.Stat_t).Uid)
|
uid := int(fi.Sys().(*syscall.Stat_t).Uid)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue