diff --git a/api.go b/api.go index 74388d805b..3bbcdfd43d 100644 --- a/api.go +++ b/api.go @@ -987,7 +987,7 @@ func postContainersCopy(srv *Server, version float64, w http.ResponseWriter, r * } if copyData.Resource == "" { - return fmt.Errorf("Resource cannot be empty") + return fmt.Errorf("Path cannot be empty") } if copyData.Resource[0] == '/' { copyData.Resource = copyData.Resource[1:] diff --git a/commands.go b/commands.go index 0539be9006..752ed82906 100644 --- a/commands.go +++ b/commands.go @@ -1932,7 +1932,7 @@ func (cli *DockerCli) CmdRun(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 { return nil } @@ -1946,7 +1946,7 @@ func (cli *DockerCli) CmdCp(args ...string) error { info := strings.Split(cmd.Arg(0), ":") if len(info) != 2 { - return fmt.Errorf("Error: Resource not specified") + return fmt.Errorf("Error: Path not specified") } copyData.Resource = info[1] diff --git a/docs/sources/commandline/cli.rst b/docs/sources/commandline/cli.rst index c25b890faf..7bde6863c2 100644 --- a/docs/sources/commandline/cli.rst +++ b/docs/sources/commandline/cli.rst @@ -219,10 +219,15 @@ 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 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: