Merge pull request containers#6712 from mheon/readd_userns_envvar

Re-add PODMAN_USERNS environment variable
vrothberg · Jun 23, 2020 · fc2c2ad · fc2c2ad
2 parents 3c51ff9 + f329e2a
commit fc2c2ad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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(