From 3d18cd851bf4c0628f1092bc8951e5a9b0dd3233 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Thu, 13 Aug 2015 06:34:57 +0200 Subject: [PATCH] reference/run: Add a paragraph break Signed-off-by: Kai Blin (cherry picked from commit 4d89910820e4c0fb62e1e496e5df837b77514f27) Conflicts: docs/reference/run.md --- docs/reference/run.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/reference/run.md b/docs/reference/run.md index 18fbc87d9..91262aa5e 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -1142,6 +1142,7 @@ volume mounted on the host). ### USER +<<<<<<< HEAD `root` (id = 0) is the default user within a container. The image developer can create additional users. Those users are accessible by name. When passing a numeric ID, the user does not have to exist in the container. @@ -1149,6 +1150,14 @@ ID, the user does not have to exist in the container. The developer can set a default user to run the first process with the Dockerfile `USER` instruction. When starting a container, the operator can override the `USER` instruction by passing the `-u` option. +======= +The default user within a container is `root` (id = 0), but if the developer +created additional users, those are accessible by name. When passing a numeric +ID, the user doesn't have to exist in the container. + +The developer can set a default user to run the first process with the +Dockerfile `USER` instruction, but the operator can override it: +>>>>>>> 4d89910... reference/run: Add a paragraph break -u="": Username or UID