Merge pull request #23283 from yongtang/23211-spf13-cobra-diff

Use spf13/cobra for docker diff
Upstream-commit: 168b0d7f98
Component: cli

components/cli/cobraadaptor/adaptor.go

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

components/cli/usage.go

@@ -12,7 +12,6 @@ var DockerCommandUsage = []Command{
 	{"build", "Build an image from a Dockerfile"},
 	{"commit", "Create a new image from a container's changes"},
 	{"cp", "Copy files/folders between a container and the local filesystem"},
-	{"diff", "Inspect changes on a container's filesystem"},
 	{"events", "Get real time events from the server"},
 	{"exec", "Run a command in a running container"},
 	{"history", "Show the history of an image"},