Переглянути джерело

Merge pull request #32503 from dongluochen/fix_startperiod

fix gRPC serialization for healthcheck start-period
Brian Goff 8 роки тому
батько
коміт
b93db34363
1 змінених файлів з 1 додано та 1 видалено
  1. 1 1
      daemon/cluster/convert/container.go

+ 1 - 1
daemon/cluster/convert/container.go

@@ -281,7 +281,7 @@ func containerToGRPC(c types.ContainerSpec) (*swarmapi.ContainerSpec, error) {
 func healthConfigFromGRPC(h *swarmapi.HealthConfig) *container.HealthConfig {
 func healthConfigFromGRPC(h *swarmapi.HealthConfig) *container.HealthConfig {
 	interval, _ := gogotypes.DurationFromProto(h.Interval)
 	interval, _ := gogotypes.DurationFromProto(h.Interval)
 	timeout, _ := gogotypes.DurationFromProto(h.Timeout)
 	timeout, _ := gogotypes.DurationFromProto(h.Timeout)
-	startPeriod, _ := gogotypes.DurationFromProto(h.Timeout)
+	startPeriod, _ := gogotypes.DurationFromProto(h.StartPeriod)
 	return &container.HealthConfig{
 	return &container.HealthConfig{
 		Test:        h.Test,
 		Test:        h.Test,
 		Interval:    interval,
 		Interval:    interval,