opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8752 from baude/bindings3volumes

Browse Source 
misc bindings to podman v3
This commit is contained in:
OpenShift Merge Robot
2020-12-17 17:22:37 +00:00
committed by GitHub
parent 033336606f 86335aa4ae
commit a17afa931d
73 changed files with 3614 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/handlers/compat/events.go
View File

@ -33,6 +33,8 @@ func filtersFromRequest(r *http.Request) ([]string, error) {
if _, found := r.URL.Query()["filters"]; found {
raw = []byte(r.Form.Get("filters"))
} else if _, found := r.URL.Query()["Filters"]; found {
raw = []byte(r.Form.Get("Filters"))
} else {
return []string{}, nil
}
@ -95,7 +97,6 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
utils.Error(w, "failed to parse parameters", http.StatusBadRequest, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
return
}
eventChannel := make(chan *events.Event)
errorChannel := make(chan error)

2
pkg/api/handlers/libpod/images.go
View File

@ -286,7 +286,7 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
case define.OCIManifestDir, define.V2s2ManifestDir:
tmpdir, err := ioutil.TempDir("", "save")
if err != nil {
utils.Error(w, "unable to create tmpdir", http.StatusInternalServerError, errors.Wrap(err, "unable to create tempdir"))
utils.Error(w, "unable to create tmpdir", http.StatusInternalServerError, errors.Wrap(err, "unable to create tmpdir"))
return
}
output = tmpdir