clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4840 from vbatts/vbatts-load_from_input

Browse Source 
docker load: add --input flag
This commit is contained in:
Victor Vieux
2014-03-25 14:37:27 -07:00
parent abef5cb0fc 2517370088
commit 5506e4b62d
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client.go
+13 -1
View File
@@ -2100,6 +2100,8 @@ func (cli *DockerCli) CmdSave(args ...string) error {
func (cli *DockerCli) CmdLoad(args ...string) error {
cmd := cli.Subcmd("load", "", "Load an image from a tar archive on STDIN")
infile := cmd.String([]string{"i", "-input"}, "", "Read from a tar archive file, instead of STDIN")
if err := cmd.Parse(args); err != nil {
return err
}
@@ -2109,7 +2111,17 @@ func (cli *DockerCli) CmdLoad(args ...string) error {
return nil
}
if err := cli.stream("POST", "/images/load", cli.in, cli.out, nil); err != nil {
var (
input io.Reader = cli.in
err error
)
if *infile != "" {
input, err = os.Open(*infile)
if err != nil {
return err
}
}
if err := cli.stream("POST", "/images/load", input, cli.out, nil); err != nil {
return err
}
return nil