opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5916 from giuseppe/userns-auto

Browse Source 
v2, podman: plug --userns=auto
This commit is contained in:
OpenShift Merge Robot
2020-04-21 16:10:28 -04:00
committed by GitHub
parent 103eca67b7 6e3ad47b58
commit 02bd8cef7b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/domain/infra/runtime_libpod.go
View File

@ -234,6 +234,18 @@ func ParseIDMapping(mode namespaces.UsernsMode, uidMapSlice, gidMapSlice []strin
HostGIDMapping: true, HostGIDMapping: true,
} }
if mode.IsAuto() {
var err error
options.HostUIDMapping = false
options.HostGIDMapping = false
options.AutoUserNs = true
opts, err := mode.GetAutoOptions()
if err != nil {
return nil, err
}
options.AutoUserNsOpts = *opts
return &options, nil
}
if mode.IsKeepID() { if mode.IsKeepID() {
if len(uidMapSlice) > 0 || len(gidMapSlice) > 0 { if len(uidMapSlice) > 0 || len(gidMapSlice) > 0 {
return nil, errors.New("cannot specify custom mappings with --userns=keep-id") return nil, errors.New("cannot specify custom mappings with --userns=keep-id")