diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-09 16:57:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 16:57:29 +0100 |
| commit | ad4366ad24eee27957ec04f5dd9a34f4a85541e8 (patch) | |
| tree | 27e99320bc4836d6264747adda2f573e190b5423 /vendor/github.com | |
| parent | c996d9f11ea1b480e7041426b70878ca75fc5519 (diff) | |
| parent | faf450ea18179bb0e4ae1213d3ca6c126b04b452 (diff) | |
| download | podman-ad4366ad24eee27957ec04f5dd9a34f4a85541e8.tar.gz podman-ad4366ad24eee27957ec04f5dd9a34f4a85541e8.tar.bz2 podman-ad4366ad24eee27957ec04f5dd9a34f4a85541e8.zip | |
Merge pull request #12239 from vrothberg/fix-12226
support health checks from image configs
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/containers/common/libimage/inspect.go | 5 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config.go | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/libimage/inspect.go b/vendor/github.com/containers/common/libimage/inspect.go index 007cbdd89..d44ebf46e 100644 --- a/vendor/github.com/containers/common/libimage/inspect.go +++ b/vendor/github.com/containers/common/libimage/inspect.go @@ -187,7 +187,12 @@ func (i *Image) Inspect(ctx context.Context, options *InspectOptions) (*ImageDat return nil, err } data.Comment = dockerManifest.Comment + // NOTE: Health checks may be listed in the container config or + // the config. data.HealthCheck = dockerManifest.ContainerConfig.Healthcheck + if data.HealthCheck == nil { + data.HealthCheck = dockerManifest.Config.Healthcheck + } } if data.Annotations == nil { diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index 45230703d..3d7101399 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -1151,10 +1151,11 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) if searchPATH { return exec.LookPath(name) } + configHint := "To resolve this error, set the helper_binaries_dir key in the `[engine]` section of containers.conf to the directory containing your helper binaries." if len(c.Engine.HelperBinariesDir) == 0 { - return "", errors.Errorf("could not find %q because there are no helper binary directories configured", name) + return "", errors.Errorf("could not find %q because there are no helper binary directories configured. %s", name, configHint) } - return "", errors.Errorf("could not find %q in one of %v", name, c.Engine.HelperBinariesDir) + return "", errors.Errorf("could not find %q in one of %v. %s", name, c.Engine.HelperBinariesDir, configHint) } // ImageCopyTmpDir default directory to store tempory image files during copy |