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

Merge pull request #23333 from yongtang/23211-spf13-cobra-version 

Use spf13/cobra for docker version
This commit is contained in:
Vincent Demeester 2016-06-07 23:46:01 +02:00
parent 51bd610ce6 7e043735b6
commit 92daed0111
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cobraadaptor/adaptor.go
View File

@ -5,6 +5,7 @@ import (
"github.com/docker/docker/api/client/container" "github.com/docker/docker/api/client/container"
"github.com/docker/docker/api/client/image" "github.com/docker/docker/api/client/image"
"github.com/docker/docker/api/client/network" "github.com/docker/docker/api/client/network"
"github.com/docker/docker/api/client/system"
"github.com/docker/docker/api/client/volume" "github.com/docker/docker/api/client/volume"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
cliflags "github.com/docker/docker/cli/flags" cliflags "github.com/docker/docker/cli/flags"
@ -58,6 +59,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.NewVersionCommand(dockerCli),
volume.NewVolumeCommand(dockerCli), volume.NewVolumeCommand(dockerCli),
) )

1
usage.go
View File

@ -24,7 +24,6 @@ var DockerCommandUsage = []Command{
{"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"}, {"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"},
{"version", "Show the Docker version information"},
} }
// DockerCommands stores all the docker command // DockerCommands stores all the docker command