Browse code

Updating after the pr went through Updating with comments.

Signed-off-by: Mary Anthony <mary@docker.com>

Mary Anthony authored on 2015/05/28 07:11:05
Showing 2 changed files
... ...
@@ -400,18 +400,18 @@ used in other containers using the **--volumes-from** option.
400 400
 read-only or read-write mode, respectively. By default, the volumes are mounted
401 401
 read-write. See examples.
402 402
 
403
-Labeling systems like SELinux require proper labels be placed on volume content
404
-mounted into a container, otherwise the secuirty system might prevent the
405
-processes running inside the container from using the content. By default,
406
-volumes are not relabeled.
407
-
408
-Two suffixes :z or :Z can be added to the volume mount. These suffixes tell
409
-Docker to relabel file objects on the shared volumes. The 'z' option tells
410
-Docker that the volume content will be shared between containers. Docker will
411
-label the content with a shared content label. Shared volumes labels allow all
412
-containers to read/write content. The 'Z' option tells Docker to label the
413
-content with a private unshared label. Private volumes can only be used by the
414
-current container.
403
+Labeling systems like SELinux require that proper labels are placed on volume
404
+content mounted into a container. Without a label, the security system might
405
+prevent the processes running inside the container from using the content. By
406
+default, Docker does not change the labels set by the OS.
407
+
408
+To change a label in the container context, you can add either of two suffixes
409
+`:z` or `:Z` to the volume mount. These suffixes tell Docker to relabel file
410
+objects on the shared volumes. The `z` option tells Docker that two containers
411
+share the volume content. As a result, Docker labels the content with a shared
412
+content label. Shared volume labels allow all containers to read/write content.
413
+The `Z` option tells Docker to label the content with a private unshared label.
414
+Only the current container can use a private volume.
415 415
 
416 416
 Note: Multiple Volume options can be added separated by a ","
417 417
 
... ...
@@ -2206,18 +2206,18 @@ mount the volumes in read-only or read-write mode, respectively. By default,
2206 2206
 the volumes are mounted in the same mode (read write or read only) as
2207 2207
 the reference container.
2208 2208
 
2209
-Labeling systems like SELinux require proper labels be placed on volume content
2210
-mounted into a container, otherwise the security system might prevent the
2211
-processes running inside the container from using the content. By default,
2212
-volumes are not relabeled.
2213
-
2214
-Two suffixes :z or :Z can be added to the volume mount. These suffixes tell
2215
-Docker to relabel file objects on the shared volumes. The 'z' option tells
2216
-Docker that the volume content will be shared between containers. Docker will
2217
-label the content with a shared content label. Shared volumes labels allow all
2218
-containers to read/write content. The 'Z' option tells Docker to label the
2219
-content with a private unshared label. Private volumes can only be used by the
2220
-current container.
2209
+Labeling systems like SELinux require that proper labels are placed on volume
2210
+content mounted into a container. Without a label, the security system might
2211
+prevent the processes running inside the container from using the content. By
2212
+default, Docker does not change the labels set by the OS.
2213
+
2214
+To change the label in the container context, you can add either of two suffixes
2215
+`:z` or `:Z` to the volume mount. These suffixes tell Docker to relabel file
2216
+objects on the shared volumes. The `z` option tells Docker that two containers
2217
+share the volume content. As a result, Docker labels the content with a shared
2218
+content label. Shared volume labels allow all containers to read/write content.
2219
+The `Z` option tells Docker to label the content with a private unshared label.
2220
+Only the current container can use a private volume.
2221 2221
 
2222 2222
 The `-a` flag tells `docker run` to bind to the container's `STDIN`, `STDOUT`
2223 2223
 or `STDERR`. This makes it possible to manipulate the output and input as