Merge pull request #6712 from mheon/readd_userns_envvar

Re-add PODMAN_USERNS environment variable
This commit is contained in:
OpenShift Merge Robot 2020-06-23 12:19:01 +02:00 committed by GitHub
commit fc2c2ad174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions

View File

@ -2,6 +2,7 @@ package common
import (
"fmt"
"os"
"github.com/containers/common/pkg/auth"
"github.com/containers/libpod/cmd/podman/registry"
@ -464,7 +465,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
"Username or UID (format: <name|uid>[:<group|gid>])",
)
createFlags.String(
"userns", "",
"userns", os.Getenv("PODMAN_USERNS"),
"User namespace to use",
)
createFlags.String(