diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-21 14:46:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-21 14:46:54 +0200 |
| commit | 7d8aba924820447a9f07b78dbaf795f94c4e906d (patch) | |
| tree | d54d886bbea33a0b15dbbf64e7f21d438cbe0919 /libpod/container.go | |
| parent | 54920601ae69ca9b22bda75882425b88cd99efea (diff) | |
| parent | 2ee24046838087c335af7c8bf8ae39ba129cd799 (diff) | |
| download | podman-7d8aba924820447a9f07b78dbaf795f94c4e906d.tar.gz podman-7d8aba924820447a9f07b78dbaf795f94c4e906d.tar.bz2 podman-7d8aba924820447a9f07b78dbaf795f94c4e906d.zip | |
Merge pull request #3378 from mheon/multiple_runtimes
Begin adding support for multiple OCI runtimes
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libpod/container.go b/libpod/container.go index 68c4cd6b0..464b233d1 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -145,9 +145,10 @@ type Container struct { // Functions called on a batched container will not lock or sync batched bool - valid bool - lock lock.Locker - runtime *Runtime + valid bool + lock lock.Locker + runtime *Runtime + ociRuntime *OCIRuntime rootlessSlirpSyncR *os.File rootlessSlirpSyncW *os.File @@ -789,7 +790,7 @@ func (c *Container) LogDriver() string { // RuntimeName returns the name of the runtime func (c *Container) RuntimeName() string { - return c.runtime.ociRuntime.name + return c.config.OCIRuntime } // Runtime spec accessors |