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

Fix issue with mkdir within docker build

Browse Source 
Upstream-commit: 9a394041270d2a8ba648f215dacc186473140552
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-29 18:55:00 -07:00
parent db47132a8a
commit 76555eb6cc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/buildfile.go
View File

@ -221,15 +221,15 @@ func (b *buildFile) CmdAdd(args string) error {
origPath := path.Join(b.context, orig)
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 {
return err
}
if fi.IsDir() {
if err := os.MkdirAll(destPath, 0700); err != nil {
return err
}
files, err := ioutil.ReadDir(path.Join(b.context, orig))
if err != nil {
return err
@ -240,6 +240,9 @@ func (b *buildFile) CmdAdd(args string) error {
}
}
} else {
if err := os.MkdirAll(path.Dir(destPath), 0700); err != nil {
return err
}
if err := utils.CopyDirectory(origPath, destPath); err != nil {
return err
}