From 3373554fe84e385424f7a8701dcbd0094d996d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 22 Aug 2025 12:06:48 +0200 Subject: [PATCH] Add runtime option for the docker container driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make it possible to select between "runc" and "runv", etc. Validation is done later (by the driver), if actually used. Signed-off-by: Anders F Björklund --- pkg/limayaml/limayaml.go | 7 ++++++- templates/default.yaml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/limayaml/limayaml.go b/pkg/limayaml/limayaml.go index a21c4aa5cf0..0c31309caba 100644 --- a/pkg/limayaml/limayaml.go +++ b/pkg/limayaml/limayaml.go @@ -107,7 +107,8 @@ type User struct { } type VMOpts struct { - QEMU QEMUOpts `yaml:"qemu,omitempty" json:"qemu,omitempty"` + QEMU QEMUOpts `yaml:"qemu,omitempty" json:"qemu,omitempty"` + Docker DockerOpts `yaml:"docker,omitempty" json:"docker,omitempty"` } type QEMUOpts struct { @@ -115,6 +116,10 @@ type QEMUOpts struct { CPUType CPUType `yaml:"cpuType,omitempty" json:"cpuType,omitempty" jsonschema:"nullable"` } +type DockerOpts struct { + Runtime *string `yaml:"runtime,omitempty" json:"runtime,omitempty" jsonschema:"nullable"` +} + type Rosetta struct { Enabled *bool `yaml:"enabled,omitempty" json:"enabled,omitempty" jsonschema:"nullable"` BinFmt *bool `yaml:"binfmt,omitempty" json:"binfmt,omitempty" jsonschema:"nullable"` diff --git a/templates/default.yaml b/templates/default.yaml index 2aa5c4077d1..236ee56b0a1 100644 --- a/templates/default.yaml +++ b/templates/default.yaml @@ -329,6 +329,11 @@ vmOpts: # armv7l: "max" # (or "host" when running on armv7l host) # riscv64: "max" # (or "host" when running on riscv64 host) # x86_64: "max" # (or "host" when running on x86_64 host; additional options are appended on Intel Mac) + docker: + # The container runtime to use when running. + # Will be ignored if the vmType is not "docker" + # 🟢 Builtin default: none (use daemon default) + runtime: null # OS: "Linux". # 🟢 Builtin default: "Linux"