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

refer to container whose namespace we share

Browse Source 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
Peter Hunt
2019-08-06 15:24:12 -04:00
parent 7c92256103
commit a602e44e74
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/spec/spec.go
View File

@ -551,8 +551,8 @@ func addPidNS(config *CreateConfig, g *generate.Generator) error {
if pidMode.IsHost() { if pidMode.IsHost() {
return g.RemoveLinuxNamespace(string(spec.PIDNamespace)) return g.RemoveLinuxNamespace(string(spec.PIDNamespace))
} }
if pidMode.IsContainer() { if pidCtr := pidMode.Container(); pidCtr != "" {
logrus.Debug("using container pidmode") logrus.Debugf("using container %s pidmode", pidCtr)
} }
if IsPod(string(pidMode)) { if IsPod(string(pidMode)) {
logrus.Debug("using pod pidmode") logrus.Debug("using pod pidmode")
@ -589,8 +589,8 @@ func addNetNS(config *CreateConfig, g *generate.Generator) error {
} else if netMode.IsBridge() { } else if netMode.IsBridge() {
logrus.Debug("Using bridge netmode") logrus.Debug("Using bridge netmode")
return nil return nil
} else if netMode.IsContainer() { } else if netCtr := netMode.Container(); netCtr != "" {
logrus.Debug("Using container netmode") logrus.Debugf("using container %s netmode", netCtr)
return nil return nil
} else if IsNS(string(netMode)) { } else if IsNS(string(netMode)) {
logrus.Debug("Using ns netmode") logrus.Debug("Using ns netmode")
@ -616,8 +616,8 @@ func addUTSNS(config *CreateConfig, g *generate.Generator) error {
if utsMode.IsHost() { if utsMode.IsHost() {
return g.RemoveLinuxNamespace(string(spec.UTSNamespace)) return g.RemoveLinuxNamespace(string(spec.UTSNamespace))
} }
if utsMode.IsContainer() { if utsCtr := utsMode.Container(); utsCtr != "" {
logrus.Debug("using container utsmode") logrus.Debugf("using container %s utsmode", utsCtr)
} }
return nil return nil
} }
@ -630,8 +630,8 @@ func addIpcNS(config *CreateConfig, g *generate.Generator) error {
if ipcMode.IsHost() { if ipcMode.IsHost() {
return g.RemoveLinuxNamespace(string(spec.IPCNamespace)) return g.RemoveLinuxNamespace(string(spec.IPCNamespace))
} }
if ipcMode.IsContainer() { if ipcCtr := ipcMode.Container(); ipcCtr != "" {
logrus.Debug("Using container ipcmode") logrus.Debugf("Using container %s ipcmode", ipcCtr)
} }
return nil return nil
@ -648,8 +648,8 @@ func addCgroupNS(config *CreateConfig, g *generate.Generator) error {
if cgroupMode.IsPrivate() { if cgroupMode.IsPrivate() {
return g.AddOrReplaceLinuxNamespace(string(spec.CgroupNamespace), "") return g.AddOrReplaceLinuxNamespace(string(spec.CgroupNamespace), "")
} }
if cgroupMode.IsContainer() { if cgCtr := cgroupMode.Container(); cgCtr != "" {
logrus.Debug("Using container cgroup mode") logrus.Debugf("Using container %s cgroup mode", cgCtr)
} }
return nil return nil
} }