Merge pull request #23274 from WeiZhang555/cobra-attach

Move attach command to cobra
This commit is contained in:
Brian Goff 2016-06-06 21:16:45 -04:00
commit 7de079e589
2 changed files with 1 additions and 1 deletions

View File

@ -34,6 +34,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
rootCmd.SetFlagErrorFunc(cli.FlagErrorFunc) rootCmd.SetFlagErrorFunc(cli.FlagErrorFunc)
rootCmd.SetOutput(stdout) rootCmd.SetOutput(stdout)
rootCmd.AddCommand( rootCmd.AddCommand(
container.NewAttachCommand(dockerCli),
container.NewCreateCommand(dockerCli), container.NewCreateCommand(dockerCli),
container.NewDiffCommand(dockerCli), container.NewDiffCommand(dockerCli),
container.NewExportCommand(dockerCli), container.NewExportCommand(dockerCli),

View File

@ -8,7 +8,6 @@ type Command struct {
// DockerCommandUsage lists the top level docker commands and their short usage // DockerCommandUsage lists the top level docker commands and their short usage
var DockerCommandUsage = []Command{ var DockerCommandUsage = []Command{
{"attach", "Attach to a running container"},
{"build", "Build an image from a Dockerfile"}, {"build", "Build an image from a Dockerfile"},
{"commit", "Create a new image from a container's changes"}, {"commit", "Create a new image from a container's changes"},
{"cp", "Copy files/folders between a container and the local filesystem"}, {"cp", "Copy files/folders between a container and the local filesystem"},