diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-03 20:13:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-03 20:13:51 +0000 |
commit | 73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6 (patch) | |
tree | 5db98fc07babcc3b1a1f5bb71252edf6b939096f /libpod/pod_api.go | |
parent | fd33ab09365994ba4625f238c88474a4167ede66 (diff) | |
parent | b92149e2a8ce596b2839ec404e2ebd457943848f (diff) | |
download | podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.gz podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.tar.bz2 podman-73cdc925f0cbe0a25d70f04003ecf7fdc9f97bf6.zip |
Merge pull request #14802 from cdoern/podMemory
podman pod create --memory
Diffstat (limited to 'libpod/pod_api.go')
-rw-r--r-- | libpod/pod_api.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index fefe0e329..f06e62007 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -751,6 +751,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { CPUSetCPUs: p.ResourceLim().CPU.Cpus, CPUPeriod: p.CPUPeriod(), CPUQuota: p.CPUQuota(), + MemoryLimit: p.MemoryLimit(), Mounts: inspectMounts, Devices: devices, BlkioDeviceReadBps: deviceLimits, |