Pārlūkot izejas kodu

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

fix error in docker build when param is not a directory
Guillaume J. Charmes 12 gadi atpakaļ
vecāks
revīzija
969e48dd5a
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 3 1
      commands.go

+ 3 - 1
commands.go

@@ -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)
 	}