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

Do not fail when no docker registry auth is available 

this amends the behaviour introduced with #2651
and allows pulling public images when docker.auth.helper is set
This commit is contained in:
Arvid E. Picciani 2017-06-27 10:59:04 +02:00
parent 66d1c78763
commit aa4f029f10
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/driver/docker.go
View File

@ -1016,7 +1016,7 @@ func (d *DockerDriver) createImage(driverConfig *DockerDriverConfig, client *doc
func (d *DockerDriver) pullImage(driverConfig *DockerDriverConfig, client *docker.Client, repo, tag string) (id string, err error) { func (d *DockerDriver) pullImage(driverConfig *DockerDriverConfig, client *docker.Client, repo, tag string) (id string, err error) {
authOptions, err := d.resolveRegistryAuthentication(driverConfig, repo) authOptions, err := d.resolveRegistryAuthentication(driverConfig, repo)
if err != nil { if err != nil {
return "", fmt.Errorf("Failed to find docker auth for repo %q: %v", repo, err) d.logger.Printf("[WARN] Failed to find docker auth for repo %q: %v", repo, err)
} }
if authIsEmpty(authOptions) { if authIsEmpty(authOptions) {