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

Merge pull request #10610 from cdoern/healthCheck

Browse Source 
Edited compat handling code for containers/json status and added python tests
This commit is contained in:
OpenShift Merge Robot
2021-06-23 14:45:29 -04:00
committed by GitHub
parent 2b850ef055 6ecdf4c389
commit b0a3ac3578
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/handlers/compat/containers.go
View File

@ -403,6 +403,24 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
state.Status = define.ContainerStateCreated.String()
}
state.Health = &types.Health{
Status: inspect.State.Healthcheck.Status,
FailingStreak: inspect.State.Healthcheck.FailingStreak,
}
log := inspect.State.Healthcheck.Log
for _, item := range log {
res := &types.HealthcheckResult{}
s, _ := time.Parse(time.RFC3339Nano, item.Start)
e, _ := time.Parse(time.RFC3339Nano, item.End)
res.Start = s
res.End = e
res.ExitCode = item.ExitCode
res.Output = item.Output
state.Health.Log = append(state.Health.Log, res)
}
formatCapabilities(inspect.HostConfig.CapDrop)
formatCapabilities(inspect.HostConfig.CapAdd)