瀏覽代碼

Merge pull request #1889 from dsissitka/fixhttpimport

Fixed HTTP imports.
Victor Vieux 11 年之前
父節點
當前提交
a81393787f
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      commands.go

+ 6 - 4
commands.go

@@ -795,11 +795,13 @@ func (cli *DockerCli) CmdImport(args ...string) error {
 	v.Set("tag", tag)
 	v.Set("fromSrc", src)
 
-	err := cli.stream("POST", "/images/create?"+v.Encode(), cli.in, cli.out, nil)
-	if err != nil {
-		return err
+	var in io.Reader
+
+	if src == "-" {
+		in = cli.in
 	}
-	return nil
+
+	return cli.stream("POST", "/images/create?"+v.Encode(), in, cli.out, nil)
 }
 
 func (cli *DockerCli) CmdPush(args ...string) error {