From a57d7c5c796a1affcfa05ee6e7ea586750a9292f Mon Sep 17 00:00:00 2001 From: Dan Anolik Date: Mon, 23 Mar 2015 20:47:04 -0700 Subject: [PATCH] Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile. Signed-off-by: Dan Anolik --- docs/man/Dockerfile.5.md | 11 +++++++++-- docs/man/docker-run.1.md | 7 ++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/man/Dockerfile.5.md b/docs/man/Dockerfile.5.md index 7f884888e2..0ec54a8c9c 100644 --- a/docs/man/Dockerfile.5.md +++ b/docs/man/Dockerfile.5.md @@ -273,8 +273,15 @@ A Dockerfile is similar to a Makefile. **USER** -- `USER daemon` - The **USER** instruction sets the username or UID that is used when running the - image. + Sets the username or UID used for running subsequent commands. + + The **USER** instruction can optionally be used to set the group or GID. The + followings examples are all valid: + USER [user | user:group | uid | uid:gid | user:gid | uid:group ] + + Until the **USER** instruction is set, instructions will be run as root. The USER + instruction can be used any number of times in a Dockerfile, and will only affect + subsequent commands. **WRKDIR** -- `WORKDIR /path/to/workdir` diff --git a/docs/man/docker-run.1.md b/docs/man/docker-run.1.md index 1831237de2..9ac5717383 100644 --- a/docs/man/docker-run.1.md +++ b/docs/man/docker-run.1.md @@ -341,7 +341,12 @@ The **-t** option is incompatible with a redirection of the docker client standard input. **-u**, **--user**="" - Username or UID + Sets the username or UID used and optionally the groupname or GID for the specified command. + + The followings examples are all valid: + --user [user | user:group | uid | uid:gid | user:gid | uid:group ] + + Without this argument the command will be run as root in the container. **-v**, **--volume**=[] Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)