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

expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path

Browse source
This commit is contained in:
Sven Dowideit 2013-11-16 20:15:04 +10:00
parent 51576069ad
commit 27159ce6ba
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api.go
View file

@ -978,7 +978,7 @@ func postContainersCopy(srv *Server, version float64, w http.ResponseWriter, r *
} }
if copyData.Resource == "" { if copyData.Resource == "" {
return fmt.Errorf("Resource cannot be empty") return fmt.Errorf("Path cannot be empty")
} }
if copyData.Resource[0] == '/' { if copyData.Resource[0] == '/' {
copyData.Resource = copyData.Resource[1:] copyData.Resource = copyData.Resource[1:]

4
commands.go
View file

@ -1924,7 +1924,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
} }
func (cli *DockerCli) CmdCp(args ...string) error { func (cli *DockerCli) CmdCp(args ...string) error {
cmd := Subcmd("cp", "CONTAINER:RESOURCE HOSTPATH", "Copy files/folders from the RESOURCE to the HOSTPATH") cmd := Subcmd("cp", "CONTAINER:PATH HOSTPATH", "Copy files/folders from the PATH to the HOSTPATH")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -1938,7 +1938,7 @@ func (cli *DockerCli) CmdCp(args ...string) error {
info := strings.Split(cmd.Arg(0), ":") info := strings.Split(cmd.Arg(0), ":")
if len(info) != 2 { if len(info) != 2 {
return fmt.Errorf("Error: Resource not specified") return fmt.Errorf("Error: Path not specified")
} }
copyData.Resource = info[1] copyData.Resource = info[1]

7
docs/sources/commandline/cli.rst
View file

@ -219,11 +219,16 @@ Full -run example
:: ::
Usage: docker cp CONTAINER:RESOURCE HOSTPATH Usage: docker cp CONTAINER:PATH HOSTPATH
Copy files/folders from the containers filesystem to the host Copy files/folders from the containers filesystem to the host
path. Paths are relative to the root of the filesystem. path. Paths are relative to the root of the filesystem.
.. code-block:: bash
$ sudo docker cp 7bb0e258aefe:/etc/debian_version .
$ sudo docker cp blue_frog:/etc/hosts .
.. _cli_diff: .. _cli_diff:
``diff`` ``diff``