Skip to content

Commit c80762d

Browse files
committed
removed duplicate mem_limit arg desc; type now consistent accross models (float->int)
Signed-off-by: Peter Slovak <[email protected]>
1 parent 1f60920 commit c80762d

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

docker/models/containers.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,14 +510,12 @@ def run(self, image, command=None, stdout=True, stderr=False,
510510
driver.
511511
512512
mac_address (str): MAC address to assign to the container.
513-
mem_limit (float or str): Memory limit. Accepts float values
513+
mem_limit (int or str): Memory limit. Accepts float values
514514
(which represent the memory limit of the created container in
515515
bytes) or a string with a units identification char
516516
(``100000b``, ``1000k``, ``128m``, ``1g``). If a string is
517517
specified without a units character, bytes are assumed as an
518518
intended unit.
519-
mem_limit (str or int): Maximum amount of memory container is
520-
allowed to consume. (e.g. ``1G``).
521519
mem_swappiness (int): Tune a container's memory swappiness
522520
behavior. Accepts number between 0 and 100.
523521
memswap_limit (str or int): Maximum amount of memory + swap a

0 commit comments

Comments
 (0)