clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10263 from hqhq/hq_check_memoryswap

Browse Source 
add check for memoryswap
This commit is contained in:
Michael Crosby
2015-02-06 13:43:23 -08:00
parent 9491cec224 0c0f0d5ab4
commit d1f18786ac
5 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/reference/api/docker_remote_api_v1.17.md
+2 -1
View File
@@ -177,7 +177,8 @@ Json Parameters:
for the container.
- **User** - A string value containg the user to use inside the container.
- **Memory** - Memory limit in bytes.
- **MemorySwap**- Total memory usage (memory + swap); set `-1` to disable swap.
- **MemorySwap**- Total memory limit (memory + swap); set `-1` to disable swap,
always use this with `memory`, and make the value larger than `memory`.
- **CpuShares** - An integer value containing the CPU Shares for container
(ie. the relative weight vs othercontainers).
**CpuSet** - String value containg the cgroups Cpuset to use.