kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-03 17:05:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2063 from tmichaud314/fix-docker-driver-auth-interpolation

Browse Source 
Fixes docker-driver Auth-config interpolation
This commit is contained in:
Alex Dadgar
2016-12-19 13:41:27 -08:00
committed by GitHub
parent e05efe64df a3dcd24894
commit a51adaf609
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/driver/docker.go
View File

@@ -181,11 +181,11 @@ func NewDockerDriverConfig(task *structs.Task, env *env.TaskEnvironment) (*Docke
}
}
for _, a := range dconf.Auth {
a.Username = env.ReplaceEnv(a.Username)
a.Password = env.ReplaceEnv(a.Password)
a.Email = env.ReplaceEnv(a.Email)
a.ServerAddress = env.ReplaceEnv(a.ServerAddress)
for i, a := range dconf.Auth {
dconf.Auth[i].Username = env.ReplaceEnv(a.Username)
dconf.Auth[i].Password = env.ReplaceEnv(a.Password)
dconf.Auth[i].Email = env.ReplaceEnv(a.Email)
dconf.Auth[i].ServerAddress = env.ReplaceEnv(a.ServerAddress)
}
for _, l := range dconf.Logging {