summaryrefslogtreecommitdiff
path: root/libpod/options.go
diff options
context:
space:
mode:
authorVincent Batts <vbatts@hashbangbash.com>2018-11-02 10:18:28 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-01-14 10:03:40 +0100
commit650cf122e1b33f4d8f4426ee1cc1a4bf00c14798 (patch)
treef85f464a253c05a889854ad54633358939cf48ae /libpod/options.go
parent140ae25c4d0c7ba89a0bb7ae16f81f90d20be535 (diff)
downloadpodman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.tar.gz
podman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.tar.bz2
podman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.zip
libpod: allow multiple oci runtimes
This deprecates the libpod.conf variable of `runtime_path=`, and now has `runtimes=`, like a map for naming the runtime, preparing for a `--runtime` flag to `podman run` (i.e. runc, kata, etc.) Reference: https://github.com/containers/libpod/issues/1750 Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Diffstat (limited to 'libpod/options.go')
-rw-r--r--libpod/options.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/options.go b/libpod/options.go
index 319e1f6c6..65a8a91d3 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -147,7 +147,11 @@ func WithOCIRuntime(runtimePath string) RuntimeOption {
return errors.Wrapf(ErrInvalidArg, "must provide a valid path")
}
- rt.config.RuntimePath = []string{runtimePath}
+ rt.config.OCIRuntimes = []OCIRuntimePath{
+ {
+ Paths: []string{runtimePath},
+ },
+ }
return nil
}