summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-15 14:21:43 +0100
committerGitHub <noreply@github.com>2019-02-15 14:21:43 +0100
commit5a0a1144c5341534c56e27cada481682fb4c810f (patch)
tree03897b13bce7ba16b581cf13458b13e26383022d /docs
parentd512c4d255ad0229e52804b805da119ff9075c3d (diff)
parent7899b738f46b85aeb29c339e3896499cfca345aa (diff)
downloadpodman-5a0a1144c5341534c56e27cada481682fb4c810f.tar.gz
podman-5a0a1144c5341534c56e27cada481682fb4c810f.tar.bz2
podman-5a0a1144c5341534c56e27cada481682fb4c810f.zip
Merge pull request #2346 from giuseppe/fix-runtime-lookup
libpod.conf: add backward compatibility for runtime_path
Diffstat (limited to 'docs')
-rw-r--r--docs/libpod.conf.5.md7
1 files changed, 5 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