shaba/traefik
1
0
Fork 0
mirror of https://github.com/containous/traefik.git synced 2025-01-11 05:17:52 +03:00
Code Releases Activity

Fix Swarm panic

Browse Source
This commit is contained in:
Emile Vauge 2016-11-28 16:46:37 +01:00
parent 055cd01bb7
commit 841be8d806
No known key found for this signature in database
GPG Key ID: D808B4C167352E59
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 {
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 {
@ -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
}