clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 04:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2728 from SvenDowideit/docker-import-doc

Browse Source 
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
This commit is contained in:
Victor Vieux
2013-12-02 10:59:15 -08:00
parent fe571dd293 ba5268d382
commit 4b35c1b6a6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands.go
+1 -1
View File
@@ -905,7 +905,7 @@ func (cli *DockerCli) CmdKill(args ...string) error {
}
func (cli *DockerCli) CmdImport(args ...string) error {
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).")
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.")
if err := cmd.Parse(args); err != nil {
return nil
docs/sources/commandline/cli.rst
+2 -1
View File
@@ -558,7 +558,8 @@ Displaying image hierarchy
Usage: docker import URL|- [REPOSITORY[:TAG]]
Create a new filesystem image from the contents of a tarball
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.
At this time, the URL must start with ``http`` and point to a single
file archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) containing a