1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #1889 from dsissitka/fixhttpimport

Fixed HTTP imports.
This commit is contained in:
Victor Vieux 2013-09-20 03:06:04 -07:00
commit a81393787f

View file

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