azure: acr fix login server

This commit is contained in:
Cole Mickens
2017-01-19 04:22:12 -08:00
parent 0144fae64f
commit 1c72f2b9de
2 changed files with 17 additions and 4 deletions

View File

@@ -17,7 +17,6 @@ limitations under the License.
package azure
import (
"fmt"
"io/ioutil"
"time"
@@ -133,12 +132,17 @@ func (a *acrProvider) Provide() credentialprovider.DockerConfig {
return cfg
}
for ix := range *res.Value {
// TODO: I don't think this will work for national clouds
cfg[fmt.Sprintf("%s.azurecr.io", *(*res.Value)[ix].Name)] = entry
loginServer := getLoginServer((*res.Value)[ix])
glog.V(4).Infof("Adding Azure Container Registry docker credential for %s", loginServer)
cfg[loginServer] = entry
}
return cfg
}
func getLoginServer(registry containerregistry.Registry) string {
return *(*registry.RegistryProperties).LoginServer
}
func (a *acrProvider) LazyProvide() *credentialprovider.DockerConfigEntry {
return nil
}