summaryrefslogtreecommitdiff
path: root/cmd/podman/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-23 12:19:01 +0200
committerGitHub <noreply@github.com>2020-06-23 12:19:01 +0200
commitfc2c2ad1746da05393a2ca737360923e3f5a9f29 (patch)
treedefa0c2dbe4ca5d313de192c56082ea4c29f1fc3 /cmd/podman/common
parent3c51ff92caf9523e567c4bcea48d6a668220f25f (diff)
parentf329e2ad67c5ff883d038c36435d30eb2ea8c670 (diff)
downloadpodman-fc2c2ad1746da05393a2ca737360923e3f5a9f29.tar.gz
podman-fc2c2ad1746da05393a2ca737360923e3f5a9f29.tar.bz2
podman-fc2c2ad1746da05393a2ca737360923e3f5a9f29.zip
Merge pull request #6712 from mheon/readd_userns_envvar
Re-add PODMAN_USERNS environment variable
Diffstat (limited to 'cmd/podman/common')
-rw-r--r--cmd/podman/common/create.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index 921cd5a71..fbb7f449e 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -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(