0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1889 from dsissitka/fixhttpimport

Browse source 
Fixed HTTP imports.
This commit is contained in:
Victor Vieux 2013-09-20 03:06:04 -07:00
commit a81393787f
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands.go
View file

@ -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 {