mirror of
https://github.com/containers/podman.git
synced 2025-06-22 01:48:54 +08:00
Quadlet - use the default runtime
Do not set the runtime when processing a .container file Let Podman choose the runtime based on its configuration Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
This commit is contained in:
@ -319,11 +319,9 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
|
||||
|
||||
handleLogDriver(container, ContainerGroup, podman)
|
||||
|
||||
// We use crun as the runtime and delegated groups to it
|
||||
// We delegate groups to the runtime
|
||||
service.Add(ServiceGroup, "Delegate", "yes")
|
||||
podman.add(
|
||||
"--runtime", "crun",
|
||||
"--cgroups=split")
|
||||
podman.add("--cgroups=split")
|
||||
|
||||
timezone, ok := container.Lookup(ContainerGroup, KeyTimezone)
|
||||
if ok && len(timezone) > 0 {
|
||||
|
@ -1,4 +1,4 @@
|
||||
## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --runtime crun --cgroups=split --sdnotify=conmon -d localhost/imagename
|
||||
## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --cgroups=split --sdnotify=conmon -d localhost/imagename
|
||||
|
||||
[Container]
|
||||
Image=localhost/imagename
|
||||
|
@ -5,7 +5,6 @@
|
||||
## assert-podman-args "--replace"
|
||||
## assert-podman-args "-d"
|
||||
## assert-podman-args "--log-driver" "passthrough"
|
||||
## assert-podman-args "--runtime" "crun"
|
||||
## assert-podman-args "--cgroups=split"
|
||||
## assert-podman-args "--sdnotify=conmon"
|
||||
## assert-key-is "Unit" "RequiresMountsFor" "%t/containers"
|
||||
|
Reference in New Issue
Block a user