mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #21251 from cyphar/refactor-copyonbuild
pkg: archive: don't fail Untar if xattrs are not supported
This commit is contained in:
commit
553edd1d19
1 changed files with 10 additions and 1 deletions
|
@ -425,10 +425,19 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var errors []string
|
||||||
for key, value := range hdr.Xattrs {
|
for key, value := range hdr.Xattrs {
|
||||||
if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
|
if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
|
||||||
return err
|
// We ignore errors here because not all graphdrivers support xattrs.
|
||||||
|
errors = append(errors, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(errors) > 0 {
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"errors": errors,
|
||||||
|
}).Warn("ignored xattrs in archive: underlying filesystem doesn't support them")
|
||||||
}
|
}
|
||||||
|
|
||||||
// There is no LChmod, so ignore mode for symlink. Also, this
|
// There is no LChmod, so ignore mode for symlink. Also, this
|
||||||
|
|
Loading…
Reference in a new issue