kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #36124 from crosbymichael/exec

Browse source 
Use proc/exe for reexec
This commit is contained in:
Yong Tang 2018-01-29 11:41:08 -08:00 • committed by GitHub
commit 9d61e5c8c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/oci_linux.go
View file

@ -862,14 +862,10 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
for _, ns := range s.Linux.Namespaces { for _, ns := range s.Linux.Namespaces {
if ns.Type == "network" && ns.Path == "" && !c.Config.NetworkDisabled { if ns.Type == "network" && ns.Path == "" && !c.Config.NetworkDisabled {
target, err := os.Readlink(filepath.Join("/proc", strconv.Itoa(os.Getpid()), "exe")) target := filepath.Join("/proc", strconv.Itoa(os.Getpid()), "exe")
if err != nil {
return nil, err
}
s.Hooks = &specs.Hooks{ s.Hooks = &specs.Hooks{
Prestart: []specs.Hook{{ Prestart: []specs.Hook{{
Path: target, // FIXME: cross-platform Path: target,
Args: []string{"libnetwork-setkey", c.ID, daemon.netController.ID()}, Args: []string{"libnetwork-setkey", c.ID, daemon.netController.ID()},
}}, }},
} }