Merge pull request #2389 from tmichaud314/2388-docker-driver-auth-file

Fixes docker-driver docker.auth.config processing
hashicorp · Mar 1, 2017 · dea5a83 · dea5a83
2 parents 8b1359c + 6e561c7
commit dea5a83
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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)