Skip to content

Commit

Permalink
Update graph to use vendored distribution client for the v2 codepath
Browse files Browse the repository at this point in the history
Signed-off-by: Derek McGowan <[email protected]> (github: dmcgowan)
Signed-off-by: Tibor Vass <[email protected]>
  • Loading branch information
dmcgowan authored and Tibor Vass committed Jul 16, 2015
1 parent 276c640 commit 19515a7
Show file tree
Hide file tree
Showing 25 changed files with 1,823 additions and 2,287 deletions.
4 changes: 2 additions & 2 deletions api/client/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
//
// Usage: docker login SERVER
func (cli *DockerCli) CmdLogin(args ...string) error {
cmd := cli.Subcmd("login", []string{"[SERVER]"}, "Register or log in to a Docker registry server, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)
cmd := cli.Subcmd("login", []string{"[SERVER]"}, "Register or log in to a Docker registry server, if no server is\nspecified \""+registry.INDEXSERVER+"\" is the default.", true)
cmd.Require(flag.Max, 1)

var username, password, email string
Expand All @@ -32,7 +32,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

cmd.ParseFlags(args, true)

serverAddress := registry.IndexServerAddress()
serverAddress := registry.INDEXSERVER
if len(cmd.Args()) > 0 {
serverAddress = cmd.Arg(0)
}
Expand Down
4 changes: 2 additions & 2 deletions api/client/logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
//
// Usage: docker logout [SERVER]
func (cli *DockerCli) CmdLogout(args ...string) error {
cmd := cli.Subcmd("logout", []string{"[SERVER]"}, "Log out from a Docker registry, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)
cmd := cli.Subcmd("logout", []string{"[SERVER]"}, "Log out from a Docker registry, if no server is\nspecified \""+registry.INDEXSERVER+"\" is the default.", true)
cmd.Require(flag.Max, 1)

cmd.ParseFlags(args, true)

serverAddress := registry.IndexServerAddress()
serverAddress := registry.INDEXSERVER
if len(cmd.Args()) > 0 {
serverAddress = cmd.Arg(0)
}
Expand Down
2 changes: 1 addition & 1 deletion daemon/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
NEventsListener: daemon.EventsService.SubscribersCount(),
KernelVersion: kernelVersion,
OperatingSystem: operatingSystem,
IndexServerAddress: registry.IndexServerAddress(),
IndexServerAddress: registry.INDEXSERVER,
RegistryConfig: daemon.RegistryService.Config,
InitSha1: dockerversion.INITSHA1,
InitPath: initPath,
Expand Down
178 changes: 0 additions & 178 deletions graph/manifest.go

This file was deleted.

Loading

0 comments on commit 19515a7

Please sign in to comment.