docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8813 from jlhawn/aufs_exclude_on_tar_layer 

Exclude `.wh..wh.*` AUFS metadata on layer export
This commit is contained in:
Tibor Vass 2014-11-04 11:38:12 -05:00
parent edae8830a9 0d97e082c3
commit 6718791ea2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/graphdriver/aufs/aufs.go
View File

@ -300,6 +300,7 @@ func (a *Driver) Diff(id, parent string) (archive.Archive, error) {
// AUFS doesn't need the parent layer to produce a diff. // AUFS doesn't need the parent layer to produce a diff.
return archive.TarWithOptions(path.Join(a.rootPath(), "diff", id), &archive.TarOptions{ return archive.TarWithOptions(path.Join(a.rootPath(), "diff", id), &archive.TarOptions{
Compression: archive.Uncompressed, Compression: archive.Uncompressed,
Excludes: []string{".wh..wh.*"},
}) })
} }

4
pkg/archive/archive.go
View File

@ -397,7 +397,9 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
} }
relFilePath, err := filepath.Rel(srcPath, filePath) relFilePath, err := filepath.Rel(srcPath, filePath)
if err != nil { if err != nil || (relFilePath == "." && f.IsDir()) {
// Error getting relative path OR we are looking
// at the root path. Skip in both situations.
return nil return nil
} }