From e36752e03347bf46177d8ee810cdd5a019321dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Tue, 7 May 2013 11:43:45 -0700 Subject: [PATCH] if -c is not specified, do not set cpu.shares (instead of using the default value of 1024) --- container.go | 2 +- docs/sources/commandline/command/run.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container.go b/container.go index 1cf62c07e3..9315d3347a 100644 --- a/container.go +++ b/container.go @@ -92,7 +92,7 @@ func ParseRun(args []string, stdout io.Writer, capabilities *Capabilities) (*Con *flMemory = 0 } - flCpuShares := cmd.Int64("c", 1024, "CPU shares (relative weight)") + flCpuShares := cmd.Int64("c", 0, "CPU shares (relative weight)") var flPorts ListOpts cmd.Var(&flPorts, "p", "Expose a container's port to the host (use 'docker port' to see the actual mapping)") diff --git a/docs/sources/commandline/command/run.rst b/docs/sources/commandline/command/run.rst index ec46039851..95fb208dd3 100644 --- a/docs/sources/commandline/command/run.rst +++ b/docs/sources/commandline/command/run.rst @@ -9,7 +9,7 @@ Run a command in a new container -a=map[]: Attach to stdin, stdout or stderr. - -c=1024: CPU shares (relative weight) + -c=0: CPU shares (relative weight) -d=false: Detached mode: leave the container running in the background -e=[]: Set environment variables -h="": Container host name