summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
authorSascha Grunert <sgrunert@suse.com>2019-07-30 13:24:02 +0200
committerSascha Grunert <sgrunert@suse.com>2019-08-01 08:32:25 +0200
commit7dfaef7766871e5fd914eb0373b26db29df5bb46 (patch)
tree8a321b2b5a98b90e6054b9027f3b7f4ea61474a0 /libpod.conf
parenta622f8d345b1853401de2e533e9fbf14ef169fa2 (diff)
downloadpodman-7dfaef7766871e5fd914eb0373b26db29df5bb46.tar.gz
podman-7dfaef7766871e5fd914eb0373b26db29df5bb46.tar.bz2
podman-7dfaef7766871e5fd914eb0373b26db29df5bb46.zip
Add runtime and conmon path discovery
The `$PATH` environment variable will now used as fallback if no valid runtime or conmon path matches. The debug logs has been updated to state the used executable. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod.conf b/libpod.conf
index 6dd021c02..3bd3758b8 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -4,7 +4,9 @@
# Default transport method for pulling and pushing for images
image_default_transport = "docker://"
-# Paths to look for the Conmon container manager binary
+# Paths to look for the conmon container manager binary.
+# If the paths are empty or no valid path was found, then the `$PATH`
+# environment variable will be used as the fallback.
conmon_path = [
"/usr/libexec/podman/conmon",
"/usr/local/libexec/podman/conmon",
@@ -121,6 +123,8 @@ runtime = "runc"
runtime_supports_json = ["runc"]
# Paths to look for a valid OCI runtime (runc, runv, etc)
+# If the paths are empty or no valid path was found, then the `$PATH`
+# environment variable will be used as the fallback.
[runtimes]
runc = [
"/usr/bin/runc",