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

Merge pull request #23522 from docker/swarm-stack 

Add experimental Docker Stack CLI commands
This commit is contained in:
Arnaud Porterie 2016-06-15 02:22:01 +00:00 committed by GitHub
parent 11c8c6c8fc 3fe470656a
commit 8e224f9ef7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cobraadaptor/adaptor.go
View File

@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/client/plugin" "github.com/docker/docker/api/client/plugin"
"github.com/docker/docker/api/client/registry" "github.com/docker/docker/api/client/registry"
"github.com/docker/docker/api/client/service" "github.com/docker/docker/api/client/service"
"github.com/docker/docker/api/client/stack"
"github.com/docker/docker/api/client/swarm" "github.com/docker/docker/api/client/swarm"
"github.com/docker/docker/api/client/system" "github.com/docker/docker/api/client/system"
"github.com/docker/docker/api/client/volume" "github.com/docker/docker/api/client/volume"
@ -42,6 +43,8 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
rootCmd.AddCommand( rootCmd.AddCommand(
node.NewNodeCommand(dockerCli), node.NewNodeCommand(dockerCli),
service.NewServiceCommand(dockerCli), service.NewServiceCommand(dockerCli),
stack.NewStackCommand(dockerCli),
stack.NewTopLevelDeployCommand(dockerCli),
swarm.NewSwarmCommand(dockerCli), swarm.NewSwarmCommand(dockerCli),
container.NewAttachCommand(dockerCli), container.NewAttachCommand(dockerCli),
container.NewCommitCommand(dockerCli), container.NewCommitCommand(dockerCli),
@ -98,7 +101,9 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
func (c CobraAdaptor) Usage() []cli.Command { func (c CobraAdaptor) Usage() []cli.Command {
cmds := []cli.Command{} cmds := []cli.Command{}
for _, cmd := range c.rootCmd.Commands() { for _, cmd := range c.rootCmd.Commands() {
cmds = append(cmds, cli.Command{Name: cmd.Name(), Description: cmd.Short}) if cmd.Name() != "" {
cmds = append(cmds, cli.Command{Name: cmd.Name(), Description: cmd.Short})
}
} }
return cmds return cmds
} }