summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-17 14:43:21 -0400
committerGitHub <noreply@github.com>2020-04-17 14:43:21 -0400
commitba289dcd79e3a2b5ec5dc02bd8adb84c93bef577 (patch)
tree977792d0b732bb67f9270d34e30bfac3cb5aab73 /pkg/api
parenta5884c07dfb092eab88cf153238e714910388a06 (diff)
parent44a8cf867665927111fe9ea03711c8fabfc7d4a2 (diff)
downloadpodman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.tar.gz
podman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.tar.bz2
podman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.zip
Merge pull request #5868 from baude/v2t2
Fixes for system tests
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/libpod/images.go2
-rw-r--r--pkg/api/handlers/types.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index a42d06205..284b33637 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -111,7 +111,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
return
}
// libpod has additional fields that we need to populate.
- is.Created = img.Created().Unix()
+ 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 f402da064..4c081cf85 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -262,7 +262,7 @@ func ImageToImageSummary(l *libpodImage.Image) (*entities.ImageSummary, error) {
ID: l.ID(),
ParentId: l.Parent,
RepoTags: repoTags,
- Created: l.Created().Unix(),
+ Created: l.Created(),
Size: int64(*size),
SharedSize: 0,
VirtualSize: l.VirtualSize,