diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-25 23:12:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 23:12:57 -0800 |
| commit | c1e2698f812a07b483a81f16f0c0003492a1bdef (patch) | |
| tree | 13dd4a3e7bbb577cbef8bbe4339461bc78a96ef8 /libpod | |
| parent | 0800ab4f6510a629047de9ead10d4b0d002b99d9 (diff) | |
| parent | eb229d526c04f17ca8b7e65abba745fd5b465a6c (diff) | |
| download | podman-c1e2698f812a07b483a81f16f0c0003492a1bdef.tar.gz podman-c1e2698f812a07b483a81f16f0c0003492a1bdef.tar.bz2 podman-c1e2698f812a07b483a81f16f0c0003492a1bdef.zip | |
Merge pull request #4952 from mheon/inspect_default_shares
Default CPUShares in Inspect are 1024
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 01f2d93bd..641bc8a91 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -1014,6 +1014,9 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named hostConfig.ShmSize = c.config.ShmSize hostConfig.Runtime = "oci" + // Default CPUShares is 1024, but we may overwrite below. + hostConfig.CpuShares = 1024 + // This is very expensive to initialize. // So we don't want to initialize it unless we absolutely have to - IE, // there are things that require a major:minor to path translation. |