diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-04-06 01:20:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 01:20:01 +0300 |
| commit | 40197ed981be53895c537ec203fd72a1a606c891 (patch) | |
| tree | a4f528f8225590f31fa5e55a7d513cfb0a62bb8f | |
| parent | 31afd2b6a36e2de9e874f67d775794db560bff0d (diff) | |
| parent | 6443ea160cb4d2a35ef9a54a8913d9a392ac16ef (diff) | |
| download | wekan-40197ed981be53895c537ec203fd72a1a606c891.tar.gz wekan-40197ed981be53895c537ec203fd72a1a606c891.tar.bz2 wekan-40197ed981be53895c537ec203fd72a1a606c891.zip | |
Merge pull request #981 from stephenmoloney/met1.4
Met1.4
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | Dockerfile | 26 | ||||
| -rw-r--r-- | README.md | 6 |
3 files changed, 27 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 9a760beb..01d60165 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,15 @@ before_install: - sudo chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - sudo docker-compose build --no-cache --force-rm - - sudo docker-compose up && docker ps -a - - sudo docker run wekan-app /bin/sh -c "npm test" + - sudo docker-compose up -d wekandb + - sudo docker-compose up -d wekan + # ^^ Note - need to come up with some way of checking the output from docker run + # that it was a success... perhaps the nodejs server can output a success message? language: node_js node_js: - - "0.10.48" + - "6.10.2" install: - "npm install" @@ -11,9 +11,9 @@ ARG SRC_PATH # Set the environment variables (defaults where required) ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates" ENV GOSU_VERSION=1.10 -ENV NODE_VERSION ${NODE_VERSION:-v0.10.48} -ENV METEOR_RELEASE ${METEOR_RELEASE:-1.3.5.1} -ENV NPM_VERSION ${NPM_VERSION:-4.2.0} +ENV NODE_VERSION ${NODE_VERSION:-v6.10.2} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4} +ENV NPM_VERSION ${NPM_VERSION:-3.10.10} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -63,7 +63,7 @@ RUN \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ # Install Node dependencies - npm install npm@${NPM_VERSION} -g && \ + npm install -g npm@${NPM_VERSION} && \ npm install -g node-gyp && \ npm install -g fibers && \ \ @@ -74,11 +74,23 @@ RUN \ sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \ echo "Starting meteor ${METEOR_RELEASE} installation... \n" && \ chown wekan:wekan ./install_meteor.sh && \ - gosu wekan:wekan sh ./install_meteor.sh && \ + ########################### + ########################### + # Temporary fix for https://github.com/wekan/wekan/issues/928 until METEOR releases 1.4.4 + + gosu wekan:wekan sh ./install_meteor.sh || \ + ( \ + gosu wekan:wekan git clone --recursive git://github.com/meteor/meteor.git /home/wekan/.meteor && \ + cd /home/wekan/.meteor && \ + gosu wekan:wekan git checkout release/METEOR@1.4.4-rc.6 && \ + gosu wekan /home/wekan/.meteor/meteor -- help \ + ) && \ + ########################### + ########################### \ # Build app cd /home/wekan/app && \ - gosu wekan /home/wekan/.meteor/meteor npm install --save xss && \ + 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 && \ cd /home/wekan/app_build/bundle/programs/server/ && \ gosu wekan npm install && \ @@ -96,4 +108,4 @@ RUN \ ENV PORT=80 EXPOSE $PORT -CMD ["node", "/build/main.js"] +CMD ["node", "/build/main.js"]
\ No newline at end of file @@ -127,9 +127,9 @@ sudo docker-compose up -d --build #### Running from locally built dockerhub images and modified `ARG` variables (not recommended) ``` -echo 'NODE_VERSION=v6.6.0' >> .env && \ -echo 'METEOR_RELEASE=1.4.2.3' >> .env && \ -echo 'NPM_VERSION=4.1.2' >> .env && \ +echo 'NODE_VERSION=v6.10.2' >> .env && \ +echo 'METEOR_RELEASE=1.4.4' >> .env && \ +echo 'NPM_VERSION=3.10.10' >> .env && \ echo 'ARCHITECTURE=linux-x64' >> .env && \ echo 'SRC_PATH=./' >> .env && \ sudo docker-compose up -d --build |