Make docker load to output json when the response content type is json.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fd2c0feb0c131d01d727d50baa7183b976c7bdc
Component: engine
This commit is contained in:
David Calavera
2015-12-22 19:00:27 -05:00
parent 13048f0ce1
commit 382aba32a8
4 changed files with 23 additions and 7 deletions

View File

@ -53,7 +53,7 @@ type apiClient interface {
ImageImport(options types.ImageImportOptions) (io.ReadCloser, error)
ImageInspectWithRaw(imageID string, getSize bool) (types.ImageInspect, []byte, error)
ImageList(options types.ImageListOptions) ([]types.Image, error)
ImageLoad(input io.Reader) (io.ReadCloser, error)
ImageLoad(input io.Reader) (types.ImageLoadResponse, error)
ImagePull(options types.ImagePullOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
ImagePush(options types.ImagePushOptions, privilegeFunc lib.RequestPrivilegeFunc) (io.ReadCloser, error)
ImageRemove(options types.ImageRemoveOptions) ([]types.ImageDelete, error)