Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support running 'docker help daemon' 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-06-09 13:20:55 -04:00
parent aee3578520
commit 90e5326097
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon_unix.go
View File

@ -11,8 +11,14 @@ import (
// CmdDaemon execs dockerd with the same flags // CmdDaemon execs dockerd with the same flags
func (p DaemonProxy) CmdDaemon(args ...string) error { func (p DaemonProxy) CmdDaemon(args ...string) error {
// Use os.Args[1:] so that "global" args are passed to dockerd // Special case for handling `docker help daemon`. When pkg/mflag is removed
args = stripDaemonArg(os.Args[1:]) // we can support this on the daemon side, but that is not possible with
// pkg/mflag because it uses os.Exit(1) instead of returning an error on
// unexpected args.
if len(args) == 0 || args[0] != "--help" {
// Use os.Args[1:] so that "global" args are passed to dockerd
args = stripDaemonArg(os.Args[1:])
}
binaryPath, err := findDaemonBinary() binaryPath, err := findDaemonBinary()
if err != nil { if err != nil {