summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-12 12:52:58 -0500
committerGitHub <noreply@github.com>2021-02-12 12:52:58 -0500
commit64255f5fb886ea4861987ddc45cbb0995cf82dea (patch)
treeb939065fb5f44fc69ee8dc31de294f3fb48f128a /pkg
parent291f59600b7857bbec6f340d3ceec6e2e9ce923f (diff)
parentfdf39e169922dc7dda664316a5d4ad570ab181a3 (diff)
downloadpodman-64255f5fb886ea4861987ddc45cbb0995cf82dea.tar.gz
podman-64255f5fb886ea4861987ddc45cbb0995cf82dea.tar.bz2
podman-64255f5fb886ea4861987ddc45cbb0995cf82dea.zip
Merge pull request #9311 from deadNightTiger/fix-pull-dockerjava
apiv2: handle docker-java clients pulling
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 63a329c03..85708912b 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -264,12 +264,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(),
})