diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-06 05:18:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 05:18:04 +0200 |
| commit | f584d47a9d0c050c3b39793a73b0aba17b45e8ba (patch) | |
| tree | 56f996fdefdfa8a83f6aba9eb98e6395364f8b60 /cmd/podman | |
| parent | ea02d9c2668207523611efac67a1699f776c9147 (diff) | |
| parent | 348f2df0c09e2e3b517add5271e6eee583800be3 (diff) | |
| download | podman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.tar.gz podman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.tar.bz2 podman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.zip | |
Merge pull request #7931 from rhatdan/size
Support max_size logoptions
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common/specgen.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 84ae70b6a..f427830c6 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -575,11 +575,17 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string if len(split) < 2 { return errors.Errorf("invalid log option %q", o) } - switch { - case split[0] == "driver": + switch strings.ToLower(split[0]) { + case "driver": s.LogConfiguration.Driver = split[1] - case split[0] == "path": + case "path": s.LogConfiguration.Path = split[1] + case "max-size": + logSize, err := units.FromHumanSize(split[1]) + if err != nil { + return errors.Wrapf(err, "%s is not a valid option", o) + } + s.LogConfiguration.Size = logSize default: logOpts[split[0]] = split[1] } |