diff options
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 37 |
1 files changed, 21 insertions, 16 deletions
@@ -1,4 +1,4 @@ -FROM debian:8.7 +FROM debian:8.8 MAINTAINER wekan # Declare Arguments @@ -14,7 +14,7 @@ ARG SRC_PATH # Set the environment variables (defaults where required) ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9" ENV GOSU_VERSION=1.10 -ENV NODE_VERSION ${NODE_VERSION:-v4.8.1} +ENV NODE_VERSION ${NODE_VERSION:-v4.8.4} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} @@ -95,27 +95,32 @@ RUN \ if [ "$USE_EDGE" = false ]; then \ gosu wekan:wekan sh ./install_meteor.sh; \ else \ - gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor && \ - cd /home/wekan/packages && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ - cd /home/wekan/.meteor && \ - gosu wekan /home/wekan/.meteor/meteor -- help; \ - fi && \ + gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ + fi; \ + \ + # Get additional packages + mkdir -p /home/wekan/.meteor/packages && \ + chown wekan:wekan --recursive /home/wekan/.meteor && \ + cd /home/wekan/.meteor/packages && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ + sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/.meteor/packages/meteor-useraccounts-core/package.js && \ + cd /home/wekan/.meteor && \ + gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ \ # Build app cd /home/wekan/app && \ - gosu wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ - gosu wekan /home/wekan/.meteor/meteor npm install && \ - gosu wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ + gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ + gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ + gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ - gosu wekan sed -i "s|build\/Release\/bson|browser_build\/bson|g" /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js && \ + gosu wekan:wekan sed -i "s|build\/Release\/bson|browser_build\/bson|g" /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js && \ cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ - gosu wekan rm -rf node_modules/bcrypt && \ - gosu wekan npm install bcrypt && \ + gosu wekan:wekan rm -rf node_modules/bcrypt && \ + gosu wekan:wekan npm install bcrypt && \ cd /home/wekan/app_build/bundle/programs/server/ && \ - gosu wekan npm install && \ + gosu wekan:wekan npm install && \ mv /home/wekan/app_build/bundle /build && \ \ # Cleanup |