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

Merge pull request #4134 from crosbymichael/fix-add-magic-regression 

Fix regression with ADD of tar files
This commit is contained in:
unclejack 2014-02-14 03:43:39 +02:00
parent 968f4800b5 cad7f7ee50
commit 1b8ec8ff1d
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
buildfile.go
View File

@ -371,20 +371,36 @@ func (b *buildFile) addContext(container *Container, orig, dest string) error {
} }
return err return err
} }
if fi.IsDir() { if fi.IsDir() {
if err := archive.CopyWithTar(origPath, destPath); err != nil { if err := archive.CopyWithTar(origPath, destPath); err != nil {
return err return err
} }
// First try to unpack the source as an archive return nil
} else if err := archive.UntarPath(origPath, destPath); err != nil { }
utils.Debugf("Couldn't untar %s to %s: %s", origPath, destPath, err)
// If that fails, just copy it as a regular file // First try to unpack the source as an archive
if err := os.MkdirAll(path.Dir(destPath), 0755); err != nil { // to support the untar feature we need to clean up the path a little bit
return err // because tar is very forgiving. First we need to strip off the archive's
} // filename from the path but this is only added if it does not end in / .
if err := archive.CopyWithTar(origPath, destPath); err != nil { tarDest := destPath
return err if strings.HasSuffix(tarDest, "/") {
} tarDest = filepath.Dir(destPath)
}
// try to successfully untar the orig
if err := archive.UntarPath(origPath, tarDest); err == nil {
return nil
}
utils.Debugf("Couldn't untar %s to %s: %s", origPath, destPath, err)
// If that fails, just copy it as a regular file
// but do not use all the magic path handling for the tar path
if err := os.MkdirAll(path.Dir(destPath), 0755); err != nil {
return err
}
if err := archive.CopyWithTar(origPath, destPath); err != nil {
return err
} }
return nil return nil
} }