|
@@ -126,7 +126,7 @@ def get_internal_ip(container_name_or_id=None):
|
|
|
|
|
|
'''
|
|
|
'''
|
|
|
-def run_container(image=None, name=None, ports=[], volumes=None, net=None):
|
|
|
+def run_container(image=None, name=None, ports=[], volumes=None, net=None, memory_limit=None, memory_swap_limit=None):
|
|
|
if not name:
|
|
|
return False
|
|
|
|
|
@@ -136,7 +136,17 @@ def run_container(image=None, name=None, ports=[], volumes=None, net=None):
|
|
|
return False
|
|
|
|
|
|
try:
|
|
|
- client.containers.run(image, None, name=name, detach=True, ports=ports, volumes=volumes, network=net)
|
|
|
+ client.containers.run(
|
|
|
+ image,
|
|
|
+ None,
|
|
|
+ name=name,
|
|
|
+ detach=True,
|
|
|
+ ports=ports,
|
|
|
+ volumes=volumes,
|
|
|
+ network=net,
|
|
|
+ mem_limit=memory_limit,
|
|
|
+ memswap_limit=memory_swap_limit
|
|
|
+ )
|
|
|
return True
|
|
|
except (ContainerError, ImageNotFound, APIError):
|
|
|
return False
|