diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-16 12:44:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 12:44:10 +0100 |
| commit | d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0 (patch) | |
| tree | d0546c3da5d6aad67d3543cb4d6fc4faa6620735 /libpod.conf | |
| parent | b3abe2c28941143d520e03c581b0ee3c3fafc087 (diff) | |
| parent | 3b37101c6e3679399a5ed05bb2e109df0e0032e8 (diff) | |
| download | podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.gz podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.bz2 podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.zip | |
Merge pull request #2079 from giuseppe/multiple-runtimes
oci: allow to define multiple OCI runtimes
Diffstat (limited to 'libpod.conf')
| -rw-r--r-- | libpod.conf | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libpod.conf b/libpod.conf index cfdf83775..acd6c8982 100644 --- a/libpod.conf +++ b/libpod.conf @@ -4,17 +4,6 @@ # Default transport method for pulling and pushing for images image_default_transport = "docker://" -# Paths to look for a valid OCI runtime (runc, runv, etc) -runtime_path = [ - "/usr/bin/runc", - "/usr/sbin/runc", - "/usr/local/bin/runc", - "/usr/local/sbin/runc", - "/sbin/runc", - "/bin/runc", - "/usr/lib/cri-o-runc/sbin/runc" -] - # Paths to look for the Conmon container manager binary conmon_path = [ "/usr/libexec/podman/conmon", @@ -98,3 +87,15 @@ pause_command = "/pause" # Default libpod support for container labeling # label=true + +# Paths to look for a valid OCI runtime (runc, runv, etc) +[runtimes] +runc = [ + "/usr/bin/runc", + "/usr/sbin/runc", + "/usr/local/bin/runc", + "/usr/local/sbin/runc", + "/sbin/runc", + "/bin/runc", + "/usr/lib/cri-o-runc/sbin/runc" +] |