diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-04-28 03:19:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 03:19:22 +0300 |
| commit | c4835847c0e7bf8ef0f1fc128837b625c2650210 (patch) | |
| tree | c1d2d9a89d237b18ef5777f75dc4d36ae1928423 | |
| parent | 72d1d748693d48458cd20e0ed65db24419ad5008 (diff) | |
| parent | 4818199da7d5f4ca80c3fc29dabc0fa31a66b333 (diff) | |
| download | wekan-c4835847c0e7bf8ef0f1fc128837b625c2650210.tar.gz wekan-c4835847c0e7bf8ef0f1fc128837b625c2650210.tar.bz2 wekan-c4835847c0e7bf8ef0f1fc128837b625c2650210.zip | |
Merge pull request #1016 from stephenmoloney/devel-local
make METEOR_EDGE optional. Fix node_gyp bug in docker build.
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | Dockerfile | 24 |
2 files changed, 22 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index 01d60165..ca76cab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,13 @@ before_install: # ^^ 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: - - "6.10.2" - -install: - - "npm install" - -script: - - "npm test" +#language: node_js +# +#node_js: +# - "4.8.1" +# +#install: +# - "npm install" +# +#script: +# - "npm test" @@ -5,16 +5,18 @@ MAINTAINER wekan ARG NODE_VERSION ARG METEOR_RELEASE ARG METEOR_EDGE +ARG USE_EDGE ARG NPM_VERSION ARG ARCHITECTURE ARG SRC_PATH # Set the environment variables (defaults where required) -ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates" +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 METEOR_RELEASE ${METEOR_RELEASE:-1.4.5} -ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4.1} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1} +ENV USE_EDGE ${USE_EDGE:-false} +ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4-rc.6} ENV NPM_VERSION ${NPM_VERSION:-4.5.0} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -76,18 +78,16 @@ 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 && \ - ########################### - ########################### - # Block for ensuring installation of release candidates - perhaps remove later. - gosu wekan:wekan sh ./install_meteor.sh || \ - ( \ + \ + # Check if opting for a release candidate instead of major release + if [ "$USE_EDGE" = false ]; then \ + gosu wekan:wekan sh ./install_meteor.sh; \ + else \ 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@${METEOR_EDGE} && \ - gosu wekan /home/wekan/.meteor/meteor -- help \ - ) && \ - ########################### - ########################### + gosu wekan /home/wekan/.meteor/meteor -- help; \ + fi && \ \ # Build app cd /home/wekan/app && \ |