From 2e04d3c0a61d41c27a05dcc2d1fe8b9bf55043eb Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Mon, 11 Apr 2016 13:21:59 -0700
Subject: [PATCH] fix(e2e): get circleci working

---
 Makefile   | 2 +-
 circle.yml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1c1b14f22..8164770f0 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ test-style:
 	@scripts/validate-go.sh
 
 .PHONY: test-e2e
-test-e2e: container
+test-e2e: container local-cluster-up
 	$(PATH_WITH_BIN) go test -tags=e2e ./test/e2e -v --manager-image=${DOCKER_REGISTRY}/manager:${TAG} --resourcifier-image=${DOCKER_REGISTRY}/resourcifier:${TAG} --expandybird-image=${DOCKER_REGISTRY}/expandybird:${TAG}
 
 .PHONY: local-cluster-up
diff --git a/circle.yml b/circle.yml
index a60780894..87cfb38a7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,4 +1,10 @@
 machine:
+  pre:
+    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.3
+
+  services:
+    - docker
+
   environment:
     GLIDE_VERSION: "0.10.1"
     GO15VENDOREXPERIMENT: 1
@@ -15,6 +21,7 @@ dependencies:
     - tar -C $HOME -xzf go1.6.linux-amd64.tar.gz
     - go version
     - go env
+    - docker info
     - sudo chown -R $(whoami):staff /usr/local
     - cd $GOPATH
     - mkdir -p $GOPATH/src/$IMPORT_PATH
@@ -30,4 +37,4 @@ dependencies:
 
 test:
   override:
-    - cd $GOPATH/src/$IMPORT_PATH && make info bootstrap test local-cluster-up test-e2e DOCKER_REGISTRY=e2e
+    - cd $GOPATH/src/$IMPORT_PATH && make info bootstrap test test-e2e DOCKER_REGISTRY=e2e