Skip to content

Commit

Permalink
Merge pull request #15428 from edsantiago/docs_dedup_cpus
Browse files Browse the repository at this point in the history
[CI:DOCS] Man pages: refactor common options: --cpus
  • Loading branch information
openshift-merge-robot authored Aug 23, 2022
2 parents 8a32e51 + 5c9bac1 commit 8cfbcfe
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 22 deletions.
11 changes: 11 additions & 0 deletions docs/source/markdown/options/cpus.container.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#### **--cpus**=*number*

Number of CPUs. The default is *0.0* which means no limit. This is shorthand
for **--cpu-period** and **--cpu-quota**, so you may only set either
**--cpus** or **--cpu-period** and **--cpu-quota**.

On some systems, changing the CPU limits may not be allowed for non-root
users. For more details, see
https://github.com/containers/podman/blob/main/troubleshooting.md#26-running-containers-with-resource-limits-fails-with-a-permissions-error

This option is not supported on cgroups V1 rootless systems.
12 changes: 1 addition & 11 deletions docs/source/markdown/podman-create.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,7 @@ Block IO relative device weight.

@@option cpu-shares

#### **--cpus**=*number*

Number of CPUs. The default is *0.0* which means no limit. This is shorthand
for **--cpu-period** and **--cpu-quota**, so you may only set either
**--cpus** or **--cpu-period** and **--cpu-quota**.

On some systems, changing the CPU limits may not be allowed for non-root
users. For more details, see
https://github.com/containers/podman/blob/main/troubleshooting.md#26-running-containers-with-resource-limits-fails-with-a-permissions-error

This option is not supported on cgroups V1 rootless systems.
@@option cpus.container

@@option cpuset-cpus

Expand Down
12 changes: 1 addition & 11 deletions docs/source/markdown/podman-run.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,7 @@ each of **stdin**, **stdout**, and **stderr**.

@@option cpu-shares

#### **--cpus**=*number*

Number of CPUs. The default is *0.0* which means no limit. This is shorthand
for **--cpu-period** and **--cpu-quota**, so you may only set either
**--cpus** or **--cpu-period** and **--cpu-quota**.

On some systems, changing the CPU limits may not be allowed for non-root
users. For more details, see
https://github.com/containers/podman/blob/main/troubleshooting.md#26-running-containers-with-resource-limits-fails-with-a-permissions-error

This option is not supported on cgroups V1 rootless systems.
@@option cpus.container

@@option cpuset-cpus

Expand Down

0 comments on commit 8cfbcfe

Please sign in to comment.