fix lapis ultimate image

This commit is contained in:
Sam Dodrill 2015-02-08 22:01:22 -08:00
parent 5feb3e0c9a
commit aa6ebb8da7
2 changed files with 6 additions and 8 deletions

View File

@ -7,16 +7,15 @@ RUN apt-get update && \
ENV SRC_DIR /opt ENV SRC_DIR /opt
ENV OPENRESTY_VERSION 1.7.7.2 ENV OPENRESTY_VERSION 1.7.7.2
ENV OPENRESTY_PREFIX /app/openresty 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 &&\ 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 &&\ tar xzf ngx_openresty-$OPENRESTY_VERSION.tar.gz && cd ngx_openresty-$OPENRESTY_VERSION &&\
./configure --prefix=$OPENRESTY_PREFIX &&\ ./configure --prefix=$OPENRESTY_PREFIX &&\
make && make install && rm -rf ngx_openresty-$OPENRESTY_VERSION* &&\ make && make install && rm -rf ngx_openresty-$OPENRESTY_VERSION* &&\
luarocks install lapis $LAPIS_VERSION &&\
luarocks install moonscript &&\ luarocks install moonscript &&\
luarocks install moonbox &&\ 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 ADD lapis /etc/service/lapis/run
ENTRYPOINT /sbin/my_init ENTRYPOINT /sbin/my_init
@ -25,10 +24,9 @@ ENV PORT 5000
EXPOSE 5000 EXPOSE 5000
ENV LAPIS_ENVIRONMENT docker ENV LAPIS_ENVIRONMENT docker
ONBUILD ADD BoxFile /app/src ONBUILD ADD BoxFile /app/src/BoxFile
ONBUILD RUN cd /app/src && moonbox install ONBUILD RUN cd /app/src && moonbox install
ONBUILD ADD bower.json /app/src ONBUILD ADD bower.json /app/src/bower.json
ONBUILD RUN cd /app/src && bower install ONBUILD RUN cd /app/src && bower --allow-root install
ONBUILD ADD . /app/src ONBUILD ADD . /app/src
ONBUILD RUN moonc /app/src ONBUILD RUN moonc /app/src
ONBUILD RUN cd /app/src && bash -c 'coffee --compile --bare --no-header **/*.coffee'

View File

@ -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.min.css"
link rel: "stylesheet", href: "/static/comp/bootstrap/dist/css/bootstrap-theme.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 rel: "stylesheet", href: "/static/css/main.css"
link type: "text/plain", rel: "author", href: "/humans.txt" link type: "text/plain", rel: "author", href: "/humans.txt"