From c5682803cf63577d926e18f917a0cf7ac84b4352 Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Wed, 6 Jul 2016 13:36:17 -0700
Subject: [PATCH] fix(ci): move docker-build out of parallel step

circle ci can't seem to find the image when it is build in a parallel
container.
---
 circle.yml    | 1 +
 scripts/ci.sh | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 54117b8e1..1c40610fb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -41,4 +41,5 @@ deployment:
     commands:
       - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
       - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
+      - make docker-build
       - docker push gcr.io/kubernetes-helm/tiller:canary
diff --git a/scripts/ci.sh b/scripts/ci.sh
index b6c59943f..7ed63df4a 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -31,8 +31,4 @@ case "${CIRCLE_NODE_INDEX-0}" in
     echo "Running 'make test-style'"
     make test-style
     ;;
-  2)
-    echo "Running 'make docker-build'"
-    make docker-build
-    ;;
 esac