rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 16:30:02 +00:00
Code Issues Releases Wiki Activity

fix_airgap

Browse Source
This commit is contained in:
galal-hussein
2018-02-09 01:02:58 +02:00
parent 185534a07f
commit 0d063aaa5a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/docker.go
View File

@@ -169,17 +169,19 @@ func pullImage(ctx context.Context, dClient *client.Client, hostname string, con
regURL := ref.Domain(containerNamed) regURL := ref.Domain(containerNamed)
if pr, ok := prsMap[regURL]; ok { if pr, ok := prsMap[regURL]; ok {
// We do this if we have some docker.io login information // We do this if we have some docker.io login information
regAuth, err := getRegistryAuth(pr)
if err != nil {
return err
}
if pr.URL == DockerRegistryURL { if pr.URL == DockerRegistryURL {
regAuth, err := getRegistryAuth(pr)
if err != nil {
return err
}
pullOptions.RegistryAuth = regAuth pullOptions.RegistryAuth = regAuth
} else { } else {
// We have a registry, but it's not docker.io // We have a registry, but it's not docker.io
// this could be public or private, ImagePull() can handle it // this could be public or private, ImagePull() can handle it
// if we provide a PrivilegeFunc // if we provide a PrivilegeFunc
pullOptions.PrivilegeFunc = tryRegistryAuth(pr) pullOptions.PrivilegeFunc = tryRegistryAuth(pr)
pullOptions.RegistryAuth = regAuth
} }
} }