diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-01 06:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 06:38:38 -0400 |
| commit | 11e98d4db2a5d8a093ec9e8a0ba439943c9c169d (patch) | |
| tree | d8beddabc5d83169c77be907976779ab7a510460 /cmd | |
| parent | 957e7a533efe2d314640afac9d3b31cc752edd80 (diff) | |
| parent | 50157b2d3366ec52bbbbd468ed3d1633ed95bd24 (diff) | |
| download | podman-11e98d4db2a5d8a093ec9e8a0ba439943c9c169d.tar.gz podman-11e98d4db2a5d8a093ec9e8a0ba439943c9c169d.tar.bz2 podman-11e98d4db2a5d8a093ec9e8a0ba439943c9c169d.zip | |
Merge pull request #6815 from rhatdan/api
Created timesptamp returned by imagelist should be in unix format
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/images/list.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index de7cca40d..53be82dda 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -128,7 +128,7 @@ func writeID(imgs []imageReporter) error { func writeJSON(images []imageReporter) error { type image struct { entities.ImageSummary - Created string + Created int64 CreatedAt string } @@ -136,8 +136,8 @@ func writeJSON(images []imageReporter) error { for _, e := range images { var h image h.ImageSummary = e.ImageSummary - h.Created = units.HumanDuration(time.Since(e.ImageSummary.Created)) + " ago" - h.CreatedAt = e.ImageSummary.Created.Format(time.RFC3339Nano) + h.Created = e.ImageSummary.Created + h.CreatedAt = e.created().Format(time.RFC3339Nano) h.RepoTags = nil imgs = append(imgs, h) @@ -284,11 +284,11 @@ func (i imageReporter) ID() 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 { - return i.ImageSummary.Created + return time.Unix(i.ImageSummary.Created, 0).UTC() } func (i imageReporter) Size() string { @@ -302,7 +302,7 @@ func (i imageReporter) History() string { } func (i imageReporter) CreatedAt() string { - return i.ImageSummary.Created.String() + return i.created().String() } func (i imageReporter) CreatedSince() string { |