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

Add image_name parameter to SessionDeploy

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-06-14 21:09:20 -03:00
parent be6b8e6293
commit 2224e6e540
8 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pwd/session.go
View File

@@ -45,13 +45,14 @@ type Session struct {
Ready bool `json:"ready"`
Stack string `json:"stack"`
StackName string `json:"stack_name"`
ImageName string `json:"image_name"`
closingTimer *time.Timer `json:"-"`
scheduled bool `json:"-"`
clients []*Client `json:"-"`
ticker *time.Ticker `json:"-"`
}
func (p *pwd) SessionNew(duration time.Duration, stack, stackName string) (*Session, error) {
func (p *pwd) SessionNew(duration time.Duration, stack, stackName, imageName string) (*Session, error) {
defer observeAction("SessionNew", time.Now())
sessionsMutex.Lock()
@@ -72,6 +73,7 @@ func (p *pwd) SessionNew(duration time.Duration, stack, stackName string) (*Sess
stackName = "pwd"
}
s.StackName = stackName
s.ImageName = imageName
log.Printf("NewSession id=[%s]\n", s.Id)
@@ -161,7 +163,7 @@ func (p *pwd) SessionDeployStack(s *Session) error {
s.Ready = false
p.broadcast.BroadcastTo(s.Id, "session ready", false)
i, err := p.InstanceNew(s, InstanceConfig{})
i, err := p.InstanceNew(s, InstanceConfig{ImageName: s.ImageName})
if err != nil {
log.Printf("Error creating instance for stack [%s]: %s\n", s.Stack, err)
return err