From 0d063aaa5abc88abb78a89a29b079f91901476dd Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 9 Feb 2018 01:02:58 +0200 Subject: [PATCH] fix_airgap --- docker/docker.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/docker.go b/docker/docker.go index 10f0dd67..5fecbe76 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -169,17 +169,19 @@ func pullImage(ctx context.Context, dClient *client.Client, hostname string, con 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 { - regAuth, err := getRegistryAuth(pr) - if err != nil { - return err - } 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 } }