From 1960e62757f8994626f6e65a5d77864827e9b4d6 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 20 Oct 2016 15:40:24 +0100
Subject: [PATCH] deployment: only run setup after images built.

---
 bin/deploy | 4 +++-
 circle.yml | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/deploy b/bin/deploy
index bfc47d50..7237161b 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -2,11 +2,13 @@
 triton env
 
 docker-compose build
-#docker-compose push
+docker-compose push
 
 export DOCKER_HOST=$_DOCKER_HOST
 export DOCKER_CERT_PATH=$_DOCKER_CERT_PATH
 export DOCKER_TLS_VERIFY=$_DOCKER_TLS_VERIFY
 
+./bin/setup
+
 docker-compose pull
 docker-compose up -d
diff --git a/circle.yml b/circle.yml
index 6395b088..e0fdfe30 100644
--- a/circle.yml
+++ b/circle.yml
@@ -25,7 +25,6 @@ deployment:
   production: # just a label; label names are completely up to you
     branch: master
     commands:
-      - ./bin/setup
       - ./bin/deploy
 
 ## Custom notifications