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

Fix missing host setting and fix tests

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-06-15 18:17:02 -03:00
parent bb13a8be5d
commit de281eb58b
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
handlers/home.go
View File

@@ -17,6 +17,7 @@ func Home(w http.ResponseWriter, r *http.Request) {
return return
} }
if s.Stack != "" { if s.Stack != "" {
s.Host = r.Host
go core.SessionDeployStack(s) go core.SessionDeployStack(s)
} }

1
handlers/session_setup.go
View File

@@ -26,6 +26,7 @@ func SessionSetup(rw http.ResponseWriter, req *http.Request) {
return return
} }
s.Host = req.Host
err := core.SessionSetup(s, body) err := core.SessionSetup(s, body)
if err != nil { if err != nil {
log.Println(err) log.Println(err)

2
pwd/instance_test.go
View File

@@ -234,7 +234,7 @@ func TestInstanceAllowedImages(t *testing.T) {
p := NewPWD(dock, tasks, broadcast, storage) p := NewPWD(dock, tasks, broadcast, storage)
expectedImages := []string{config.GetDindImageName(), "franela/dind:overlay2-dev"} expectedImages := []string{config.GetDindImageName(), "franela/dind:overlay2-dev", "franela/ucp:2.4.1"}
assert.Equal(t, expectedImages, p.InstanceAllowedImages()) assert.Equal(t, expectedImages, p.InstanceAllowedImages())
} }

4
pwd/session.go
View File

@@ -46,6 +46,7 @@ type Session struct {
Stack string `json:"stack"` Stack string `json:"stack"`
StackName string `json:"stack_name"` StackName string `json:"stack_name"`
ImageName string `json:"image_name"` ImageName string `json:"image_name"`
Host string `json:"host"`
closingTimer *time.Timer `json:"-"` closingTimer *time.Timer `json:"-"`
scheduled bool `json:"-"` scheduled bool `json:"-"`
clients []*Client `json:"-"` clients []*Client `json:"-"`
@@ -163,7 +164,7 @@ func (p *pwd) SessionDeployStack(s *Session) error {
s.Ready = false s.Ready = false
p.broadcast.BroadcastTo(s.Id, "session ready", false) p.broadcast.BroadcastTo(s.Id, "session ready", false)
i, err := p.InstanceNew(s, InstanceConfig{ImageName: s.ImageName}) i, err := p.InstanceNew(s, InstanceConfig{ImageName: s.ImageName, Host: s.Host})
if err != nil { if err != nil {
log.Printf("Error creating instance for stack [%s]: %s\n", s.Stack, err) log.Printf("Error creating instance for stack [%s]: %s\n", s.Stack, err)
return err return err
@@ -249,6 +250,7 @@ func (p *pwd) SessionSetup(session *Session, conf SessionSetupConf) error {
instanceConf := InstanceConfig{ instanceConf := InstanceConfig{
ImageName: conf.Image, ImageName: conf.Image,
Hostname: conf.Hostname, Hostname: conf.Hostname,
Host: session.Host,
} }
i, err := p.InstanceNew(session, instanceConf) i, err := p.InstanceNew(session, instanceConf)
if err != nil { if err != nil {