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

Merge pull request #17493 from rhatdan/quadlet 

Quadlet use crun specified in containers.conf
This commit is contained in:
OpenShift Merge Robot 2023-02-15 09:26:27 -05:00 committed by GitHub
parent 0cad682d88 3d8936642e
commit d63d91694e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 // We use crun as the runtime and delegated groups to it
service.Add(ServiceGroup, "Delegate", "yes") service.Add(ServiceGroup, "Delegate", "yes")
podman.add( podman.add(
"--runtime", "/usr/bin/crun", "--runtime", "crun",
"--cgroups=split") "--cgroups=split")
timezone, ok := container.Lookup(ContainerGroup, KeyTimezone) 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] [Container]
Image=localhost/imagename Image=localhost/imagename

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

@ -5,7 +5,7 @@
## assert-podman-args "--replace" ## assert-podman-args "--replace"
## assert-podman-args "-d" ## assert-podman-args "-d"
## assert-podman-args "--log-driver" "passthrough" ## 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 "--cgroups=split"
## assert-podman-args "--sdnotify=conmon" ## assert-podman-args "--sdnotify=conmon"
## assert-key-is "Unit" "RequiresMountsFor" "%t/containers" ## assert-key-is "Unit" "RequiresMountsFor" "%t/containers"