summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-27 15:40:24 +0200
committerGitHub <noreply@github.com>2020-04-27 15:40:24 +0200
commitfdf64f0c66be4569732b830ce60c98f98a7efe64 (patch)
tree6cda34f02000425c44a944855b7f193ebb7c556a /pkg/specgen/generate
parent529824ec1e02e9b7ea893bbab35179ef16d4661d (diff)
parent00233e0311810df32bebd06398ce93e92779e1d5 (diff)
downloadpodman-fdf64f0c66be4569732b830ce60c98f98a7efe64.tar.gz
podman-fdf64f0c66be4569732b830ce60c98f98a7efe64.tar.bz2
podman-fdf64f0c66be4569732b830ce60c98f98a7efe64.zip
Merge pull request #5994 from giuseppe/fix-healthchecks
v2, podman: fix healthchecks
Diffstat (limited to 'pkg/specgen/generate')
-rw-r--r--pkg/specgen/generate/container.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index 9797ad572..669b1f05f 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -25,6 +25,13 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
return err
}
+ if s.HealthConfig == nil {
+ s.HealthConfig, err = newImage.GetHealthCheck(ctx)
+ if err != nil {
+ return err
+ }
+ }
+
// Image stop signal
if s.StopSignal == nil {
stopSignal, err := newImage.StopSignal(ctx)