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 #2010 from madhanrm/hotaddfix

Browse source 
Fix to use ContainerID for windows instead of SanbdoxID
This commit is contained in:
Flavio Crisciani 2018-01-23 15:08:46 -08:00 committed by GitHub
commit 08f9dfeaf8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/controller.go
View file

@ -48,6 +48,7 @@ import (
"fmt" "fmt"
"net" "net"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -1074,10 +1075,15 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (S
} }
c.Unlock() c.Unlock()
sandboxID := stringid.GenerateRandomID()
if runtime.GOOS == "windows" {
sandboxID = containerID
}
// Create sandbox and process options first. Key generation depends on an option // Create sandbox and process options first. Key generation depends on an option
if sb == nil { if sb == nil {
sb = &sandbox{ sb = &sandbox{
id: stringid.GenerateRandomID(), id: sandboxID,
containerID: containerID, containerID: containerID,
endpoints: epHeap{}, endpoints: epHeap{},
epPriority: map[string]int{}, epPriority: map[string]int{},