epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor id generator to it's own package

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-09-14 10:20:20 -03:00
parent 3ca50eae2e
commit 86a0f7d1e9
9 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
provisioner/dind.go
View File

@@ -12,19 +12,20 @@ import (
"github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/id"
"github.com/play-with-docker/play-with-docker/pwd/types"
"github.com/play-with-docker/play-with-docker/router"
"github.com/play-with-docker/play-with-docker/storage"
"github.com/rs/xid"
)
type DinD struct {
factory docker.FactoryApi
storage storage.StorageApi
factory docker.FactoryApi
storage storage.StorageApi
generator id.Generator
}
func NewDinD(f docker.FactoryApi, s storage.StorageApi) *DinD {
return &DinD{factory: f, storage: s}
func NewDinD(generator id.Generator, f docker.FactoryApi, s storage.StorageApi) *DinD {
return &DinD{generator: generator, factory: f, storage: s}
}
func checkHostnameExists(sessionId, hostname string, instances []*types.Instance) bool {
@@ -59,7 +60,7 @@ func (d *DinD) InstanceNew(session *types.Session, conf types.InstanceConfig) (*
}
conf.Hostname = nodeName
}
containerName := fmt.Sprintf("%s_%s", session.Id[:8], xid.New().String())
containerName := fmt.Sprintf("%s_%s", session.Id[:8], d.generator.NewId())
opts := docker.CreateContainerOpts{
Image: conf.ImageName,
SessionId: session.Id,