Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created timesptamp returned by imagelist should be in unix format #6815

Merged
merged 1 commit into from
Jul 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/podman/images/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,16 @@ func writeID(imgs []imageReporter) error {
func writeJSON(images []imageReporter) error {
type image struct {
entities.ImageSummary
Created string
Created int64
CreatedAt string
}

imgs := make([]image, 0, len(images))
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)
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion pkg/api/handlers/libpod/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
return
}
// libpod has additional fields that we need to populate.
is.Created = img.Created()
is.ReadOnly = img.IsReadOnly()
summaries[j] = is
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/handlers/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func ImageToImageSummary(l *libpodImage.Image) (*entities.ImageSummary, error) {
ID: l.ID(),
ParentId: l.Parent,
RepoTags: repoTags,
Created: l.Created(),
Created: l.Created().Unix(),
Size: int64(*size),
SharedSize: 0,
VirtualSize: l.VirtualSize,
Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/entities/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type ImageSummary struct {
ID string `json:"Id"`
ParentId string `json:",omitempty"` // nolint
RepoTags []string `json:",omitempty"`
Created time.Time `json:",omitempty"`
Created int64 `json:",omitempty"`
Size int64 `json:",omitempty"`
SharedSize int `json:",omitempty"`
VirtualSize int64 `json:",omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/infra/abi/images_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
ID: img.ID(),

ConfigDigest: string(img.ConfigDigest),
Created: img.Created(),
Created: img.Created().Unix(),
Dangling: img.Dangling(),
Digest: string(img.Digest()),
Digests: digests,
Expand Down