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

inspect image healthchecks

Browse Source 
when a docker image has a defined healthcheck, it should be displayed with inspect.  this is only valid for docker images as oci images are not aware of healthchecks.

Fixes: #4799
Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-01-26 16:00:32 -06:00
parent 40d36b1cf1
commit 6181faa90d
3 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/image/image.go
View File

@ -1012,6 +1012,15 @@ func (i *Image) Inspect(ctx context.Context) (*inspect.ImageData, error) {
History: ociv1Img.History, History: ociv1Img.History,
NamesHistory: i.NamesHistory(), NamesHistory: i.NamesHistory(),
} }
if manifestType == manifest.DockerV2Schema2MediaType {
hc, err := i.GetHealthCheck(ctx)
if err != nil {
return nil, err
}
if hc != nil {
data.HealthCheck = hc
}
}
return data, nil return data, nil
} }

46
pkg/inspect/inspect.go
View File

@ -3,6 +3,7 @@ package inspect
import ( import (
"time" "time"
"github.com/containers/image/v5/manifest"
"github.com/containers/libpod/libpod/driver" "github.com/containers/libpod/libpod/driver"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/image-spec/specs-go/v1"
@ -10,28 +11,29 @@ import (
// ImageData holds the inspect information of an image // ImageData holds the inspect information of an image
type ImageData struct { type ImageData struct {
ID string `json:"Id"` ID string `json:"Id"`
Digest digest.Digest `json:"Digest"` Digest digest.Digest `json:"Digest"`
RepoTags []string `json:"RepoTags"` RepoTags []string `json:"RepoTags"`
RepoDigests []string `json:"RepoDigests"` RepoDigests []string `json:"RepoDigests"`
Parent string `json:"Parent"` Parent string `json:"Parent"`
Comment string `json:"Comment"` Comment string `json:"Comment"`
Created *time.Time `json:"Created"` Created *time.Time `json:"Created"`
Config *v1.ImageConfig `json:"Config"` Config *v1.ImageConfig `json:"Config"`
Version string `json:"Version"` Version string `json:"Version"`
Author string `json:"Author"` Author string `json:"Author"`
Architecture string `json:"Architecture"` Architecture string `json:"Architecture"`
Os string `json:"Os"` Os string `json:"Os"`
Size int64 `json:"Size"` Size int64 `json:"Size"`
VirtualSize int64 `json:"VirtualSize"` VirtualSize int64 `json:"VirtualSize"`
GraphDriver *driver.Data `json:"GraphDriver"` GraphDriver *driver.Data `json:"GraphDriver"`
RootFS *RootFS `json:"RootFS"` RootFS *RootFS `json:"RootFS"`
Labels map[string]string `json:"Labels"` Labels map[string]string `json:"Labels"`
Annotations map[string]string `json:"Annotations"` Annotations map[string]string `json:"Annotations"`
ManifestType string `json:"ManifestType"` ManifestType string `json:"ManifestType"`
User string `json:"User"` User string `json:"User"`
History []v1.History `json:"History"` History []v1.History `json:"History"`
NamesHistory []string `json:"NamesHistory"` NamesHistory []string `json:"NamesHistory"`
HealthCheck *manifest.Schema2HealthConfig `json:"Healthcheck,omitempty"`
} }
// RootFS holds the root fs information of an image // RootFS holds the root fs information of an image

13
test/e2e/inspect_test.go
View File

@ -164,4 +164,17 @@ var _ = Describe("Podman inspect", func() {
Expect(inspectDst.ExitCode()).To(Equal(0)) Expect(inspectDst.ExitCode()).To(Equal(0))
Expect(inspectDst.OutputToString()).To(Equal("/test1")) Expect(inspectDst.OutputToString()).To(Equal("/test1"))
}) })
It("podman inspect shows healthcheck on docker image", func() {
pull := podmanTest.Podman([]string{"pull", healthcheck})
pull.WaitWithDefaultTimeout()
Expect(pull.ExitCode()).To(BeZero())
session := podmanTest.Podman([]string{"inspect", "--format=json", healthcheck})
session.WaitWithDefaultTimeout()
imageData := session.InspectImageJSON()
Expect(imageData[0].HealthCheck.Timeout).To(BeNumerically("==", 3000000000))
Expect(imageData[0].HealthCheck.Interval).To(BeNumerically("==", 60000000000))
Expect(imageData[0].HealthCheck.Test).To(Equal([]string{"CMD-SHELL", "curl -f http://localhost/ || exit 1"}))
})
}) })