reference/run: Add a paragraph break

Signed-off-by: Kai Blin <kai@samba.org>
(cherry picked from commit 4d89910820)

Conflicts:
	docs/reference/run.md
This commit is contained in:
Kai Blin
2015-08-13 06:34:57 +02:00
committed by Mary Anthony
parent 7324d8dd8c
commit 3d18cd851b
+9
View File
@@ -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