Fixed HTTP imports.

Upstream-commit: c6b40761255c881b8851ac096d5cc59b0c6be729 Component: engine
2013-09-15 18:40:29 -07:00
parent c55f0d3dec
commit cea03fdf23
1 changed files with 6 additions and 4 deletions
--- a/components/engine/commands.go
+++ b/components/engine/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 {