aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorumohnani8 <umohnani@redhat.com>2018-04-18 16:48:35 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-04-19 14:08:47 +0000
commit27107fdac1d75f97caab47cd13efb1d9900cf350 (patch)
treef5edafbb52505829b15e19ea6a9e66f4440e862b /cmd/podman/common.go
parent6a9dbf3305e93e5e1c3bff09402a9b801c935fbd (diff)
downloadpodman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.gz
podman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.bz2
podman-27107fdac1d75f97caab47cd13efb1d9900cf350.zip
Vendor in latest containers/image and contaners/storage
Made necessary changes to functions to include contex.Context wherever needed Signed-off-by: umohnani8 <umohnani@redhat.com> Closes: #640 Approved by: baude
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 755285c95..9ee99bebc 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -1,6 +1,7 @@
package main
import (
+ "context"
"reflect"
"regexp"
"strings"
@@ -67,6 +68,11 @@ func validateFlags(c *cli.Context, flags []cli.Flag) error {
return nil
}
+// getContext returns a non-nil, empty context
+func getContext() context.Context {
+ return context.TODO()
+}
+
// Common flags shared between commands
var createFlags = []cli.Flag{
cli.StringSliceFlag{