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

Fix issue with mkdir within docker build

This commit is contained in:
Guillaume J. Charmes 2013-05-29 18:55:00 -07:00
parent fc864d2f0f
commit 9a39404127
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildfile.go
View File

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