From e5717aed2fd1f81b9614abe3c7571cde2e0c4d90 Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Mon, 6 Jun 2016 15:38:20 +0800 Subject: [PATCH] Migrate kill command to cobra Signed-off-by: Zhang Wei Upstream-commit: 05c7e2e124cacc7add50733242ed34bad64c4f69 Component: cli --- components/cli/cobraadaptor/adaptor.go | 1 + components/cli/usage.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/cobraadaptor/adaptor.go b/components/cli/cobraadaptor/adaptor.go index f371ce4ed7..2cb64e0541 100644 --- a/components/cli/cobraadaptor/adaptor.go +++ b/components/cli/cobraadaptor/adaptor.go @@ -38,6 +38,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor { container.NewCreateCommand(dockerCli), container.NewDiffCommand(dockerCli), container.NewExportCommand(dockerCli), + container.NewKillCommand(dockerCli), container.NewLogsCommand(dockerCli), container.NewPauseCommand(dockerCli), container.NewPortCommand(dockerCli), diff --git a/components/cli/usage.go b/components/cli/usage.go index 787a87aaee..727a7fb77a 100644 --- a/components/cli/usage.go +++ b/components/cli/usage.go @@ -17,7 +17,6 @@ var DockerCommandUsage = []Command{ {"import", "Import the contents from a tarball to create a filesystem image"}, {"info", "Display system-wide information"}, {"inspect", "Return low-level information on a container or image"}, - {"kill", "Kill a running container"}, {"load", "Load an image from a tar archive or STDIN"}, {"login", "Log in to a Docker registry"}, {"logout", "Log out from a Docker registry"},