opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

check image media/manifest type for healthchecks

Browse Source 
before looking up a healthcheck in an image, check to make sure it is a dockerv2schema image.

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-04-28 11:49:58 -05:00
parent f079b4ee5e
commit a255075fe8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/specgen/generate/container.go
View File

@ -3,6 +3,7 @@ package generate
import ( import (
"context" "context"
"github.com/containers/image/v5/manifest"
"github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod"
ann "github.com/containers/libpod/pkg/annotations" ann "github.com/containers/libpod/pkg/annotations"
envLib "github.com/containers/libpod/pkg/env" envLib "github.com/containers/libpod/pkg/env"
@ -22,7 +23,12 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
return err return err
} }
if s.HealthConfig == nil { _, mediaType, err := newImage.Manifest(ctx)
if err != nil {
return err
}
if s.HealthConfig == nil && mediaType == manifest.DockerV2Schema2MediaType {
s.HealthConfig, err = newImage.GetHealthCheck(ctx) s.HealthConfig, err = newImage.GetHealthCheck(ctx)
if err != nil { if err != nil {
return err return err