diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 435afbc77b..45c136985e 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -282,7 +282,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, _ = cmd.RegisterFlagCompletionFunc(logDriverFlagName, AutocompleteLogDriver) logOptFlagName := "log-opt" - createFlags.StringSliceVar( + createFlags.StringArrayVar( &cf.LogOptions, logOptFlagName, []string{}, "Logging driver options", diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 66ca09ebe3..1f256e9f84 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -536,7 +536,7 @@ var _ = Describe("Podman logs", func() { It("using journald for container with container tag", func() { 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() Expect(logc).To(ExitCleanly()) 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)) out, err := cmd.CombinedOutput() g.Expect(err).ToNot(HaveOccurred()) - g.Expect(string(out)).To(ContainSubstring("alpine")) + g.Expect(string(out)).To(ContainSubstring(ALPINE + ",withcomma")) }).Should(Succeed()) })