From b4db9d33f9d238189afbafba50e50570a611284e Mon Sep 17 00:00:00 2001 From: Tom Michaud Date: Wed, 1 Mar 2017 16:16:11 -0700 Subject: [PATCH] Fixes docker-driver docker.auth.config processing --- client/driver/docker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index aabb20056..a65d885f3 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -992,7 +992,8 @@ func (d *DockerDriver) pullImage(driverConfig *DockerDriverConfig, client *docke ServerAddress: driverConfig.Auth[0].ServerAddress, } } else if authConfigFile := d.config.Read("docker.auth.config"); authConfigFile != "" { - authOptions, err := authOptionFrom(authConfigFile, repo) + var err error + authOptions, err = authOptionFrom(authConfigFile, repo) if err != nil { d.logger.Printf("[INFO] driver.docker: failed to find docker auth for repo %q: %v", repo, err) return "", fmt.Errorf("Failed to find docker auth for repo %q: %v", repo, err)