diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-20 08:39:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 08:39:11 +0000 |
| commit | fba7a05b1b24917b92faedfd097c7ab88c48bc5e (patch) | |
| tree | cb0a554c30eddfd84af4645b6ed639e1fccf1946 /pkg | |
| parent | 7fa99358bd7e165f5b14b12b778614812ae42c8b (diff) | |
| parent | 20b5a8599b11269c8812ce6c3df6d7f39ef1930c (diff) | |
| download | podman-fba7a05b1b24917b92faedfd097c7ab88c48bc5e.tar.gz podman-fba7a05b1b24917b92faedfd097c7ab88c48bc5e.tar.bz2 podman-fba7a05b1b24917b92faedfd097c7ab88c48bc5e.zip | |
Merge pull request #12024 from rhatdan/podman
podman run --memory=0 ... should not set memory limit
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 6a6397257..8007e5d8e 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -133,12 +133,14 @@ func getMemoryLimits(s *specgen.SpecGenerator, c *entities.ContainerCreateOption if err != nil { return nil, errors.Wrapf(err, "invalid value for memory") } - memory.Limit = &ml - if c.MemorySwap == "" { - limit := 2 * ml - memory.Swap = &(limit) + if ml > 0 { + memory.Limit = &ml + if c.MemorySwap == "" { + limit := 2 * ml + memory.Swap = &(limit) + } + hasLimits = true } - hasLimits = true } if m := c.MemoryReservation; len(m) > 0 { mr, err := units.RAMInBytes(m) |