opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 20:54:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Quadlet - use the default runtime

Browse Source 
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>
Signed-off-by: Dan Čermák <dcermak@suse.com>
(cherry picked from commit 0d75854c52e646f4c83a7a4389d8c4aebbb7ee5c)
This commit is contained in:
Ygal Blum
2023-02-22 09:36:20 +02:00
committed by Dan Čermák
parent a302d386a1
commit df0fe4fcc7
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/systemd/quadlet/quadlet.go
View File

@ -295,11 +295,9 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
"--log-driver", "passthrough",
)
// 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", "/usr/bin/crun",
"--cgroups=split")
podman.add("--cgroups=split")
timezone, ok := container.Lookup(ContainerGroup, KeyTimezone)
if ok && len(timezone) > 0 {

2
test/e2e/quadlet/basepodman.container
View File

@ -1,4 +1,4 @@
## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --log-driver passthrough --runtime /usr/bin/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

1
test/e2e/quadlet/basic.container
View File

@ -5,7 +5,6 @@
## assert-podman-args "--replace"
## assert-podman-args "-d"
## assert-podman-args "--log-driver" "passthrough"
## assert-podman-args "--runtime" "/usr/bin/crun"
## assert-podman-args "--cgroups=split"
## assert-podman-args "--sdnotify=conmon"
## assert-key-is "Unit" "RequiresMountsFor" "%t/containers"