0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: Daemon.getPidContainer: change to accept "id" argument

Browse source 
This function didn't need the whole container, only its ID, so let's
use that as argument. This also makes it consistent with getIpcContainer.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-11 21:33:16 +02:00
parent bc7f341f29
commit 3d94eb9bcd
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/container_operations_unix.go
View file

@ -86,8 +86,7 @@ func (daemon *Daemon) getIpcContainer(id string) (*container.Container, error) {
return ctr, nil
}
func (daemon *Daemon) getPidContainer(ctr *container.Container) (*container.Container, error) {
id := ctr.HostConfig.PidMode.Container()
func (daemon *Daemon) getPIDContainer(id string) (*container.Container, error) {
ctr, err := daemon.GetContainer(id)
if err != nil {
return nil, errdefs.InvalidParameter(err)

2
daemon/oci_linux.go
View file

@ -326,7 +326,7 @@ func WithNamespaces(daemon *Daemon, c *container.Container) coci.SpecOpts {
}
switch {
case pidMode.IsContainer():
pc, err := daemon.getPidContainer(c)
pc, err := daemon.getPIDContainer(pidMode.Container())
if err != nil {
return errors.Wrap(err, "failed to join PID namespace")
}