浏览代码

make Insecure registries uppercase like other keys in docker info

Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud 9 年之前
父节点
当前提交
e78884dafd
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      api/client/info.go
  2. 1 1
      integration-cli/docker_cli_info_test.go

+ 1 - 1
api/client/info.go

@@ -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)

+ 1 - 1
integration-cli/docker_cli_info_test.go

@@ -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))
 }
 }