diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-07 07:14:15 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-08 13:34:14 +0000 |
| commit | d1257b1a0bdf28072610a3a9ead424d4f3cfe5cb (patch) | |
| tree | 31bf28efd3dc82336960e48754fa13b5156c57ee | |
| parent | 71793f9f8a26bc2593968f61a68c0bb42f9da71a (diff) | |
| download | podman-d1257b1a0bdf28072610a3a9ead424d4f3cfe5cb.tar.gz podman-d1257b1a0bdf28072610a3a9ead424d4f3cfe5cb.tar.bz2 podman-d1257b1a0bdf28072610a3a9ead424d4f3cfe5cb.zip | |
Cleanup man pages
podman does not support nocopy so remove reference in the man page.
podman build now supports --isolation, so add documentation.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1225
Approved by: TomSweeneyRedHat
| -rw-r--r-- | docs/podman-build.1.md | 18 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 3 |
3 files changed, 13 insertions, 11 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md index 405864256..594201fff 100644 --- a/docs/podman-build.1.md +++ b/docs/podman-build.1.md @@ -207,11 +207,19 @@ that the IPC namespace in which `buildah` itself is being run should be reused, or it can be the path to an IPC namespace which is already in use by another process. -**--isolation** [Not Supported] - -Podman is not currently supported on Windows, and does not have a daemon. -If you want to override the container isolation you can choose a different -OCI Runtime, using the --runtime flag. +**--isolation** *type* + +Controls what type of isolation is used for running processes as part of `RUN` +instructions. Recognized types include *oci* (OCI-compatible runtime, the +default), *rootless* (OCI-compatible runtime invoked using a modified +configuration and its --rootless flag enabled, with *--no-new-keyring +--no-pivot* added to its *create* invocation, with network and UTS namespaces +disabled, and IPC, PID, and user namespaces enabled; the default for +unprivileged users), and *chroot* (an internal wrapper that leans more toward +chroot(1) than container technology). + +Note: You can also override the default isolation type by setting the +BUILDAH\_ISOLATION environment variable. `export BUILDAH_ISOLATION=oci` **--label** *label* diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 36a7fda11..b796717ae 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -658,9 +658,6 @@ will convert /foo into a `shared` mount point. Alternatively one can directly change propagation properties of source mount. Say `/` is source mount for `/foo`, then use `mount --make-shared /` to convert `/` into a `shared` mount. -To disable automatic copying of data from the container path to the volume, use -the `nocopy` flag. The `nocopy` flag can be set on bind mounts and named volumes. - **--volumes-from**[=*CONTAINER*[:*OPTIONS*]] Mount volumes from the specified container(s). diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 3a3115964..8bd263f58 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -690,9 +690,6 @@ will convert /foo into a `shared` mount point. Alternatively one can directly change propagation properties of source mount. Say `/` is source mount for `/foo`, then use `mount --make-shared /` to convert `/` into a `shared` mount. -To disable automatic copying of data from the container path to the volume, use -the `nocopy` flag. The `nocopy` flag can be set on bind mounts and named volumes. - **--volumes-from**[=*CONTAINER*[:*OPTIONS*]] Mount volumes from the specified container(s). |