diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-12 12:52:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 12:52:58 -0500 |
| commit | 64255f5fb886ea4861987ddc45cbb0995cf82dea (patch) | |
| tree | b939065fb5f44fc69ee8dc31de294f3fb48f128a | |
| parent | 291f59600b7857bbec6f340d3ceec6e2e9ce923f (diff) | |
| parent | fdf39e169922dc7dda664316a5d4ad570ab181a3 (diff) | |
| download | podman-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
| -rw-r--r-- | pkg/api/handlers/compat/images.go | 4 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 2 |
2 files changed, 3 insertions, 3 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(), }) diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index 7b500bf57..693c34ced 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -41,7 +41,7 @@ t GET images/$iid/json 200 \ .Id=sha256:$iid \ .RepoTags[0]=$IMAGE -t POST "images/create?fromImage=alpine" '' 200 +t POST "images/create?fromImage=alpine" '' 200 .error=null .status~".*Download complete.*" t POST "images/create?fromImage=alpine&tag=latest" '' 200 |