diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-12 19:37:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 19:37:46 +0100 |
| commit | 4808a63e5f1ad72d754c61c005c2c7c29ce48014 (patch) | |
| tree | 3cfdd9e9f89024798a1bcd26dd56d4c7140d923d /pkg/specgenutil/specgen.go | |
| parent | fd010adfdcb6f578623b77281f2ae012bcd1ac85 (diff) | |
| parent | 7c98d542b4c5ab0495f66a9179ae886e86cad273 (diff) | |
| download | podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.gz podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.tar.bz2 podman-4808a63e5f1ad72d754c61c005c2c7c29ce48014.zip | |
Merge pull request #12274 from mheon/bump_342
Bump to v3.4.2
Diffstat (limited to 'pkg/specgenutil/specgen.go')
| -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) |