From aa6ebb8da7afdc51e6b37ffa87ef7e2ca456990d Mon Sep 17 00:00:00 2001
From: Sam Dodrill <xena@yolo-swag.com>
Date: Sun, 8 Feb 2015 22:01:22 -0800
Subject: [PATCH] fix lapis ultimate image

---
 lapis-ultimate/Dockerfile                 | 12 +++++-------
 lapis-ultimate/test/layout/bootstrap.moon |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lapis-ultimate/Dockerfile b/lapis-ultimate/Dockerfile
index 810334a..1e4f5be 100644
--- a/lapis-ultimate/Dockerfile
+++ b/lapis-ultimate/Dockerfile
@@ -7,16 +7,15 @@ RUN apt-get update && \
 ENV SRC_DIR /opt
 ENV OPENRESTY_VERSION 1.7.7.2
 ENV OPENRESTY_PREFIX /app/openresty
-ENV LAPIS_VERSION 1.1.0
 
 RUN cd $SRC_DIR && curl -LO http://openresty.org/download/ngx_openresty-$OPENRESTY_VERSION.tar.gz &&\
     tar xzf ngx_openresty-$OPENRESTY_VERSION.tar.gz && cd ngx_openresty-$OPENRESTY_VERSION &&\
     ./configure --prefix=$OPENRESTY_PREFIX &&\
     make && make install && rm -rf ngx_openresty-$OPENRESTY_VERSION* &&\
-    luarocks install lapis $LAPIS_VERSION &&\
     luarocks install moonscript &&\
     luarocks install moonbox &&\
-    npm install -g coffee-script && npm install -g bower
+    npm install -g bower &&\
+    ln -s /usr/bin/nodejs /usr/local/bin/node
 
 ADD lapis /etc/service/lapis/run
 ENTRYPOINT /sbin/my_init
@@ -25,10 +24,9 @@ ENV PORT 5000
 EXPOSE 5000
 ENV LAPIS_ENVIRONMENT docker
 
-ONBUILD ADD BoxFile /app/src
+ONBUILD ADD BoxFile /app/src/BoxFile
 ONBUILD RUN cd /app/src && moonbox install
-ONBUILD ADD bower.json /app/src
-ONBUILD RUN cd /app/src && bower install
+ONBUILD ADD bower.json /app/src/bower.json
+ONBUILD RUN cd /app/src && bower --allow-root install
 ONBUILD ADD . /app/src
 ONBUILD RUN moonc /app/src
-ONBUILD RUN cd /app/src && bash -c 'coffee --compile --bare --no-header **/*.coffee'
diff --git a/lapis-ultimate/test/layout/bootstrap.moon b/lapis-ultimate/test/layout/bootstrap.moon
index 3302630..f4e85cd 100644
--- a/lapis-ultimate/test/layout/bootstrap.moon
+++ b/lapis-ultimate/test/layout/bootstrap.moon
@@ -16,7 +16,7 @@ class Layout extends Widget
 
     link rel: "stylesheet", href: "/static/comp/bootstrap/dist/css/bootstrap.min.css"
     link rel: "stylesheet", href: "/static/comp/bootstrap/dist/css/bootstrap-theme.min.css"
-    link rel: "stylesheet", href: "/static/comp/fontawesome/font-awesome.min.css"
+    link rel: "stylesheet", href: "/static/comp/fontawesome/css/font-awesome.min.css"
     link rel: "stylesheet", href: "/static/css/main.css"
 
     link type: "text/plain", rel: "author", href: "/humans.txt"