diff options
| author | Joffrey F <joffrey@docker.com> | 2015-04-22 16:44:40 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-04-22 16:44:40 -0700 |
| commit | 650abccd7e0b2a52af1e824326b8b89616c8e0a6 (patch) | |
| tree | 45b6782f2755a8c3b4377a692b1f4031f37d2805 | |
| parent | d71bfb1b3ddd5cb8a2fc9cec0ada741f8dc85e18 (diff) | |
| download | docker-py-ulimit_support.tar.gz | |
ulimits: Updated docsulimit_support
| -rw-r--r-- | docs/api.md | 1 | ||||
| -rw-r--r-- | docs/hostconfig.md | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/api.md b/docs/api.md index aa5faa9..5afe533 100644 --- a/docs/api.md +++ b/docs/api.md @@ -749,6 +749,7 @@ from. Optionally a single string joining container id's with commas * pid_mode (str): if set to "host", use the host PID namespace inside the container * security_opt (list): A list of string values to customize labels for MLS systems, such as SELinux. +* ulimits (list): A list of dicts or `docker.utils.Ulimit` objects. ```python >>> from docker import Client diff --git a/docs/hostconfig.md b/docs/hostconfig.md index 3c11031..1d82c83 100644 --- a/docs/hostconfig.md +++ b/docs/hostconfig.md @@ -85,6 +85,8 @@ for example: * read_only (bool): mount the container's root filesystem as read only * pid_mode (str): if set to "host", use the host PID namespace inside the container +* security_opt (list): A list of string values to customize labels for MLS systems, such as SELinux. +* ulimits (list): A list of dicts or `docker.utils.Ulimit` objects. **Returns** (dict) HostConfig dictionary |