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

Merge pull request #6815 from rhatdan/api

Browse Source 
Created timesptamp returned by imagelist should be in unix format
This commit is contained in:
OpenShift Merge Robot
2020-07-01 06:38:38 -04:00
committed by GitHub
parent 957e7a533e 50157b2d33
commit 11e98d4db2
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/podman/images/list.go
View File

@ -128,7 +128,7 @@ func writeID(imgs []imageReporter) error {
func writeJSON(images []imageReporter) error { func writeJSON(images []imageReporter) error {
type image struct { type image struct {
entities.ImageSummary entities.ImageSummary
Created string Created int64
CreatedAt string CreatedAt string
} }
@ -136,8 +136,8 @@ func writeJSON(images []imageReporter) error {
for _, e := range images { for _, e := range images {
var h image var h image
h.ImageSummary = e.ImageSummary h.ImageSummary = e.ImageSummary
h.Created = units.HumanDuration(time.Since(e.ImageSummary.Created)) + " ago" h.Created = e.ImageSummary.Created
h.CreatedAt = e.ImageSummary.Created.Format(time.RFC3339Nano) h.CreatedAt = e.created().Format(time.RFC3339Nano)
h.RepoTags = nil h.RepoTags = nil
imgs = append(imgs, h) imgs = append(imgs, h)
@ -284,11 +284,11 @@ func (i imageReporter) ID() string {
} }
func (i imageReporter) Created() string { func (i imageReporter) Created() string {
return units.HumanDuration(time.Since(i.ImageSummary.Created)) + " ago" return units.HumanDuration(time.Since(i.created())) + " ago"
} }
func (i imageReporter) created() time.Time { func (i imageReporter) created() time.Time {
return i.ImageSummary.Created return time.Unix(i.ImageSummary.Created, 0).UTC()
} }
func (i imageReporter) Size() string { func (i imageReporter) Size() string {
@ -302,7 +302,7 @@ func (i imageReporter) History() string {
} }
func (i imageReporter) CreatedAt() string { func (i imageReporter) CreatedAt() string {
return i.ImageSummary.Created.String() return i.created().String()
} }
func (i imageReporter) CreatedSince() string { func (i imageReporter) CreatedSince() string {

1
pkg/api/handlers/libpod/images.go
View File

@ -112,7 +112,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
return return
} }
// libpod has additional fields that we need to populate. // libpod has additional fields that we need to populate.
is.Created = img.Created()
is.ReadOnly = img.IsReadOnly() is.ReadOnly = img.IsReadOnly()
summaries[j] = is summaries[j] = is
} }

2
pkg/api/handlers/types.go
View File

@ -221,7 +221,7 @@ func ImageToImageSummary(l *libpodImage.Image) (*entities.ImageSummary, error) {
ID: l.ID(), ID: l.ID(),
ParentId: l.Parent, ParentId: l.Parent,
RepoTags: repoTags, RepoTags: repoTags,
Created: l.Created(), Created: l.Created().Unix(),
Size: int64(*size), Size: int64(*size),
SharedSize: 0, SharedSize: 0,
VirtualSize: l.VirtualSize, VirtualSize: l.VirtualSize,

2
pkg/domain/entities/images.go
View File

@ -53,7 +53,7 @@ type ImageSummary struct {
ID string `json:"Id"` ID string `json:"Id"`
ParentId string `json:",omitempty"` // nolint ParentId string `json:",omitempty"` // nolint
RepoTags []string `json:",omitempty"` RepoTags []string `json:",omitempty"`
Created time.Time `json:",omitempty"` Created int64 `json:",omitempty"`
Size int64 `json:",omitempty"` Size int64 `json:",omitempty"`
SharedSize int `json:",omitempty"` SharedSize int `json:",omitempty"`
VirtualSize int64 `json:",omitempty"` VirtualSize int64 `json:",omitempty"`

2
pkg/domain/infra/abi/images_list.go
View File

@ -52,7 +52,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
ID: img.ID(), ID: img.ID(),
ConfigDigest: string(img.ConfigDigest), ConfigDigest: string(img.ConfigDigest),
Created: img.Created(), Created: img.Created().Unix(),
Dangling: img.Dangling(), Dangling: img.Dangling(),
Digest: string(img.Digest()), Digest: string(img.Digest()),
Digests: digests, Digests: digests,