1 files changed, 18 insertions, 0 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 17455c4c9..9ce20047b 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -115,6 +115,24 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 					if err != nil {
 						return nil, nil, errors.Wrapf(err, "unable to get healthcheck for %s", c.InputArgs[0])
 					}
+
+					if healthCheck != nil {
+						// apply defaults if image doesn't override them
+						if healthCheck.Interval == 0 {
+							healthCheck.Interval = 30 * time.Second
+						}
+						if healthCheck.Timeout == 0 {
+							healthCheck.Timeout = 30 * time.Second
+						}
+						/* Docker default is 0s, so the following would be a no-op
+						if healthCheck.StartPeriod == 0 {
+							healthCheck.StartPeriod = 0 * time.Second
+						}
+						*/
+						if healthCheck.Retries == 0 {
+							healthCheck.Retries = 3
+						}
+					}
 				}
 			}
 		}