From f40c527e3c8c867f2478d8ede2b04cd05750e585 Mon Sep 17 00:00:00 2001
From: "Jonathan Leibiusky @xetorthio" <ionathan@gmail.com>
Date: Thu, 18 May 2017 17:30:47 -0300
Subject: [PATCH] Do everything in a single command and pull all images before
 deploying the stack to the swarm.

---
 services/session.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/session.go b/services/session.go
index a068a00..e347a4e 100644
--- a/services/session.go
+++ b/services/session.go
@@ -111,14 +111,12 @@ func (s *Session) DeployStack() error {
 		return err
 	}
 
-	_, err = Exec(i.Name, []string{"docker", "swarm", "init", "--advertise-addr", "eth0"})
-	if err != nil {
-		log.Printf("Error executing stack [%s]: %s\n", s.Stack, err)
-		return err
-	}
-	w := sessionBuilderWriter{session: s}
 	fileName := path.Base(s.Stack)
-	code, err := ExecAttach(i.Name, []string{"docker", "stack", "deploy", "-c", "/var/run/pwd/uploads/" + fileName, "pwd"}, &w)
+	file := fmt.Sprintf("/var/run/pwd/uploads/%s", fileName)
+	cmd := fmt.Sprintf("docker swarm init --advertise-addr eth0 && docker-compose -f %s pull && docker stack deploy -c %s pwd", file, file)
+
+	w := sessionBuilderWriter{session: s}
+	code, err := ExecAttach(i.Name, []string{"sh", "-c", cmd}, &w)
 	if err != nil {
 		log.Printf("Error executing stack [%s]: %s\n", s.Stack, err)
 		return err