update .dockercfg content to config.json

juanvallejo · juanvallejo · commit 5304de76c65a · 2017-10-20T15:44:50.000-04:00
update the data format of .dockercfg to match the new docker config.json
format, which encapsulates all registry auth objects in an overall
"auths" object:

{
    "auths": {
        "reg.url": {
            "auth": "...=="
        }
    }
}
diff --git a/pkg/oc/cli/secrets/dockercfg.go b/pkg/oc/cli/secrets/dockercfg.go
@@ -125,7 +125,9 @@ func (o CreateDockerConfigOptions) NewDockerSecret() (*api.Secret, error) {
 		Email:    o.EmailAddress,
 	}
 
-	dockerCfg := map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth}
+	dockerCfg := credentialprovider.DockerConfigJson{
+		Auths: map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth},
+	}
 
 	dockercfgContent, err := json.Marshal(dockerCfg)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,9 @@ func (o CreateDockerConfigOptions) NewDockerSecret() (*api.Secret, error) {`
`125`	`125`	`Email: o.EmailAddress,`
`126`	`126`	`}`
`127`	`127`
`128`		`- dockerCfg := map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth}`
	`128`	`+ dockerCfg := credentialprovider.DockerConfigJson{`
	`129`	`+ Auths: map[string]credentialprovider.DockerConfigEntry{o.RegistryLocation: dockercfgAuth},`
	`130`	`+ }`
`129`	`131`
`130`	`132`	`dockercfgContent, err := json.Marshal(dockerCfg)`
`131`	`133`	`if err != nil {`