diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-06-19 17:08:43 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-06-19 17:08:43 -0400 |
| commit | 92bae8d308164680287040ba26d211aefd9b4d7f (patch) | |
| tree | 10a65a0322cba38d64f378259d2a596a4220ed56 /libpod/boltdb_state_internal.go | |
| parent | 3cabd81045c25172786a133c538fe97b5ab83c14 (diff) | |
| download | podman-92bae8d308164680287040ba26d211aefd9b4d7f.tar.gz podman-92bae8d308164680287040ba26d211aefd9b4d7f.tar.bz2 podman-92bae8d308164680287040ba26d211aefd9b4d7f.zip | |
Begin adding support for multiple OCI runtimes
Allow Podman containers to request to use a specific OCI runtime
if multiple runtimes are configured. This is the first step to
properly supporting containers in a multi-runtime environment.
The biggest changes are that all OCI runtimes are now initialized
when Podman creates its runtime, and containers now use the
runtime requested in their configuration (instead of always the
default runtime).
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/boltdb_state_internal.go')
| -rw-r--r-- | libpod/boltdb_state_internal.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go index 313e5f4d7..2ac1867aa 100644 --- a/libpod/boltdb_state_internal.go +++ b/libpod/boltdb_state_internal.go @@ -304,6 +304,16 @@ func (s *BoltState) getContainerFromDB(id []byte, ctr *Container, ctrsBkt *bolt. } ctr.lock = lock + if ctr.config.OCIRuntime == "" { + ctr.ociRuntime = s.runtime.defaultOCIRuntime + } else { + ociRuntime, ok := s.runtime.ociRuntimes[ctr.config.OCIRuntime] + if !ok { + return errors.Wrapf(ErrInternal, "container %s was created with OCI runtime %s, but that runtime is not available in the current configuration", ctr.ID(), ctr.config.OCIRuntime) + } + ctr.ociRuntime = ociRuntime + } + ctr.runtime = s.runtime ctr.valid = valid |