github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-15 18:57:28 +08:00
Code Issues Releases Wiki Activity

Merge pull request #56 from akalipetis/hotfix-instance-name-rotation

Browse Source 
Fix issue where instance name rotation was faulty
This commit is contained in:
Marcos Nils 2016-11-22 15:19:25 +02:00 committed by GitHub
commit 370bab5e27
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/docker.go
View File

@ -86,14 +86,28 @@ func CreateInstance(session *Session, dindImage string) (*Instance, error) {
t := true t := true
h.Resources.OomKillDisable = &t h.Resources.OomKillDisable = &t
nodeName := fmt.Sprintf("node%d", len(session.Instances)+1) var nodeName string
var containerName string
for i := 1; ; i++ {
nodeName = fmt.Sprintf("node%d", i)
containerName = fmt.Sprintf("%s_%s", session.Id[:8], nodeName)
exists := false
for _, instance := range session.Instances {
if instance.Name == containerName {
exists = true
break
}
}
if !exists {
break
}
}
conf := &container.Config{Hostname: nodeName, Image: dindImage, Tty: true, OpenStdin: true, AttachStdin: true, AttachStdout: true, AttachStderr: true} conf := &container.Config{Hostname: nodeName, Image: dindImage, Tty: true, OpenStdin: true, AttachStdin: true, AttachStdout: true, AttachStderr: true}
networkConf := &network.NetworkingConfig{ networkConf := &network.NetworkingConfig{
map[string]*network.EndpointSettings{ map[string]*network.EndpointSettings{
session.Id: &network.EndpointSettings{Aliases: []string{nodeName}}, session.Id: &network.EndpointSettings{Aliases: []string{nodeName}},
}, },
} }
containerName := fmt.Sprintf("%s_%s", session.Id[:8], nodeName)
container, err := c.ContainerCreate(context.Background(), conf, h, networkConf, containerName) container, err := c.ContainerCreate(context.Background(), conf, h, networkConf, containerName)
if err != nil { if err != nil {