From 7141f972700ed454438d8539dd0bec79c0b61cf4 Mon Sep 17 00:00:00 2001 From: Sebastian Jug Date: Tue, 16 Oct 2018 16:30:53 -0400 Subject: OpenTracing support added to start, stop, run, create, pull, and ps Drop context.Context field from cli.Context Signed-off-by: Sebastian Jug --- cmd/podman/common.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmd/podman/common.go') 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() } -- cgit v1.2.3-54-g00ecf