diff options
| author | Dong Chen <dongluo.chen@docker.com> | 2017-04-10 17:02:58 -0700 |
|---|---|---|
| committer | Dong Chen <dongluo.chen@docker.com> | 2017-04-10 17:02:58 -0700 |
| commit | caab178509b9da0194b3a45286ff6f253fec667c (patch) | |
| tree | 67c167d3d5e91d054acff8966335c1c7293daa07 | |
| parent | 2c6bcf3ee7a72d0bfab58161f1db13ae220a820e (diff) | |
| download | docker-caab178509b9da0194b3a45286ff6f253fec667c.tar.gz | |
fix gRPC serialization for healthcheck start-period
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
| -rw-r--r-- | daemon/cluster/convert/container.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/cluster/convert/container.go b/daemon/cluster/convert/container.go index b2ccc9f6b1..99753c8d7a 100644 --- a/daemon/cluster/convert/container.go +++ b/daemon/cluster/convert/container.go @@ -281,7 +281,7 @@ func containerToGRPC(c types.ContainerSpec) (*swarmapi.ContainerSpec, error) { func healthConfigFromGRPC(h *swarmapi.HealthConfig) *container.HealthConfig { interval, _ := gogotypes.DurationFromProto(h.Interval) timeout, _ := gogotypes.DurationFromProto(h.Timeout) - startPeriod, _ := gogotypes.DurationFromProto(h.Timeout) + startPeriod, _ := gogotypes.DurationFromProto(h.StartPeriod) return &container.HealthConfig{ Test: h.Test, Interval: interval, |