From 00ac914be95a489830c32cdf88cff3148b683691 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Mon, 26 Oct 2015 15:28:55 +0000
Subject: [PATCH] Don't need to clone a sepatate tools repo, or install a bunch
 of packages now.

---
 circle.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/circle.yml b/circle.yml
index 5d56ab41c..8f94ed76d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,7 +8,6 @@ machine:
     - docker
   environment:
     GOPATH: /home/ubuntu
-    TOOLS: /home/ubuntu/src/github.com/weaveworks/tools
     SRCDIR: /home/ubuntu/src/github.com/weaveworks/scope
     PATH: $PATH:$HOME/.local/bin
     CLOUDSDK_CORE_DISABLE_PROMPTS: 1
@@ -20,23 +19,18 @@ dependencies:
   cache_directories:
     - "~/docker"
   post:
-    - mkdir -p $TOOLS
-    - git clone https://github.com/weaveworks/tools.git $TOOLS
     - sudo apt-get update
-    - sudo apt-get --only-upgrade install tar libpcap0.8-dev
     - sudo apt-get install jq pv
     - curl https://sdk.cloud.google.com | bash
     - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
     - go get $WEAVE_REPO/...
     - make -C $WEAVE_ROOT testing/runner/runner
-    - go version
-    - go clean -i net
-    - go install -tags netgo std
     - make deps
     - mkdir -p $(dirname $SRCDIR)
     - cp -r $(pwd)/ $SRCDIR
-    - cd $SRCDIR/client; $TOOLS/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc
-    - cd $SRCDIR/backend; $TOOLS/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh
+    - cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc
+    - touch $SRCDIR/.scope_ui_build.uptodate
+    - cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh
     - touch $SRCDIR/.scope_backend_build.uptodate
 
 test: