Merge branch 'master' of github.com:benweet/stackedit

This commit is contained in:
benweet 2014-10-12 12:14:13 +01:00
commit b72edf3ba1
3 changed files with 10 additions and 12 deletions

View File

@ -1,15 +1,13 @@
# Dockerfile for StackEdit FROM debian:jessie
FROM shykes/nodejs
RUN apt-get update RUN apt-get update
RUN apt-get upgrade RUN apt-get upgrade -yq
RUN apt-get install -yq git nodejs-legacy npm
RUN apt-get install -y git-core
RUN git clone https://github.com/benweet/stackedit.git RUN git clone https://github.com/benweet/stackedit.git
RUN (cd /stackedit/ && npm install) WORKDIR stackedit
EXPOSE 3000 RUN npm install
RUN node_modules/bower/bin/bower install --allow-root --production --config.interactive=false
CMD nodejs server.js
CMD (cd /stackedit/ && node server.js) EXPOSE 3000

View File

@ -13,7 +13,7 @@
"jgrowl": "~1.2.10", "jgrowl": "~1.2.10",
"google-code-prettify": "~1.0.0", "google-code-prettify": "~1.0.0",
"FileSaver": "*", "FileSaver": "*",
"stacktrace": "~0.5.3", "stacktrace": "~0.6.2",
"requirejs-text": "~2.0.10", "requirejs-text": "~2.0.10",
"bootstrap-tour": "~0.7.1", "bootstrap-tour": "~0.7.1",
"pagedown-extra": "https://github.com/jmcmanus/pagedown-extra.git#4484dd6696c82f1880b264bd610947f6f1cbdfb6", "pagedown-extra": "https://github.com/jmcmanus/pagedown-extra.git#4484dd6696c82f1880b264bd610947f6f1cbdfb6",