vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Skip aufs whiteout files on userns translation to container

Browse source 
aufs kernel module creates whiteout files on upper layer delete (and
other situations) and those files already are 'translated' regarding
ownership in host terms (e.g. they are already "0:0" owned), so when
these layers are copied around with pkg/archive we don't want to try and
translate these files regarding ownership.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
This commit is contained in:
Phil Estes 2015-12-09 10:11:32 -05:00
parent 6e9a3453f7
commit aa06163678
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
archive/archive.go
View file

@ -304,8 +304,9 @@ func (ta *tarAppender) addTarFile(path, name string) error {
} }
//handle re-mapping container ID mappings back to host ID mappings before //handle re-mapping container ID mappings back to host ID mappings before
//writing tar headers/files //writing tar headers/files. We skip whiteout files because they were written
if ta.UIDMaps != nil || ta.GIDMaps != nil { //by the kernel and already have proper ownership relative to the host
if !strings.HasPrefix(filepath.Base(hdr.Name), WhiteoutPrefix) && (ta.UIDMaps != nil || ta.GIDMaps != nil) {
uid, gid, err := getFileUIDGID(fi.Sys()) uid, gid, err := getFileUIDGID(fi.Sys())
if err != nil { if err != nil {
return err return err