diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-30 19:52:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 19:52:04 +0100 |
| commit | e2c406f19936435f270eee528a3446e6d729e178 (patch) | |
| tree | 0690923c359a9be59fbeb578e94839191bb6adc5 /pkg/api/handlers | |
| parent | 1613921ecc8e54a6d2ca6008a54ef16314bbb587 (diff) | |
| parent | 9ba52e8ef0e0fe69fac296a10e1bc6aecc2d25e5 (diff) | |
| download | podman-e2c406f19936435f270eee528a3446e6d729e178.tar.gz podman-e2c406f19936435f270eee528a3446e6d729e178.tar.bz2 podman-e2c406f19936435f270eee528a3446e6d729e178.zip | |
Merge pull request #8465 from rhatdan/pull
Document docker transport is the only supported remote transport
Diffstat (limited to 'pkg/api/handlers')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 6 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/images_pull.go | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 55264b3b6..be5a394de 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -422,8 +422,7 @@ func PushImage(w http.ResponseWriter, r *http.Request) { source := strings.TrimSuffix(utils.GetName(r), "/push") // GetName returns the entire path if _, err := utils.ParseStorageReference(source); err != nil { - utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, - errors.Wrapf(err, "image source %q is not a containers-storage-transport reference", source)) + utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err) return } @@ -433,8 +432,7 @@ func PushImage(w http.ResponseWriter, r *http.Request) { } if _, err := utils.ParseDockerReference(destination); err != nil { - utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, - errors.Wrapf(err, "image destination %q is not a docker-transport reference", destination)) + utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err) return } diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 05e4b8258..5e2727e95 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -53,8 +53,7 @@ func ImagesPull(w http.ResponseWriter, r *http.Request) { imageRef, err := utils.ParseDockerReference(query.Reference) if err != nil { - utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, - errors.Wrapf(err, "image destination %q is not a docker-transport reference", query.Reference)) + utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err) return } |