Merge pull request #28501 from tonistiigi/fix-daemon-cmd

Skip cli initialization for daemon command
Upstream-commit: bb845dbd423e5107dcdba45bb94c4e8d54e5997b
Component: engine
This commit is contained in:
Victor Vieux
2016-11-16 15:37:43 -08:00
committed by GitHub

View File

@ -39,6 +39,10 @@ func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command {
return nil
},
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
// daemon command is special, we redirect directly to another binary
if cmd.Name() == "daemon" {
return nil
}
// flags must be the top-level command flags, not cmd.Flags()
opts.Common.SetDefaultOptions(flags)
dockerPreRun(opts)