diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-17 13:02:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 13:02:23 +0200 |
| commit | 799aa7022bcf4b8b76276f86ea633c960351fb93 (patch) | |
| tree | f91f8ce4c22f679cb2de97a39d4aab5911896203 /docs | |
| parent | 2aa6771e787b46484245445b899cd2694aadbfc2 (diff) | |
| parent | 405ef9bc5636b8940f93413231ed1e4299e3d4ac (diff) | |
| download | podman-799aa7022bcf4b8b76276f86ea633c960351fb93.tar.gz podman-799aa7022bcf4b8b76276f86ea633c960351fb93.tar.bz2 podman-799aa7022bcf4b8b76276f86ea633c960351fb93.zip | |
Merge pull request #4034 from rhatdan/relabel
Add 'relabel' to --mount options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-create.1.md | 9 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 996ef3863..c088f3e94 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -464,12 +464,16 @@ Tune a container's memory swappiness behavior. Accepts an integer between 0 and Attach a filesystem mount to the container -Current supported mount TYPES are bind, and tmpfs. +Current supported mount TYPES are `bind`, `volume`, and `tmpfs`. e.g. type=bind,source=/path/on/host,destination=/path/in/container + type=bind,src=/path/on/host,dst=/path/in/container,relabel=shared + + type=volume,source=vol1,destination=/path/in/container,ro=true + type=tmpfs,tmpfs-size=512M,destination=/path/in/container Common Options: @@ -483,8 +487,11 @@ Current supported mount TYPES are bind, and tmpfs. Options specific to bind: · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2). + . bind-nonrecursive: do not setup a recursive bind mount. By default it is recursive. + . relabel: shared, private. + Options specific to tmpfs: · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 0dbd4ea6f..d677f8262 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -475,13 +475,15 @@ Tune a container's memory swappiness behavior. Accepts an integer between 0 and Attach a filesystem mount to the container -Current supported mount TYPES are bind, and tmpfs. +Current supported mount TYPES are `bind`, `volume`, and `tmpfs`. e.g. type=bind,source=/path/on/host,destination=/path/in/container - type=bind,source=volume-name,destination=/path/in/container + type=bind,src=/path/on/host,dst=/path/in/container,relabel=shared + + type=volume,source=vol1,destination=/path/in/container,ro=true type=tmpfs,tmpfs-size=512M,destination=/path/in/container @@ -495,9 +497,12 @@ Current supported mount TYPES are bind, and tmpfs. Options specific to bind: - · bind-propagation: Z, z, shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2). + · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2). + . bind-nonrecursive: do not setup a recursive bind mount. By default it is recursive. + . relabel: shared, private. + Options specific to tmpfs: · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux. |