containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add runj which is an experimental OCI runtime based on FreeBSD jails 

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson 2022-04-26 15:29:28 +01:00
parent 7391336ba5
commit faf3c75d8f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pkg/config/config.go
View File

@ -803,7 +803,7 @@ func (c *Config) Validate() error {
func (c *EngineConfig) findRuntime() string { func (c *EngineConfig) findRuntime() string {
// Search for crun first followed by runc, kata, runsc // Search for crun first followed by runc, kata, runsc
for _, name := range []string{"crun", "runc", "kata", "runsc"} { for _, name := range []string{"crun", "runc", "runj", "kata", "runsc"} {
for _, v := range c.OCIRuntimes[name] { for _, v := range c.OCIRuntimes[name] {
if _, err := os.Stat(v); err == nil { if _, err := os.Stat(v); err == nil {
return name return name

3
common/pkg/config/config_test.go
View File

@ -173,6 +173,9 @@ image_copy_tmp_dir="storage"`
"/bin/runc", "/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc", "/usr/lib/cri-o-runc/sbin/runc",
}, },
"runj": {
"/usr/local/bin/runj",
},
"crun": { "crun": {
"/usr/bin/crun", "/usr/bin/crun",
"/usr/local/bin/crun", "/usr/local/bin/crun",

3
common/pkg/config/default.go
View File

@ -323,6 +323,9 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
"/usr/lib/cri-o-runc/sbin/runc", "/usr/lib/cri-o-runc/sbin/runc",
"/run/current-system/sw/bin/runc", "/run/current-system/sw/bin/runc",
}, },
"runj": {
"/usr/local/bin/runj",
},
"kata": { "kata": {
"/usr/bin/kata-runtime", "/usr/bin/kata-runtime",
"/usr/sbin/kata-runtime", "/usr/sbin/kata-runtime",