diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-26 15:06:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 15:06:06 +0200 |
| commit | 0c4dfcfe57559d55786818b027ad12ad94574e71 (patch) | |
| tree | f80b22ab5ccad6e896e4f96021891c81ec12b853 /docs | |
| parent | b212daa92f3a596efa87b6ccaa097f70cd34bb10 (diff) | |
| parent | 1d72f651e4c5118c020a1ab7281d3de0bf31899e (diff) | |
| download | podman-0c4dfcfe57559d55786818b027ad12ad94574e71.tar.gz podman-0c4dfcfe57559d55786818b027ad12ad94574e71.tar.bz2 podman-0c4dfcfe57559d55786818b027ad12ad94574e71.zip | |
Merge pull request #3639 from giuseppe/user-ns-container
podman: support --userns=ns|container
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-create.1.md | 2 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 4008b64e6..d796c2586 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -751,6 +751,7 @@ Without this argument the command will be run as root in the container. **--userns**=*host* **--userns**=*keep-id* +**--userns**=container:container **--userns**=*ns:my_namespace* Set the user namespace mode for the container. It defaults to the **PODMAN_USERNS** environment variable. An empty value means user namespaces are disabled. @@ -758,6 +759,7 @@ Set the user namespace mode for the container. It defaults to the **PODMAN_USER - `host`: run in the user namespace of the caller. This is the default if no user namespace options are set. The processes running in the container will have the same privileges on the host as any other process launched by the calling user. - `keep-id`: creates a user namespace where the current rootless user's UID:GID are mapped to the same values in the container. This option is ignored for containers created by the root user. - `ns`: run the container in the given existing user namespace. +- `container`: join the user namespace of the specified container. This option is incompatible with --gidmap, --uidmap, --subuid and --subgid diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index c4747d234..f5f44fad4 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -788,6 +788,7 @@ Without this argument the command will be run as root in the container. **--userns**=host **--userns**=keep-id +**--userns**=container:container **--userns**=ns:my_namespace Set the user namespace mode for the container. It defaults to the **PODMAN_USERNS** environment variable. An empty value means user namespaces are disabled. @@ -795,6 +796,7 @@ Set the user namespace mode for the container. It defaults to the **PODMAN_USER - `host`: run in the user namespace of the caller. This is the default if no user namespace options are set. The processes running in the container will have the same privileges on the host as any other process launched by the calling user. - `keep-id`: creates a user namespace where the current rootless user's UID:GID are mapped to the same values in the container. This option is ignored for containers created by the root user. - `ns`: run the container in the given existing user namespace. +- `container`: join the user namespace of the specified container. This option is incompatible with --gidmap, --uidmap, --subuid and --subgid |