Merge pull request #1752 from dotcloud/1750-build_error-fix

fix error in docker build when param is not a directory
This commit is contained in:
Guillaume J. Charmes 2013-08-30 16:05:23 -07:00
commit 969e48dd5a

View file

@ -187,8 +187,10 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
} else if utils.IsURL(cmd.Arg(0)) || utils.IsGIT(cmd.Arg(0)) {
isRemote = true
} else {
if _, err := os.Stat(cmd.Arg(0)); err != nil {
if fi, err := os.Stat(cmd.Arg(0)); err != nil {
return err
} else if !fi.IsDir() {
return fmt.Errorf("\"%s\" is not a path or URL. Please provide a path to a directory containing a Dockerfile.", cmd.Arg(0))
}
context, err = Tar(cmd.Arg(0), Uncompressed)
}