From 76555eb6ccbbb8ddbb388c714419f0e2c07aa30f Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 29 May 2013 18:55:00 -0700 Subject: [PATCH] Fix issue with mkdir within docker build Upstream-commit: 9a394041270d2a8ba648f215dacc186473140552 Component: engine --- components/engine/buildfile.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/engine/buildfile.go b/components/engine/buildfile.go index 805ebb4fbb..b4c96e36d5 100644 --- a/components/engine/buildfile.go +++ b/components/engine/buildfile.go @@ -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 }