kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #30413 from thaJeztah/minor-godocs-fixup 

Minor GoDoc fixup in integration-cli
This commit is contained in:
Vincent Demeester 2017-01-24 18:08:27 +01:00 committed by GitHub
parent 34d0619074 089e1c1c5b
commit f645ffca04
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration-cli/daemon/daemon.go
View File

@ -583,14 +583,15 @@ func (d *Daemon) GetBaseDeviceSize(c *check.C) int64 {
return basesizeBytes return basesizeBytes
} }
// Cmd will execute a docker CLI command against this Daemon. // Cmd executes a docker CLI command against this daemon.
// Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version // Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
func (d *Daemon) Cmd(args ...string) (string, error) { func (d *Daemon) Cmd(args ...string) (string, error) {
b, err := d.Command(args...).CombinedOutput() b, err := d.Command(args...).CombinedOutput()
return string(b), err return string(b), err
} }
// Command will create a docker CLI command against this Daeomn. // Command creates a docker CLI command against this daemon, to be executed later.
// Example: d.Command("version") creates a command to run "docker -H unix://path/to/unix.sock version"
func (d *Daemon) Command(args ...string) *exec.Cmd { func (d *Daemon) Command(args ...string) *exec.Cmd {
return exec.Command(d.dockerBinary, d.PrependHostArg(args)...) return exec.Command(d.dockerBinary, d.PrependHostArg(args)...)
} }