diff options
| author | Sebastian Jug <sejug@redhat.com> | 2018-10-16 16:30:53 -0400 |
|---|---|---|
| committer | Sebastian Jug <seb@stianj.ug> | 2019-02-18 09:57:08 -0500 |
| commit | 7141f972700ed454438d8539dd0bec79c0b61cf4 (patch) | |
| tree | bfa2e524b71757a514a02ef68661b46dca9a3dfe /cmd/podman/common.go | |
| parent | e738ef16225395f5f5e4b93ba1a43ae9449ae11b (diff) | |
| download | podman-7141f972700ed454438d8539dd0bec79c0b61cf4.tar.gz podman-7141f972700ed454438d8539dd0bec79c0b61cf4.tar.bz2 podman-7141f972700ed454438d8539dd0bec79c0b61cf4.zip | |
OpenTracing support added to start, stop, run, create, pull, and ps
Drop context.Context field from cli.Context
Signed-off-by: Sebastian Jug <sejug@redhat.com>
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index ec755c4a8..fed07de7c 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -104,6 +104,9 @@ func getAllOrLatestContainers(c *cliconfig.PodmanCommand, runtime *libpod.Runtim // getContext returns a non-nil, empty context func getContext() context.Context { + if Ctx != nil { + return Ctx + } return context.TODO() } |