From 939c04519862fe972b711ba725b1f4cf97ac333e Mon Sep 17 00:00:00 2001
From: Marcos Lilljedahl <marcosnils@gmail.com>
Date: Tue, 15 Nov 2016 01:46:29 -0300
Subject: [PATCH] Change default dind image and prevent session panic

---
 services/instance.go | 2 +-
 services/session.go  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/instance.go b/services/instance.go
index 23c322e..6b3c8f6 100644
--- a/services/instance.go
+++ b/services/instance.go
@@ -41,7 +41,7 @@ func init() {
 
 func getDindImageName() string {
 	dindImage := os.Getenv("DIND_IMAGE")
-	defaultDindImageName = "docker:1.12.3-dind"
+	defaultDindImageName = "franela/pwd-1.12.3-experimental-dind"
 	if len(dindImage) == 0 {
 		dindImage = defaultDindImageName
 	}
diff --git a/services/session.go b/services/session.go
index a53a8f9..3600bf7 100644
--- a/services/session.go
+++ b/services/session.go
@@ -66,7 +66,9 @@ func CloseSession(s *Session) error {
 	wsServer.BroadcastTo(s.Id, "session end")
 	log.Printf("Starting clean up of session [%s]\n", s.Id)
 	for _, i := range s.Instances {
-		i.conn.Close()
+		if i.conn != nil {
+			i.conn.Close()
+		}
 		if err := DeleteContainer(i.Name); err != nil {
 			log.Println(err)
 			return err