summaryrefslogtreecommitdiff
path: root/libpod.conf
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-19 16:42:19 +0200
committerGitHub <noreply@github.com>2019-08-19 16:42:19 +0200
commitb1acc4348184d43def7c63221ee0832505c4b7d1 (patch)
tree8c04b5ce2c82ef50f45d8618ae4874d972abc285 /libpod.conf
parent25f2b9ae984c00d339e7a80eeb487b1f00bd4f7d (diff)
parentf7527fb06da688613c6ce6383664ce5eb48267eb (diff)
downloadpodman-b1acc4348184d43def7c63221ee0832505c4b7d1.tar.gz
podman-b1acc4348184d43def7c63221ee0832505c4b7d1.tar.bz2
podman-b1acc4348184d43def7c63221ee0832505c4b7d1.zip
Merge pull request #3848 from giuseppe/enable-all-tests-crun
tests: enable all tests for crun
Diffstat (limited to 'libpod.conf')
-rw-r--r--libpod.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod.conf b/libpod.conf
index 3bd3758b8..81fece5d2 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -120,7 +120,7 @@ runtime = "runc"
# List of the OCI runtimes that support --format=json. When json is supported
# libpod will use it for reporting nicer errors.
-runtime_supports_json = ["runc"]
+runtime_supports_json = ["crun", "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`