kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases 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
commit 5506e4b62d
2 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/client.go
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

28
docs/sources/reference/commandline/cli.rst
View file

@ -881,10 +881,32 @@ Known Issues (kill)
::
Usage: docker load < repository.tar
Usage: docker load
Load an image from a tar archive on STDIN
-i, --input="": Read from a tar archive file, instead of STDIN
Loads a tarred repository from a file or the standard input stream.
Restores both images and tags.
.. code-block:: bash
$ sudo docker images
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
$ sudo docker load < busybox.tar
$ sudo docker images
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
busybox latest 769b9341d937 7 weeks ago 2.489 MB
$ sudo docker load --input fedora.tar
$ sudo docker images
REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE
busybox latest 769b9341d937 7 weeks ago 2.489 MB
fedora rawhide 0d20aec6529d 7 weeks ago 387 MB
fedora 20 58394af37342 7 weeks ago 385.5 MB
fedora heisenbug 58394af37342 7 weeks ago 385.5 MB
fedora latest 58394af37342 7 weeks ago 385.5 MB
Loads a tarred repository from the standard input stream.
Restores both images and tags.
.. _cli_login: