Use rebuild-image script from tools.git

- Add some extra files to build image
- Add make to UI build container

Makefile

@@ -61,7 +61,7 @@ client-sync:
 		-v $(shell pwd)/client/build:/home/weave/build \
 		$(SCOPE_UI_BUILD_IMAGE) gulp sync
 
-$(SCOPE_UI_BUILD_EXPORT): client/Dockerfile client/gulpfile.js client/package.json
+$(SCOPE_UI_BUILD_EXPORT): client/Dockerfile client/gulpfile.js client/package.json  client/webpack.config.js client/.eslintrc
 	docker build -t $(SCOPE_UI_BUILD_IMAGE) client
 	docker save $(SCOPE_UI_BUILD_IMAGE):latest > $@
 

bin/rebuild-ui-build-image

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-CACHE_DIR=$HOME/docker/
-
-rebuild() {
-	rm $CACHE_DIR/* || true
-	make scope_ui_build.tar
-	mkdir -p $CACHE_DIR
-	mv scope_ui_build.tar $CACHE_DIR/image-$CIRCLE_SHA1
-}
-
-# Get the revision the cached image was build at
-cached_image_rev() {
-	find $CACHE_DIR -name 'image-*' -type f | sed 's/[^\-]*\-//'
-}
-
-# Have there been any revision beween $1 and $2
-has_changes() {
-	local rev1=$1
-	local rev2=$2
-	local changes=$(git log --oneline $rev1..$rev2 -- client/Dockerfile client/gulpfile.js client/package.json | wc -l)
-	[ "$changes" -gt 0 ]
-}
-
-cached_revision=$(cached_image_rev)
-if [ -z "$cached_revision" ]; then
-	rebuild
-	exit 0
-fi
-
-if has_changes $cached_revision $CIRCLE_SHA1 ; then
-	rebuild
-	exit 0
-fi
-
-# we didn't rebuild; import cached version
-docker load -i $CACHE_DIR/image-*

circle.yml

@@ -25,6 +25,7 @@ dependencies:
     - sudo apt-get update
     - sudo apt-get --only-upgrade install tar libpcap0.8-dev
     - sudo apt-get install jq
+    - 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
@@ -34,7 +35,7 @@ dependencies:
     - make deps
     - mkdir -p $(dirname $SRCDIR)
     - cp -r $(pwd)/ $SRCDIR
-    - bin/rebuild-ui-build-image
+    - cd $SRCDIR/client; $TOOLS/rebuild-image weaveworks/scope-ui-build . Dockerfile gulpfile.js package.json webpack.config.js .eslintrc
 
 test:
   override:

client/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:latest
 WORKDIR /home/weave
 
-RUN apt-get update && apt-get install -y curl bzip2 libfreetype6 libfontconfig1
+RUN apt-get update && apt-get install -y curl bzip2 libfreetype6 libfontconfig1 make
 
 # Install nodejs
 RUN curl -sL https://deb.nodesource.com/setup | bash -