opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-17 21:21:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman: fix --log-opt=path=%s

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2020-04-24 12:50:13 +02:00
parent 145d74716c
commit 3eeb03d1f9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/common/specgen.go
View File

@@ -602,8 +602,15 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
if len(split) < 2 { if len(split) < 2 {
return errors.Errorf("invalid log option %q", o) return errors.Errorf("invalid log option %q", o)
} }
switch {
case split[0] == "driver":
s.LogConfiguration.Driver = split[1]
case split[0] == "path":
s.LogConfiguration.Path = split[1]
default:
logOpts[split[0]] = split[1] logOpts[split[0]] = split[1]
} }
}
s.LogConfiguration.Options = logOpts s.LogConfiguration.Options = logOpts
s.Name = c.Name s.Name = c.Name

1
test/e2e/run_test.go
View File

@@ -469,7 +469,6 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run log-opt", func() { It("podman run log-opt", func() {
Skip(v2fail)
log := filepath.Join(podmanTest.TempDir, "/container.log") log := filepath.Join(podmanTest.TempDir, "/container.log")
session := podmanTest.Podman([]string{"run", "--rm", "--log-opt", fmt.Sprintf("path=%s", log), ALPINE, "ls"}) session := podmanTest.Podman([]string{"run", "--rm", "--log-opt", fmt.Sprintf("path=%s", log), ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()