Merge pull request #23334 from WeiZhang555/cobra-stats

Migrate stats and events command to cobra
This commit is contained in:
Vincent Demeester 2016-06-08 23:50:46 +02:00
commit 58a97cc11e
2 changed files with 2 additions and 2 deletions

View File

@ -48,6 +48,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
container.NewRmCommand(dockerCli), container.NewRmCommand(dockerCli),
container.NewRunCommand(dockerCli), container.NewRunCommand(dockerCli),
container.NewStartCommand(dockerCli), container.NewStartCommand(dockerCli),
container.NewStatsCommand(dockerCli),
container.NewStopCommand(dockerCli), container.NewStopCommand(dockerCli),
container.NewTopCommand(dockerCli), container.NewTopCommand(dockerCli),
container.NewUnpauseCommand(dockerCli), container.NewUnpauseCommand(dockerCli),
@ -60,6 +61,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
image.NewImportCommand(dockerCli), image.NewImportCommand(dockerCli),
image.NewTagCommand(dockerCli), image.NewTagCommand(dockerCli),
network.NewNetworkCommand(dockerCli), network.NewNetworkCommand(dockerCli),
system.NewEventsCommand(dockerCli),
system.NewVersionCommand(dockerCli), system.NewVersionCommand(dockerCli),
volume.NewVolumeCommand(dockerCli), volume.NewVolumeCommand(dockerCli),
) )

View File

@ -10,7 +10,6 @@ type Command struct {
var DockerCommandUsage = []Command{ var DockerCommandUsage = []Command{
{"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"},
{"events", "Get real time events from the server"},
{"exec", "Run a command in a running container"}, {"exec", "Run a command in a running container"},
{"info", "Display system-wide information"}, {"info", "Display system-wide information"},
{"inspect", "Return low-level information on a container or image"}, {"inspect", "Return low-level information on a container or image"},
@ -21,7 +20,6 @@ var DockerCommandUsage = []Command{
{"pull", "Pull an image or a repository from a registry"}, {"pull", "Pull an image or a repository from a registry"},
{"push", "Push an image or a repository to a registry"}, {"push", "Push an image or a repository to a registry"},
{"save", "Save one or more images to a tar archive"}, {"save", "Save one or more images to a tar archive"},
{"stats", "Display a live stream of container(s) resource usage statistics"},
{"update", "Update configuration of one or more containers"}, {"update", "Update configuration of one or more containers"},
} }