From 5eb321ac372f5c29f65769a4554ff224186ffb21 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 24 May 2019 13:39:13 +0200 Subject: [PATCH] podman: honor env variable PODMAN_USERNS Signed-off-by: Giuseppe Scrivano --- cmd/podman/common.go | 2 +- docs/podman-create.1.md | 2 +- 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 5e26d9bfd4..054b01247a 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -517,7 +517,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "Username or UID (format: [:])", ) 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 53f4c8fed5..cbd6d9a998 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 95e99cb7ef..78e8a5d6e9 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.