docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1535 from vieux/prevent_panic_no_name 

prevent panic in filters when container has no name
This commit is contained in:
Alexandre Beslic 2015-12-11 17:50:08 -08:00
parent 47d63f9b72 2497df0862
commit d3affe5904
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scheduler/filter/affinity.go
View File

@ -34,8 +34,10 @@ func (f *AffinityFilter) Filter(config *cluster.ContainerConfig, nodes []*node.N
case "container": case "container":
containers := []string{} containers := []string{}
for _, container := range node.Containers { for _, container := range node.Containers {
if len(container.Names) > 0 {
containers = append(containers, container.Id, strings.TrimPrefix(container.Names[0], "/")) containers = append(containers, container.Id, strings.TrimPrefix(container.Names[0], "/"))
} }
}
if affinity.Match(containers...) { if affinity.Match(containers...) {
candidates = append(candidates, node) candidates = append(candidates, node)
} }