diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-23 14:54:24 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-27 10:57:27 -0400 |
| commit | d45528cb296f5d245e3125b0050c317f67eb6a83 (patch) | |
| tree | 148c28586c0dc57568c744d6d703a8906acfedad /cmd | |
| parent | ca15a83fe0db5e5af917149d7b7cb770474edab1 (diff) | |
| download | podman-d45528cb296f5d245e3125b0050c317f67eb6a83.tar.gz podman-d45528cb296f5d245e3125b0050c317f67eb6a83.tar.bz2 podman-d45528cb296f5d245e3125b0050c317f67eb6a83.zip | |
Update vendor to containers/common v0.8.2
This will fix a couple of issues caused by the move to containers.conf
If a libpod.conf file still exists, we will ignore its events_logger
definition and use "file"
If you are running rootless on cgroupsV1 we will default to host cgroupns.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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"), } |