p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3641 from gfrey/fix_compression

Browse Source 
detect compressed archives in API /build call
Upstream-commit: 941d4ffa3e8e6c74fd02f3ac81a66c64dda3bc58
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-01-17 12:02:54 -08:00
parent 89d377fc23 0aa4f1bddd
commit c887dfefdf
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/buildfile.go
View File

@ -630,7 +630,13 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
if err != nil {
return "", err
}
b.context = &utils.TarSum{Reader: context, DisableCompression: true}
decompressedStream, err := archive.DecompressStream(context)
if err != nil {
return "", err
}
b.context = &utils.TarSum{Reader: decompressedStream, DisableCompression: true}
if err := archive.Untar(b.context, tmpdirPath, nil); err != nil {
return "", err
}