diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-25 01:26:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 01:26:21 +0100 |
| commit | 69b011d3ac39b985cdbd2bacfa1eaeba166bf224 (patch) | |
| tree | 21791a26464b4fe55fd879b7c649ea8cd63884db /pkg/api/handlers/libpod | |
| parent | b4520649af59780df494d75f50d0b5081eafff04 (diff) | |
| parent | 1d7cb7cc48d06631e2bdfd0e25eeccc8e87b042f (diff) | |
| download | podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.tar.gz podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.tar.bz2 podman-69b011d3ac39b985cdbd2bacfa1eaeba166bf224.zip | |
Merge pull request #5604 from jwhonce/wip/images
V2 podman images/image list
Diffstat (limited to 'pkg/api/handlers/libpod')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index b6f2f58e8..f8e666451 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -21,6 +21,7 @@ import ( image2 "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/api/handlers" "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/libpod/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" @@ -101,7 +102,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Failed get images")) return } - var summaries = make([]*handlers.ImageSummary, len(images)) + var summaries = make([]*entities.ImageSummary, len(images)) for j, img := range images { is, err := handlers.ImageToImageSummary(img) if err != nil { @@ -109,7 +110,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) { return } // libpod has additional fields that we need to populate. - is.CreatedTime = img.Created() + is.Created = img.Created().Unix() is.ReadOnly = img.IsReadOnly() summaries[j] = is } |