summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorIgor Korolev <missterr@gmail.com>2021-02-10 23:15:48 +0400
committerIgor Korolev <missterr@gmail.com>2021-02-11 00:10:21 +0400
commitfdf39e169922dc7dda664316a5d4ad570ab181a3 (patch)
tree3a401fd4d0e0f871773600d8f2a39c208b5a30b8 /pkg
parent88ab83d4e04f2054713461c3f28d905b4c1c2ee2 (diff)
downloadpodman-fdf39e169922dc7dda664316a5d4ad570ab181a3.tar.gz
podman-fdf39e169922dc7dda664316a5d4ad570ab181a3.tar.bz2
podman-fdf39e169922dc7dda664316a5d4ad570ab181a3.zip
apiv2: handle docker-java clients pulling
When docker-java calls images/create?fromImage=x, it expects two things for a successful response: that both "error" and "errorDetail" are not set, and that the "progress" message contains one of five hard-coded strings ("Download complete" being one of them). Signed-off-by: Igor Korolev <missterr@gmail.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/images.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 0ae0f3bcf..88c59b46a 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -265,12 +265,12 @@ func CreateImageFromImage(w http.ResponseWriter, r *http.Request) {
// Success
utils.WriteResponse(w, http.StatusOK, struct {
Status string `json:"status"`
- Error string `json:"error"`
+ Error string `json:"error,omitempty"`
Progress string `json:"progress"`
ProgressDetail map[string]string `json:"progressDetail"`
Id string `json:"id"` // nolint
}{
- Status: fmt.Sprintf("pulling image (%s) from %s", img.Tag, strings.Join(img.Names(), ", ")),
+ Status: fmt.Sprintf("pulling image (%s) from %s (Download complete)", img.Tag, strings.Join(img.Names(), ", ")),
ProgressDetail: map[string]string{},
Id: img.ID(),
})