diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-01 10:04:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 10:04:19 +0200 |
| commit | ccf4ec295b9a144740b07a202432aa34a7cce3de (patch) | |
| tree | 4859563846256c2a7f30b7637bfb4651f967f6fa /libpod.conf | |
| parent | 39de184b8bfb14954f77190f0e6127c1ddc363c0 (diff) | |
| parent | 7dfaef7766871e5fd914eb0373b26db29df5bb46 (diff) | |
| download | podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.gz podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.bz2 podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.zip | |
Merge pull request #3671 from openSUSE/runtime-path-discovery
Add runtime and conmon path discovery
Diffstat (limited to 'libpod.conf')
| -rw-r--r-- | libpod.conf | 6 |
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", |