diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-06 19:41:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 19:41:17 +0100 |
| commit | aa6284367083dd5e3d383179fe42350e3d2b777c (patch) | |
| tree | a944bbd82fa61a273b477e006929d4145509bee8 | |
| parent | ca6ab2029caae9fcea35579c87634a0520284aae (diff) | |
| parent | 23a83af9d1cd25d38eedba8b1383e404f1768022 (diff) | |
| download | podman-aa6284367083dd5e3d383179fe42350e3d2b777c.tar.gz podman-aa6284367083dd5e3d383179fe42350e3d2b777c.tar.bz2 podman-aa6284367083dd5e3d383179fe42350e3d2b777c.zip | |
Merge pull request #2282 from nalind/healthconfig-startperiod
Add StartPeriod to cmd/podman/docker.HealthConfig
| -rw-r--r-- | cmd/podman/docker/types.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/docker/types.go b/cmd/podman/docker/types.go index 90349a31c..eda618e40 100644 --- a/cmd/podman/docker/types.go +++ b/cmd/podman/docker/types.go @@ -69,8 +69,9 @@ type HealthConfig struct { Test []string `json:",omitempty"` // Zero means to inherit. Durations are expressed as integer nanoseconds. - Interval time.Duration `json:",omitempty"` // Interval is the time to wait between checks. - Timeout time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung. + Interval time.Duration `json:",omitempty"` // Interval is the time to wait between checks. + Timeout time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung. + StartPeriod time.Duration `json:",omitempty"` // Time to wait after the container starts before running the first check. // Retries is the number of consecutive failures needed to consider a container as unhealthy. // Zero means inherit. |