Merge pull request #992 from stephenmoloney/met1.4

Met1.4
This commit is contained in:
Lauri Ojansivu 2017-04-14 01:44:51 +03:00 committed by GitHub
commit e2fe80e352

View file

@ -1,9 +1,10 @@
FROM debian:wheezy
FROM debian:8.7
MAINTAINER wekan
# Declare Arguments
ARG NODE_VERSION
ARG METEOR_RELEASE
ARG METEOR_EDGE
ARG NPM_VERSION
ARG ARCHITECTURE
ARG SRC_PATH
@ -12,7 +13,8 @@ ARG SRC_PATH
ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates"
ENV GOSU_VERSION=1.10
ENV NODE_VERSION ${NODE_VERSION:-v6.10.2}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.5}
ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4-rc.6}
ENV NPM_VERSION ${NPM_VERSION:-3.10.10}
ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
ENV SRC_PATH ${SRC_PATH:-./}
@ -76,12 +78,12 @@ RUN \
chown wekan:wekan ./install_meteor.sh && \
###########################
###########################
# Temporary fix for https://github.com/wekan/wekan/issues/928 until METEOR releases 1.4.4 +
# Block for ensuring installation of release candidates - perhaps remove later.
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:wekan git checkout release/METEOR@${METEOR_EDGE} && \
gosu wekan /home/wekan/.meteor/meteor -- help \
) && \
###########################