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 /pkg | |
| 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 'pkg')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 1 | ||||
| -rw-r--r-- | pkg/api/handlers/types.go | 2 | ||||
| -rw-r--r-- | pkg/domain/entities/images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images_list.go | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 54e202103..ebcb1f460 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -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 } diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index c1e84ab5a..72e1a756e 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -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, diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 81f52fef5..27f887e8e 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -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"` diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 98c041c15..92ab0a998 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -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, |