summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-01-07 08:46:13 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-01-14 10:22:18 +0100
commit3b37101c6e3679399a5ed05bb2e109df0e0032e8 (patch)
tree0e2fc2ee44b6c943cbc9f3418d2ec661721d1b27
parent50c86ae3892a3708afb00189fea52547cb60572f (diff)
downloadpodman-3b37101c6e3679399a5ed05bb2e109df0e0032e8.tar.gz
podman-3b37101c6e3679399a5ed05bb2e109df0e0032e8.tar.bz2
podman-3b37101c6e3679399a5ed05bb2e109df0e0032e8.zip
config: store the runtime used to create each container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--libpod/container.go3
-rw-r--r--libpod/runtime_ctr.go2
2 files changed, 5 insertions, 0 deletions
diff --git a/libpod/container.go b/libpod/container.go
index ca83bbffe..95f7a2972 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -350,6 +350,9 @@ type ContainerConfig struct {
PostConfigureNetNS bool `json:"postConfigureNetNS"`
+ // OCIRuntime used to create the container
+ OCIRuntime string `json:"runtime,omitempty"`
+
// ExitCommand is the container's exit command.
// This Command will be executed when the container exits
ExitCommand []string `json:"exitCommand,omitempty"`
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index ab79fe5fb..68599fe6d 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -62,6 +62,8 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options ..
ctr.config.StopTimeout = CtrRemoveTimeout
+ ctr.config.OCIRuntime = r.config.OCIRuntime
+
// Set namespace based on current runtime namespace
// Do so before options run so they can override it
if r.config.Namespace != "" {