From 519535daa0e5c4ce27a77cea0fb24d87f6ee8c54 Mon Sep 17 00:00:00 2001 From: Aditya R Date: Wed, 20 Apr 2022 16:12:41 +0530 Subject: healthcheck: set default healthcheck Interval if not specified in image Set appropriate defaults for `--interval` when processing a Containerfile with build format as docker. Signed-off-by: Aditya R --- pkg/specgen/generate/container.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'pkg/specgen') diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index f7ea2edfa..5f4218899 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -67,12 +67,21 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat // NOTE: the health check is only set for Docker images // but inspect will take care of it. s.HealthConfig = inspectData.HealthCheck - if s.HealthConfig != nil && s.HealthConfig.Timeout == 0 { - hct, err := time.ParseDuration(define.DefaultHealthCheckTimeout) - if err != nil { - return nil, err + if s.HealthConfig != nil { + if s.HealthConfig.Timeout == 0 { + hct, err := time.ParseDuration(define.DefaultHealthCheckTimeout) + if err != nil { + return nil, err + } + s.HealthConfig.Timeout = hct + } + if s.HealthConfig.Interval == 0 { + hct, err := time.ParseDuration(define.DefaultHealthCheckInterval) + if err != nil { + return nil, err + } + s.HealthConfig.Interval = hct } - s.HealthConfig.Timeout = hct } } -- cgit v1.2.3-54-g00ecf