From 46d4e491c8a1394596e824ac65b360f6d7211c6f Mon Sep 17 00:00:00 2001 From: Jeff Nickoloff Date: Tue, 3 Feb 2015 10:33:09 +0100 Subject: [PATCH] Amend run help for --user to include GUID The -u/--user flag optionaly takes a group/gui. This change documents this behavior and specifies the complete format of the value. Signed-off-by: Jeff Nickoloff Added a missed semi-colon for consistency with other messages. Signed-off-by: Jeff Nickoloff --- runconfig/parse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runconfig/parse.go b/runconfig/parse.go index cccb761010..2d22ee2799 100644 --- a/runconfig/parse.go +++ b/runconfig/parse.go @@ -55,7 +55,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe flHostname = cmd.String([]string{"h", "-hostname"}, "", "Container host name") flMemoryString = cmd.String([]string{"m", "-memory"}, "", "Memory limit") flMemorySwap = cmd.String([]string{"-memory-swap"}, "", "Total memory (memory + swap), '-1' to disable swap") - flUser = cmd.String([]string{"u", "-user"}, "", "Username or UID") + flUser = cmd.String([]string{"u", "-user"}, "", "Username or UID (format: [:])") flWorkingDir = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container") flCpuShares = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)") flCpuset = cmd.String([]string{"-cpuset"}, "", "CPUs in which to allow execution (0-3, 0,1)")