From da30cd86d51f3d7583ce12f0a255557d3ae8cab9 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Tue, 15 Apr 2014 17:14:19 -0400 Subject: [PATCH] Add steps to the Dockerfile to build the frontend bundles --- .gitignore | 1 + Dockerfile | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b298386e5..e0d723630 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ stack grunt/node_modules dist dest +node_modules diff --git a/Dockerfile b/Dockerfile index bc64a73f8..3cd6364cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,15 @@ FROM phusion/baseimage:0.9.9 ENV DEBIAN_FRONTEND noninteractive ENV HOME /root +# Needed for this fix: http://stackoverflow.com/a/21715730 RUN apt-get update -RUN apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev gdebi-core g++ libmagic1 +RUN apt-get install -y software-properties-common python-software-properties +RUN add-apt-repository ppa:chris-lea/node.js + +# Install the dependencies. +RUN apt-get update +RUN apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev gdebi-core g++ libmagic1 nodejs +RUN npm install -g grunt-cli ADD binary_dependencies binary_dependencies RUN gdebi --n binary_dependencies/*.deb @@ -21,6 +28,7 @@ ADD conf conf ADD data data ADD endpoints endpoints ADD features features +ADD grunt grunt ADD screenshots screenshots ADD static static ADD storage storage @@ -40,6 +48,9 @@ ADD conf/init/nginx.sh /etc/service/nginx/run ADD conf/init/diffsworker.sh /etc/service/diffsworker/run ADD conf/init/webhookworker.sh /etc/service/webhookworker/run +RUN cd grunt && npm install +RUN cd grunt && grunt + RUN TEST=true venv/bin/python -m unittest discover VOLUME ["/conf/stack", "/mnt/logs"]