github/docker-labs
1
0
Fork 0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-16 20:07:25 +08:00
Code Issues Releases Wiki Activity

Change default dind image and prevent session panic

Browse Source
This commit is contained in:
Marcos Lilljedahl 2016-11-15 01:46:29 -03:00
parent cab8eef9da
commit 939c045198
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/instance.go
View File

@ -41,7 +41,7 @@ func init() {
func getDindImageName() string { func getDindImageName() string {
dindImage := os.Getenv("DIND_IMAGE") dindImage := os.Getenv("DIND_IMAGE")
defaultDindImageName = "docker:1.12.3-dind" defaultDindImageName = "franela/pwd-1.12.3-experimental-dind"
if len(dindImage) == 0 { if len(dindImage) == 0 {
dindImage = defaultDindImageName dindImage = defaultDindImageName
} }

2
services/session.go
View File

@ -66,7 +66,9 @@ func CloseSession(s *Session) error {
wsServer.BroadcastTo(s.Id, "session end") wsServer.BroadcastTo(s.Id, "session end")
log.Printf("Starting clean up of session [%s]\n", s.Id) log.Printf("Starting clean up of session [%s]\n", s.Id)
for _, i := range s.Instances { for _, i := range s.Instances {
if i.conn != nil {
i.conn.Close() i.conn.Close()
}
if err := DeleteContainer(i.Name); err != nil { if err := DeleteContainer(i.Name); err != nil {
log.Println(err) log.Println(err)
return err return err