diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-24 13:39:13 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-24 17:34:13 +0200 |
| commit | 5eb321ac372f5c29f65769a4554ff224186ffb21 (patch) | |
| tree | 261df1767d9763dad6da6ffb41488ef98b41670a | |
| parent | f09370c68b8b514aca80bfaa34f98fbc5b97d318 (diff) | |
| download | podman-5eb321ac372f5c29f65769a4554ff224186ffb21.tar.gz podman-5eb321ac372f5c29f65769a4554ff224186ffb21.tar.bz2 podman-5eb321ac372f5c29f65769a4554ff224186ffb21.zip | |
podman: honor env variable PODMAN_USERNS
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | cmd/podman/common.go | 2 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 2 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 5e26d9bfd..054b01247 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -517,7 +517,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "Username or UID (format: <name|uid>[:<group|gid>])", ) createFlags.String( - "userns", "", + "userns", os.Getenv("PODMAN_USERNS"), "User namespace to use", ) createFlags.String( diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 53f4c8fed..cbd6d9a99 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -730,7 +730,7 @@ Without this argument the command will be run as root in the container. **--userns**=keep-id **--userns**=ns:my_namespace -Set the user namespace mode for the container. The use of userns is disabled by default. +Set the user namespace mode for the container. It defaults to the **PODMAN_USERNS** environment variable. An empty value means user namespaces are disabled. - `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. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 95e99cb7e..78e8a5d6e 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -766,7 +766,7 @@ Without this argument the command will be run as root in the container. **--userns**=keep-id **--userns**=ns:my_namespace -Set the user namespace mode for the container. The use of userns is disabled by default. +Set the user namespace mode for the container. It defaults to the **PODMAN_USERNS** environment variable. An empty value means user namespaces are disabled. - `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. |