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

cli: podman run/create --log-opt use StringArray() 

This option accepts arbitrary input so we should allow commas in it.

Fixes #20064

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2023-12-07 16:40:41 +01:00
parent b011aa4430
commit dbbec99361
No known key found for this signature in database
GPG Key ID: EB145DD938A3CAF2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/common/create.go
View File

@ -282,7 +282,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions,
_ = cmd.RegisterFlagCompletionFunc(logDriverFlagName, AutocompleteLogDriver) _ = cmd.RegisterFlagCompletionFunc(logDriverFlagName, AutocompleteLogDriver)
logOptFlagName := "log-opt" logOptFlagName := "log-opt"
createFlags.StringSliceVar( createFlags.StringArrayVar(
&cf.LogOptions, &cf.LogOptions,
logOptFlagName, []string{}, logOptFlagName, []string{},
"Logging driver options", "Logging driver options",

4
test/e2e/logs_test.go
View File

@ -536,7 +536,7 @@ var _ = Describe("Podman logs", func() {
It("using journald for container with container tag", func() { It("using journald for container with container tag", func() {
SkipIfJournaldUnavailable() SkipIfJournaldUnavailable()
logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "--log-opt=tag={{.ImageName}}", "-d", ALPINE, "sh", "-c", "echo podman; sleep 0.1; echo podman; sleep 0.1; echo podman"}) logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "--log-opt=tag={{.ImageName}},withcomma", "-d", ALPINE, "sh", "-c", "echo podman; sleep 0.1; echo podman; sleep 0.1; echo podman"})
logc.WaitWithDefaultTimeout() logc.WaitWithDefaultTimeout()
Expect(logc).To(ExitCleanly()) Expect(logc).To(ExitCleanly())
cid := logc.OutputToString() cid := logc.OutputToString()
@ -549,7 +549,7 @@ var _ = Describe("Podman logs", func() {
cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_TAG", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid)) cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_TAG", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid))
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
g.Expect(err).ToNot(HaveOccurred()) g.Expect(err).ToNot(HaveOccurred())
g.Expect(string(out)).To(ContainSubstring("alpine")) g.Expect(string(out)).To(ContainSubstring(ALPINE + ",withcomma"))
}).Should(Succeed()) }).Should(Succeed())
}) })