Merge pull request containers#1579 from dfr/ocijail-json

openshift-merge-robot · web-flow · commit 393ca9458840 · 2023-07-24T10:26:23.000+02:00
pkg/config: Add ocijail to the RuntimeSupportsJSON list
diff --git a/pkg/config/containers.conf-freebsd b/pkg/config/containers.conf-freebsd
@@ -500,7 +500,7 @@ default_sysctls = [
 # List of the OCI runtimes that support --format=json. When json is supported
 # engine will use it for reporting nicer errors.
 #
-#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun", "ocijail"]
 
 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
diff --git a/pkg/config/default.go b/pkg/config/default.go
@@ -406,6 +406,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
 		"runsc",
 		"youki",
 		"krun",
+		"ocijail",
 	}
 	c.RuntimeSupportsNoCgroups = []string{"crun", "krun"}
 	c.RuntimeSupportsKVM = []string{"kata", "kata-runtime", "kata-qemu", "kata-fc", "krun"}

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ default_sysctls = [`
`500`	`500`	`# List of the OCI runtimes that support --format=json. When json is supported`
`501`	`501`	`# engine will use it for reporting nicer errors.`
`502`	`502`	`#`
`503`		`-#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun"]`
	`503`	`+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "youki", "krun", "ocijail"]`
`504`	`504`
`505`	`505`	`# List of the OCI runtimes that supports running containers with KVM Separation.`
`506`	`506`	`#`
Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {`
`406`	`406`	`"runsc",`
`407`	`407`	`"youki",`
`408`	`408`	`"krun",`
	`409`	`+ "ocijail",`
`409`	`410`	`}`
`410`	`411`	`c.RuntimeSupportsNoCgroups = []string{"crun", "krun"}`
`411`	`412`	`c.RuntimeSupportsKVM = []string{"kata", "kata-runtime", "kata-qemu", "kata-fc", "krun"}`