From e7ab9816cd23dcd98545994d31cdd5722cdfdfd0 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Mon, 17 Aug 2015 15:36:34 +0000
Subject: [PATCH] Use node:0.10 as the ui build image, and upgrade karma and
 karma webpack

---
 client/Dockerfile   | 18 ++----------------
 client/package.json |  5 +++--
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/client/Dockerfile b/client/Dockerfile
index 894aea2d5..47cd0e2f9 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,19 +1,5 @@
-FROM debian:latest
+FROM node:0.10
 WORKDIR /home/weave
-
-RUN apt-get update && apt-get install -y curl bzip2 libfreetype6 libfontconfig1 make
-
-# Install nodejs
-RUN curl -sL https://deb.nodesource.com/setup | bash -
-RUN apt-get install -y nodejs
-
-# build tool
+COPY package.json gulpfile.js webpack.config.js .eslintrc /home/weave/
 RUN npm install -g gulp
-
-# install app and build dependencies
-ADD package.json /home/weave/
 RUN npm install
-
-ADD gulpfile.js webpack.config.js .eslintrc /home/weave/
-
-# For instructions on running this container, consult the toplevel Makefile
diff --git a/client/package.json b/client/package.json
index ec8a13d10..1c0b695c6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -51,16 +51,17 @@
     "gulp-util": "^3.0.4",
     "istanbul-instrumenter-loader": "^0.1.3",
     "jasmine-core": "^2.3.4",
-    "karma": "^0.12.33",
+    "karma": "^0.13.3",
     "karma-cli": "0.0.4",
     "karma-coverage": "^0.4.2",
     "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "^0.1.4",
-    "karma-webpack": "^1.5.1",
+    "karma-webpack": "^1.7.0",
     "less": "^2.5.1",
     "less-loader": "^2.2.0",
     "minimist": "^1.1.1",
     "node-libs-browser": "^0.5.2",
+    "phantomjs": "^1.9.18",
     "postcss-loader": "^0.4.3",
     "proxy-middleware": "^0.12.0",
     "react-tools": "^0.13.3",