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

Fix ADD behavior on single files

Browse Source 
Upstream-commit: faafbf211899bc28e7e21e76de051d87ef5b5cd2
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-29 17:58:05 -07:00
parent e4821e2de7
commit b335672d16
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/buildfile.go
+7 -3
View File
@@ -213,13 +213,17 @@ func (b *buildFile) CmdAdd(args string) error {
if container == nil {
return fmt.Errorf("Error while creating the container (CmdAdd)")
}
if err := os.MkdirAll(path.Join(container.rwPath(), dest), 0700); err != nil {
if err := container.EnsureMounted(); err != nil {
return err
}
defer container.Unmount()
origPath := path.Join(b.context, orig)
destPath := path.Join(container.rwPath(), dest)
destPath := path.Join(container.RootfsPath(), dest)
if err := os.MkdirAll(path.Dir(destPath), 0700); err != nil {
return err
}
fi, err := os.Stat(origPath)
if err != nil {