summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-27 21:53:37 +0200
committerGitHub <noreply@github.com>2020-04-27 21:53:37 +0200
commitf6f71724949c22cf89a44015c29bd5a144db7390 (patch)
tree937537403d515fe2fcb1df9aebc17600347898a0 /pkg/api
parent8642e256f2036f4263b9817322cde7eec8b0915c (diff)
parent67ec4e1d272d20610f885f91cc322edf57a13f45 (diff)
downloadpodman-f6f71724949c22cf89a44015c29bd5a144db7390.tar.gz
podman-f6f71724949c22cf89a44015c29bd5a144db7390.tar.bz2
podman-f6f71724949c22cf89a44015c29bd5a144db7390.zip
Merge pull request #6000 from mheon/volume_backend_flags
Add support for volumes-from, image volumes, init
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/libpod/containers_create.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index f64132d55..40b6cacdb 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -1,6 +1,7 @@
package libpod
import (
+ "context"
"encoding/json"
"net/http"
@@ -26,7 +27,7 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err)
return
}
- ctr, err := generate.MakeContainer(runtime, &sg)
+ ctr, err := generate.MakeContainer(context.Background(), runtime, &sg)
if err != nil {
utils.InternalServerError(w, err)
return