Skip to content

Commit 19515a7

Browse files
dmcgowanTibor Vass
dmcgowan
authored and
Tibor Vass
committed
Update graph to use vendored distribution client for the v2 codepath
Signed-off-by: Derek McGowan <[email protected]> (github: dmcgowan) Signed-off-by: Tibor Vass <[email protected]>
1 parent 276c640 commit 19515a7

25 files changed

Lines changed: 1823 additions & 2287 deletions

‎api/client/login.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
//
2222
// Usage: docker login SERVER
2323
func (cli *DockerCli) CmdLogin(args ...string) error {
24-
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)
24+
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)
2525
cmd.Require(flag.Max, 1)
2626

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

3333
cmd.ParseFlags(args, true)
3434

35-
serverAddress := registry.IndexServerAddress()
35+
serverAddress := registry.INDEXSERVER
3636
if len(cmd.Args()) > 0 {
3737
serverAddress = cmd.Arg(0)
3838
}

‎api/client/logout.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313
//
1414
// Usage: docker logout [SERVER]
1515
func (cli *DockerCli) CmdLogout(args ...string) error {
16-
cmd := cli.Subcmd("logout", []string{"[SERVER]"}, "Log out from a Docker registry, if no server is\nspecified \""+registry.IndexServerAddress()+"\" is the default.", true)
16+
cmd := cli.Subcmd("logout", []string{"[SERVER]"}, "Log out from a Docker registry, if no server is\nspecified \""+registry.INDEXSERVER+"\" is the default.", true)
1717
cmd.Require(flag.Max, 1)
1818

1919
cmd.ParseFlags(args, true)
2020

21-
serverAddress := registry.IndexServerAddress()
21+
serverAddress := registry.INDEXSERVER
2222
if len(cmd.Args()) > 0 {
2323
serverAddress = cmd.Arg(0)
2424
}

‎daemon/info.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
7474
NEventsListener: daemon.EventsService.SubscribersCount(),
7575
KernelVersion: kernelVersion,
7676
OperatingSystem: operatingSystem,
77-
IndexServerAddress: registry.IndexServerAddress(),
77+
IndexServerAddress: registry.INDEXSERVER,
7878
RegistryConfig: daemon.RegistryService.Config,
7979
InitSha1: dockerversion.INITSHA1,
8080
InitPath: initPath,

‎graph/manifest.go‎

Lines changed: 0 additions & 178 deletions
This file was deleted.

0 commit comments

Comments
 (0)