kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info

Browse source 
Fix insecure registries upppercase in docker info
This commit is contained in:
Sebastiaan van Stijn 2016-04-25 16:21:04 +02:00
commit e8708f3049
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/info.go
View file

@ -153,7 +153,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
} }
if info.RegistryConfig != nil && (len(info.RegistryConfig.InsecureRegistryCIDRs) > 0 || len(info.RegistryConfig.IndexConfigs) > 0) { if info.RegistryConfig != nil && (len(info.RegistryConfig.InsecureRegistryCIDRs) > 0 || len(info.RegistryConfig.IndexConfigs) > 0) {
fmt.Fprintln(cli.out, "Insecure registries:") fmt.Fprintln(cli.out, "Insecure Registries:")
for _, registry := range info.RegistryConfig.IndexConfigs { for _, registry := range info.RegistryConfig.IndexConfigs {
if registry.Secure == false { if registry.Secure == false {
fmt.Fprintf(cli.out, " %s\n", registry.Name) fmt.Fprintf(cli.out, " %s\n", registry.Name)

2
integration-cli/docker_cli_info_test.go
View file

@ -178,7 +178,7 @@ func (s *DockerSuite) TestInsecureRegistries(c *check.C) {
out, err := d.Cmd("info") out, err := d.Cmd("info")
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
c.Assert(out, checker.Contains, "Insecure registries:\n") c.Assert(out, checker.Contains, "Insecure Registries:\n")
c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryHost)) c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryHost))
c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryCIDR)) c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryCIDR))
} }