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

Quadlet use crun specified in containers.conf 

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2023-02-13 16:28:06 +02:00
parent 166f3dfc1e
commit 3d8936642e
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,7 +317,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
// We use crun as the runtime and delegated groups to it
service.Add(ServiceGroup, "Delegate", "yes")
podman.add(
"--runtime", "/usr/bin/crun",
"--runtime", "crun",
"--cgroups=split")
timezone, ok := container.Lookup(ContainerGroup, KeyTimezone)

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 --runtime crun --cgroups=split --sdnotify=conmon -d localhost/imagename
[Container]
Image=localhost/imagename

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

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