opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6484 from rhatdan/namespace

Browse Source 
Namespace fields were set with bogus values
This commit is contained in:
OpenShift Merge Robot
2020-06-04 13:41:44 +02:00
committed by GitHub
parent 06d8c3dda3 bdfec451dc
commit ff99c3ecb3
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/podman/containers/create.go
View File

@ -161,24 +161,25 @@ func createInit(c *cobra.Command) error {
if c.Flag("no-hosts").Changed && c.Flag("add-host").Changed { if c.Flag("no-hosts").Changed && c.Flag("add-host").Changed {
return errors.Errorf("--no-hosts and --add-host cannot be set together") return errors.Errorf("--no-hosts and --add-host cannot be set together")
} }
if c.Flag("userns").Changed {
cliVals.UserNS = c.Flag("userns").Value.String() cliVals.UserNS = c.Flag("userns").Value.String()
// if user did not modify --userns flag and did turn on
// uid/gid mappsings, set userns flag to "private"
if !c.Flag("userns").Changed && cliVals.UserNS == "host" {
if len(cliVals.UIDMap) > 0 ||
len(cliVals.GIDMap) > 0 ||
cliVals.SubUIDName != "" ||
cliVals.SubGIDName != "" {
cliVals.UserNS = "private"
} }
if c.Flag("ipc").Changed { }
cliVals.IPC = c.Flag("ipc").Value.String() cliVals.IPC = c.Flag("ipc").Value.String()
}
if c.Flag("uts").Changed {
cliVals.UTS = c.Flag("uts").Value.String() cliVals.UTS = c.Flag("uts").Value.String()
}
if c.Flag("pid").Changed {
cliVals.PID = c.Flag("pid").Value.String() cliVals.PID = c.Flag("pid").Value.String()
} cliVals.CGroupsNS = c.Flag("cgroupns").Value.String()
if !c.Flag("pids-limit").Changed { if !c.Flag("pids-limit").Changed {
cliVals.PIDsLimit = -1 cliVals.PIDsLimit = -1
} }
if c.Flag("cgroupns").Changed {
cliVals.CGroupsNS = c.Flag("cgroupns").Value.String()
}
if c.Flag("entrypoint").Changed { if c.Flag("entrypoint").Changed {
val := c.Flag("entrypoint").Value.String() val := c.Flag("entrypoint").Value.String()
cliVals.Entrypoint = &val cliVals.Entrypoint = &val