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

Merge pull request #23029 from ygalblum/quadlet-template-unescaped 

Quadlet - use specifier for unescaped values for templated container name
This commit is contained in:
openshift-merge-bot[bot] 2024-06-20 18:47:01 +00:00 committed by GitHub
parent 48e1efbe82 91a5c0de2a
commit fdaef4609f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -488,7 +488,7 @@ func ConvertContainer(container *parser.UnitFile, names map[string]string, isUse
if !ok || len(containerName) == 0 { if !ok || len(containerName) == 0 {
// By default, We want to name the container by the service name // By default, We want to name the container by the service name
if strings.Contains(container.Filename, "@") { if strings.Contains(container.Filename, "@") {
containerName = "systemd-%P_%I" containerName = "systemd-%p_%i"
} else { } else {
containerName = "systemd-%N" containerName = "systemd-%N"
} }

2
test/e2e/quadlet/template@.container
View File

@ -1,5 +1,5 @@
## assert-podman-final-args localhost/imagename ## assert-podman-final-args localhost/imagename
## assert-podman-args "--name=systemd-%P_%I" ## assert-podman-args "--name=systemd-%p_%i"
## assert-symlink want.service.wants/template@default.service ../template@.service ## assert-symlink want.service.wants/template@default.service ../template@.service
## assert-podman-args --env "FOO=bar" ## assert-podman-args --env "FOO=bar"

2
test/e2e/quadlet/template@instance.container
View File

@ -1,5 +1,5 @@
## assert-podman-final-args localhost/changed-image ## assert-podman-final-args localhost/changed-image
## assert-podman-args "--name=systemd-%P_%I" ## assert-podman-args "--name=systemd-%p_%i"
## assert-symlink want.service.wants/template@instance.service ../template@instance.service ## assert-symlink want.service.wants/template@instance.service ../template@instance.service
## assert-podman-args --env "FOO=bar" ## assert-podman-args --env "FOO=bar"