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

Migrate login & logout command to cobra 

Also moves some common stuff around :
- `api/client/registry.go` for registry related
method (`ElectAuthServer`, …)
- `api/client/credentials.go` to interact with credentials

Migrate logout command to cobra

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-06-10 12:04:29 +02:00
parent 171adb0b0f
commit d4fef62ce0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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/registry"
"github.com/docker/docker/api/client/system" "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"
@ -64,6 +65,8 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {
image.NewTagCommand(dockerCli), image.NewTagCommand(dockerCli),
network.NewNetworkCommand(dockerCli), network.NewNetworkCommand(dockerCli),
system.NewEventsCommand(dockerCli), system.NewEventsCommand(dockerCli),
registry.NewLoginCommand(dockerCli),
registry.NewLogoutCommand(dockerCli),
system.NewVersionCommand(dockerCli), system.NewVersionCommand(dockerCli),
volume.NewVolumeCommand(dockerCli), volume.NewVolumeCommand(dockerCli),
) )

2
usage.go
View File

@ -13,8 +13,6 @@ var DockerCommandUsage = []Command{
{"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"},
{"login", "Log in to a Docker registry"},
{"logout", "Log out from a Docker registry"},
{"ps", "List containers"}, {"ps", "List containers"},
{"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"},