From 043308198337941a8086113619d6341528c10cd0 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 31 Mar 2020 14:45:19 -0500 Subject: podmanv2 import add the ability to import a container image from a container export Signed-off-by: Brent Baude --- pkg/api/handlers/libpod/images.go | 2 +- pkg/api/handlers/swagger.go | 2 +- pkg/api/handlers/types.go | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'pkg/api') diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 19c6102be..d4fd77cd7 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -300,7 +300,7 @@ func ImagesImport(w http.ResponseWriter, r *http.Request) { return } - utils.WriteResponse(w, http.StatusOK, handlers.LibpodImagesImportReport{ID: importedImage}) + utils.WriteResponse(w, http.StatusOK, entities.ImageImportReport{Id: importedImage}) } // ImagesPull is the v2 libpod endpoint for pulling images. Note that the diff --git a/pkg/api/handlers/swagger.go b/pkg/api/handlers/swagger.go index 12de3a3bd..33a9fdd58 100644 --- a/pkg/api/handlers/swagger.go +++ b/pkg/api/handlers/swagger.go @@ -38,7 +38,7 @@ type swagLibpodImagesLoadResponse struct { // swagger:response DocsLibpodImagesImportResponse type swagLibpodImagesImportResponse struct { // in:body - Body LibpodImagesImportReport + Body entities.ImageImportReport } // Pull response diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 89a571e67..496512f2e 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -38,10 +38,6 @@ type LibpodImagesLoadReport struct { ID string `json:"id"` } -type LibpodImagesImportReport struct { - ID string `json:"id"` -} - type LibpodImagesPullReport struct { ID string `json:"id"` } -- cgit v1.2.3-54-g00ecf