Merge pull request #23265 from vdemeester/migrate-login-logout-to-cobra

Use spf13/cobra for docker login and docker logout
This commit is contained in:
Alexander Morozov 2016-06-13 14:15:46 -07:00 committed by GitHub
commit 6ee236be1d
2 changed files with 3 additions and 2 deletions

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"
@ -65,6 +66,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),
) )

View File

@ -12,8 +12,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"},