diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-02 21:35:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 21:35:31 +0100 |
| commit | e74072e742a427fbd8577fdc98daf1133cf13c48 (patch) | |
| tree | f8ecccc4764a301373e1c0780af41ac7eb238658 /pkg/api | |
| parent | d45676549d67033364f6777765054073036cfc32 (diff) | |
| parent | f525d8b8431b13359c0e2f6c8be45687eb32a0fd (diff) | |
| download | podman-e74072e742a427fbd8577fdc98daf1133cf13c48.tar.gz podman-e74072e742a427fbd8577fdc98daf1133cf13c48.tar.bz2 podman-e74072e742a427fbd8577fdc98daf1133cf13c48.zip | |
Merge pull request #8112 from QiWang19/load-optional-name
Drop name argument from Load API
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/images.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index d177b2335..a51dd8ed3 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -390,7 +390,7 @@ func LoadImages(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "failed to write temporary file")) return } - id, err := runtime.LoadImage(r.Context(), "", f.Name(), writer, "") + id, err := runtime.LoadImage(r.Context(), f.Name(), writer, "") if err != nil { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "failed to load image")) return diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index be5a394de..6145207ca 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -336,7 +336,7 @@ func ImagesLoad(w http.ResponseWriter, r *http.Request) { } tmpfile.Close() - loadedImage, err := runtime.LoadImage(context.Background(), query.Reference, tmpfile.Name(), os.Stderr, "") + loadedImage, err := runtime.LoadImage(context.Background(), tmpfile.Name(), os.Stderr, "") if err != nil { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "unable to load image")) return |