vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #802 from baude/add_image_id_to_ps

Browse source 
Add image_id to json output
This commit is contained in:
Daniel J Walsh 2017-08-29 06:57:45 -04:00 committed by GitHub
commit 62f275c784
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/kpod/ps.go
View file

@ -53,6 +53,7 @@ type psTemplateParams struct {
type psJSONParams struct { type psJSONParams struct {
ID string `json:"id"` ID string `json:"id"`
Image string `json:"image"` Image string `json:"image"`
ImageID string `json:"image_id"`
Command string `json:"command"` Command string `json:"command"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
RunningFor time.Duration `json:"runningFor"` RunningFor time.Duration `json:"runningFor"`
@ -296,6 +297,7 @@ func getJSONOutput(containers []*libkpod.ContainerData) (psOutput []psJSONParams
params := psJSONParams{ params := psJSONParams{
ID: ctr.ID, ID: ctr.ID,
Image: ctr.FromImage, Image: ctr.FromImage,
ImageID: ctr.FromImageID,
Command: ctr.ImageCreatedBy, Command: ctr.ImageCreatedBy,
CreatedAt: ctr.State.Created, CreatedAt: ctr.State.Created,
RunningFor: time.Since(ctr.State.Created), RunningFor: time.Since(ctr.State.Created),

2
docs/kpod-images.1.md
View file

@ -51,6 +51,8 @@ kpod images --format json
kpod images --format "{{.ID}}" kpod images --format "{{.ID}}"
kpod images --filter dangling=true
## SEE ALSO ## SEE ALSO
kpod(1) kpod(1)