diff options
author | Brent Baude <bbaude@redhat.com> | 2020-03-31 12:59:08 -0500 |
---|---|---|
committer | Brent Baude <bbaude@redhat.com> | 2020-04-01 14:10:57 -0500 |
commit | 8500ce6b9ab0050b925ec3b899495cb2cc8d367f (patch) | |
tree | 554448ea6140ef2a2814fe44b41b5da6f86b06f3 /pkg/api/handlers | |
parent | d534e524272121a6489c1a2a2c11c6b389027ecd (diff) | |
download | podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.tar.gz podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.tar.bz2 podman-8500ce6b9ab0050b925ec3b899495cb2cc8d367f.zip |
podmanv2 load
enable podman load for v2
add reexec into main
add systemd build flag to v2 makefile
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r-- | pkg/api/handlers/libpod/images.go | 2 | ||||
-rw-r--r-- | pkg/api/handlers/swagger.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index bc227d9a1..19c6102be 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -254,7 +254,7 @@ func ImagesLoad(w http.ResponseWriter, r *http.Request) { return } } - utils.WriteResponse(w, http.StatusOK, handlers.LibpodImagesLoadReport{ID: loadedImage}) + utils.WriteResponse(w, http.StatusOK, entities.ImageLoadReport{Name: loadedImage}) } func ImagesImport(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/swagger.go b/pkg/api/handlers/swagger.go index 52763a050..12de3a3bd 100644 --- a/pkg/api/handlers/swagger.go +++ b/pkg/api/handlers/swagger.go @@ -31,7 +31,7 @@ type swagImageInspect struct { // swagger:response DocsLibpodImagesLoadResponse type swagLibpodImagesLoadResponse struct { // in:body - Body []LibpodImagesLoadReport + Body entities.ImageLoadReport } // Import response |