diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-02-15 13:04:23 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-02-15 13:04:23 +0100 |
| commit | 7899b738f46b85aeb29c339e3896499cfca345aa (patch) | |
| tree | eadb7f5620de76a3c7313e13566f19e0e738e63c | |
| parent | 8aa9b85fa7b5abd79826ec1229902eb8e19b4193 (diff) | |
| download | podman-7899b738f46b85aeb29c339e3896499cfca345aa.tar.gz podman-7899b738f46b85aeb29c339e3896499cfca345aa.tar.bz2 podman-7899b738f46b85aeb29c339e3896499cfca345aa.zip | |
docs: mention the new OCI runtime configuration
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | docs/libpod.conf.5.md | 7 | ||||
| -rw-r--r-- | libpod.conf | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 98eb5bece..0c11e2013 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -12,8 +12,11 @@ libpod to manage containers. **image_default_transport**="" Default transport method for pulling and pushing images -**runtime_path**="" - Paths to search for a valid OCI runtime binary +**runtime**="" + Default OCI runtime to use if nothing is specified + +**runtimes** + For each OCI runtime, specify a list of paths to look for. The first one found is used. **conmon_path**="" Paths to search for the Conmon container manager binary diff --git a/libpod.conf b/libpod.conf index acd6c8982..c4e7dc628 100644 --- a/libpod.conf +++ b/libpod.conf @@ -88,6 +88,8 @@ pause_command = "/pause" # Default libpod support for container labeling # label=true +runtime = "runc" + # Paths to look for a valid OCI runtime (runc, runv, etc) [runtimes] runc = [ |