baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #908 from containous/fix-swarm-panic

Browse source 
Fix Swarm panic
This commit is contained in:
Emile Vauge 2016-11-29 14:47:51 +01:00 committed by GitHub
commit 4e527304d0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
provider/docker.go
View file

@ -560,6 +560,10 @@ func parseContainer(container dockertypes.ContainerJSON) dockerData {
if container.ContainerJSONBase.HostConfig != nil { if container.ContainerJSONBase.HostConfig != nil {
dockerData.NetworkSettings.NetworkMode = container.ContainerJSONBase.HostConfig.NetworkMode dockerData.NetworkSettings.NetworkMode = container.ContainerJSONBase.HostConfig.NetworkMode
} }
if container.State != nil && container.State.Health != nil {
dockerData.Health = container.State.Health.Status
}
} }
if container.Config != nil && container.Config.Labels != nil { if container.Config != nil && container.Config.Labels != nil {
@ -583,10 +587,6 @@ func parseContainer(container dockertypes.ContainerJSON) dockerData {
} }
if container.State != nil && container.State.Health != nil {
dockerData.Health = container.State.Health.Status
}
return dockerData return dockerData
} }