Browse code
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
Sven Dowideit authored on 2013/11/16 19:49:42Showing 2 changed files
| ... | ... |
@@ -928,7 +928,7 @@ func (cli *DockerCli) CmdKill(args ...string) error {
|
| 928 | 928 |
} |
| 929 | 929 |
|
| 930 | 930 |
func (cli *DockerCli) CmdImport(args ...string) error {
|
| 931 |
- cmd := cli.Subcmd("import", "URL|- [REPOSITORY[:TAG]]", "Create a new filesystem image from the contents of a tarball(.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz).")
|
|
| 931 |
+ cmd := cli.Subcmd("import", "URL|- [REPOSITORY[:TAG]]", "Create an empty filesystem image and import the contents of the tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then optionally tag it.")
|
|
| 932 | 932 |
|
| 933 | 933 |
if err := cmd.Parse(args); err != nil {
|
| 934 | 934 |
return nil |
| ... | ... |
@@ -557,7 +557,8 @@ Displaying image hierarchy |
| 557 | 557 |
|
| 558 | 558 |
Usage: docker import URL|- [REPOSITORY[:TAG]] |
| 559 | 559 |
|
| 560 |
- Create a new filesystem image from the contents of a tarball |
|
| 560 |
+ Create an empty filesystem image and import the contents of the tarball |
|
| 561 |
+ (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then optionally tag it. |
|
| 561 | 562 |
|
| 562 | 563 |
At this time, the URL must start with ``http`` and point to a single |
| 563 | 564 |
file archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) containing a |