diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-28 18:59:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 18:59:26 +0200 |
| commit | 558fb5cc7ed1d824478d71a8ad764d5d557de6cf (patch) | |
| tree | 5e0a77aae6d520060104c50831313ac10197a319 /cmd | |
| parent | d2c2858018453986982a488493add5cd38ea1bef (diff) | |
| parent | d45528cb296f5d245e3125b0050c317f67eb6a83 (diff) | |
| download | podman-558fb5cc7ed1d824478d71a8ad764d5d557de6cf.tar.gz podman-558fb5cc7ed1d824478d71a8ad764d5d557de6cf.tar.bz2 podman-558fb5cc7ed1d824478d71a8ad764d5d557de6cf.zip | |
Merge pull request #5958 from rhatdan/old
Update vendor to containers/common v0.8.2
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/shared/create.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 94b1e63dc..a9cd3078b 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -376,6 +376,10 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. } } + usernsType := c.String("userns") + if !c.IsSet("userns") && !idmappings.HostUIDMapping { + usernsType = "private" + } // Kernel Namespaces // TODO Fix handling of namespace from pod // Instead of integrating here, should be done in libpod @@ -386,7 +390,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. "pid": c.String("pid"), "net": c.String("network"), "ipc": c.String("ipc"), - "user": c.String("userns"), + "user": usernsType, "uts": c.String("uts"), } |