rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 06:56:29 +00:00
Code Issues Releases Wiki Activity

Add AuthConfig to proceses

Browse Source 
Refactor registry auth
This commit is contained in:
moelsayed
2018-04-03 22:18:51 +02:00
parent 915ce9ad29
commit 78bff1ebc9
2 changed files with 87 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
docker/docker.go
View File

@@ -159,31 +159,16 @@ func localImageExists(ctx context.Context, dClient *client.Client, hostname stri
}
func pullImage(ctx context.Context, dClient *client.Client, hostname string, containerImage string, prsMap map[string]v3.PrivateRegistry) error {
pullOptions := types.ImagePullOptions{}
containerNamed, err := ref.ParseNormalizedNamed(containerImage)
regAuth, prURL, err := GetImageRegistryConfig(containerImage, prsMap)
if err != nil {
return err
}
regURL := ref.Domain(containerNamed)
if pr, ok := prsMap[regURL]; ok {
// We do this if we have some docker.io login information
regAuth, err := getRegistryAuth(pr)
if err != nil {
return err
}
if pr.URL == DockerRegistryURL {
pullOptions.RegistryAuth = regAuth
} else {
// We have a registry, but it's not docker.io
// this could be public or private, ImagePull() can handle it
// if we provide a PrivilegeFunc
pullOptions.PrivilegeFunc = tryRegistryAuth(pr)
pullOptions.RegistryAuth = regAuth
}
if regAuth != "" && prURL == DockerRegistryURL {
pullOptions.PrivilegeFunc = tryRegistryAuth(prsMap[prURL])
}
pullOptions.RegistryAuth = regAuth
out, err := dClient.ImagePull(ctx, containerImage, pullOptions)
if err != nil {
@@ -360,3 +345,17 @@ func getRegistryAuth(pr v3.PrivateRegistry) (string, error) {
}
return base64.URLEncoding.EncodeToString(encodedJSON), nil
}
func GetImageRegistryConfig(image string, prsMap map[string]v3.PrivateRegistry) (string, string, error) {
namedImage, err := ref.ParseNormalizedNamed(image)
if err != nil {
return "", "", err
}
regURL := ref.Domain(namedImage)
if pr, ok := prsMap[regURL]; ok {
// We do this if we have some docker.io login information
regAuth, err := getRegistryAuth(pr)
return regAuth, pr.URL, err
}
return "", "", nil
}