From 7c8e0292526005d3bf0e939331ce92a67b8b2bb8 Mon Sep 17 00:00:00 2001 From: ryane Date: Tue, 27 Oct 2015 19:53:49 -0400 Subject: [PATCH] add basic runtime constraints to docker_container --- r/container.html.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/r/container.html.markdown b/r/container.html.markdown index 91c5a865..c1a728f1 100644 --- a/r/container.html.markdown +++ b/r/container.html.markdown @@ -59,6 +59,10 @@ The following arguments are supported: * `privileged` - (Optional, bool) Run container in privileged mode. * `publish_all_ports` - (Optional, bool) Publish all ports of the container. * `volumes` - (Optional) See [Volumes](#volumes) below for details. +* `memory` - (Optional, int) The memory limit for the container in MBs. +* `memory_swap` - (Optional, int) The total memory limit (memory + swap) for the + container in MBs. +* `cpu_shares` - (Optional, int) CPU shares (relative weight) for the container. ## Ports