containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 3c51ff92ca f329e2ad67
commit fc2c2ad174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/common/create.go
View File

@ -2,6 +2,7 @@ package common
import ( import (
"fmt" "fmt"
"os"
"github.com/containers/common/pkg/auth" "github.com/containers/common/pkg/auth"
"github.com/containers/libpod/cmd/podman/registry" "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>])", "Username or UID (format: <name|uid>[:<group|gid>])",
) )
createFlags.String( createFlags.String(
"userns", "", "userns", os.Getenv("PODMAN_USERNS"),
"User namespace to use", "User namespace to use",
) )
createFlags.String( createFlags.String(