luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

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

Browse source 
Fixes docker-driver docker.auth.config processing
This commit is contained in:
Alex Dadgar 2017-03-01 15:39:35 -08:00 committed by GitHub
parent 8827b4f4d0 b4db9d33f9
commit 2aa962a357
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/driver/docker.go
View file

@ -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)