From f82286d1d1c2aadcb3bce3c74420ade7aaf3ea5d Mon Sep 17 00:00:00 2001
From: Marcos Lilljedahl <marcosnils@gmail.com>
Date: Fri, 28 Jul 2017 18:01:23 -0300
Subject: [PATCH] Add new UCP image

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

diff --git a/pwd/instance.go b/pwd/instance.go
index 4482728..a9c1660 100644
--- a/pwd/instance.go
+++ b/pwd/instance.go
@@ -283,12 +283,19 @@ func (p *pwd) InstanceAllowedImages() []string {
 	return []string{
 		config.GetDindImageName(),
 		"franela/dind:overlay2-dev",
-		"franela/ucp:2.4.1",
+		"franela/ucp:2.1.5",
 	}
 
 }
 
 func (p *pwd) InstanceExec(instance *types.Instance, cmd []string) (int, error) {
 	defer observeAction("InstanceExec", time.Now())
-	return p.docker.Exec(instance.Name, cmd)
+	b := bytes.NewBufferString("")
+	if c, err := p.docker.ExecAttach(instance.Name, cmd, b); c > 0 {
+		log.Println(b.String())
+		return c, fmt.Errorf("Error %d running command [%s]", c, cmd)
+	} else if err != nil {
+		return -1, err
+	}
+	return 0, nil
 }
diff --git a/pwd/session.go b/pwd/session.go
index fedf2f1..d8eb0b1 100644
--- a/pwd/session.go
+++ b/pwd/session.go
@@ -186,6 +186,10 @@ func (p *pwd) SessionGet(sessionId string) *types.Session {
 
 	s, _ := p.storage.SessionGet(sessionId)
 
+	if s == nil {
+		return nil
+	}
+
 	if err := p.prepareSession(s); err != nil {
 		log.Println(err)
 		return nil