summaryrefslogtreecommitdiff
path: root/docs/api.md
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-04-27 16:52:19 -0700
committerJoffrey F <f.joffrey@gmail.com>2015-04-27 16:52:19 -0700
commite2fef06bbcb87d21bd5e850d6f8af1f900085af8 (patch)
tree9673bbba9ee5bacb4900a10be1d64306cccdde8e /docs/api.md
parent2eadd58bcdc2d08d2023e24227e48872355d684a (diff)
parent8c32677725c1ff4501b71466c0c82be6b90ff754 (diff)
downloaddocker-py-e2fef06bbcb87d21bd5e850d6f8af1f900085af8.tar.gz
Merge pull request #570 from docker/build_limits
Build limits
Diffstat (limited to 'docs/api.md')
-rw-r--r--docs/api.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/api.md b/docs/api.md
index f7531a3..6bb96d7 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -65,6 +65,12 @@ correct value (e.g `gzip`).
* pull (bool): Downloads any updates to the FROM image in Dockerfiles
* forcerm (bool): Always remove intermediate containers, even after unsuccessful builds
* dockerfile (str): path within the build context to the Dockerfile
+* container_limits (dict): A dictionary of limits applied to each container
+ created by the build process. Valid keys:
+ - memory (int): set memory limit for build
+ - memswap (int): Total memory (memory + swap), -1 to disable swap
+ - cpushares (int): CPU shares (relative weight)
+ - cpusetcpus (str): CPUs in which to allow exection, e.g., `"0-3"`, `"0,1"`
**Returns** (generator): A generator of the build output