summaryrefslogtreecommitdiff
path: root/pkg/api/handlers
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-01 22:54:22 +0200
committerGitHub <noreply@github.com>2020-04-01 22:54:22 +0200
commit0f357be5aeaa5dc651659cf0945a58780641e77d (patch)
tree77c502c42324db5aa5635b65f615c6a3c4e96fde /pkg/api/handlers
parent0a163720351710be314c729086e8d288680ff0a8 (diff)
parent8500ce6b9ab0050b925ec3b899495cb2cc8d367f (diff)
downloadpodman-0f357be5aeaa5dc651659cf0945a58780641e77d.tar.gz
podman-0f357be5aeaa5dc651659cf0945a58780641e77d.tar.bz2
podman-0f357be5aeaa5dc651659cf0945a58780641e77d.zip
Merge pull request #5686 from baude/v2load
podmanv2 load
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r--pkg/api/handlers/libpod/images.go2
-rw-r--r--pkg/api/handlers/swagger.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 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