From b21534a6c4fdbc801f8e057c10a94312aa63c6af Mon Sep 17 00:00:00 2001 From: Stephen Moloney Date: Mon, 10 Apr 2017 11:02:50 +0100 Subject: [PATCH 1/5] update debian version issue 988 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e173379f..a80fe6f49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:wheezy +FROM debian:8.7 MAINTAINER wekan # Declare Arguments From 65ba52b17714f2cff366eafce3911d145229a5e5 Mon Sep 17 00:00:00 2001 From: Stephen Moloney Date: Mon, 10 Apr 2017 11:13:06 +0100 Subject: [PATCH 2/5] meteor has released 1.4.4.1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a80fe6f49..f63ed887f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ 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.4.1} ENV NPM_VERSION ${NPM_VERSION:-3.10.10} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -76,7 +76,7 @@ RUN \ chown wekan:wekan ./install_meteor.sh && \ ########################### ########################### - # Temporary fix for https://github.com/wekan/wekan/issues/928 until METEOR releases 1.4.4 + + # This block is for installing on release candidates, suppose can be left in place for now. gosu wekan:wekan sh ./install_meteor.sh || \ ( \ gosu wekan:wekan git clone --recursive git://github.com/meteor/meteor.git /home/wekan/.meteor && \ From 14208dca1d863c59fec18dd3e89cdedd68724744 Mon Sep 17 00:00:00 2001 From: Stephen Moloney Date: Mon, 10 Apr 2017 11:26:17 +0100 Subject: [PATCH 3/5] seems meteor 1.4.4.1 does not include fix for EXDEV problem --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f63ed887f..7c5e1d977 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ 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.1} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.5} ENV NPM_VERSION ${NPM_VERSION:-3.10.10} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -76,12 +76,12 @@ RUN \ chown wekan:wekan ./install_meteor.sh && \ ########################### ########################### - # This block is for installing on release candidates, suppose can be left in place for now. + # 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@1.4.4-rc.9 && \ gosu wekan /home/wekan/.meteor/meteor -- help \ ) && \ ########################### From 31ce8bb1bf19141655797d5d70574a6a5c15b94e Mon Sep 17 00:00:00 2001 From: Stephen Moloney Date: Mon, 10 Apr 2017 11:27:56 +0100 Subject: [PATCH 4/5] MAKE release candidates and betas specifiable in dockerbuild --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c5e1d977..247817cc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ MAINTAINER wekan # Declare Arguments ARG NODE_VERSION ARG METEOR_RELEASE +ARG METEOR_EDGE ARG NPM_VERSION ARG ARCHITECTURE ARG SRC_PATH @@ -13,6 +14,7 @@ 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.5} +ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4-rc.9} ENV NPM_VERSION ${NPM_VERSION:-3.10.10} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -81,7 +83,7 @@ RUN \ ( \ 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.9 && \ + gosu wekan:wekan git checkout release/METEOR@${METEOR_EDGE} && \ gosu wekan /home/wekan/.meteor/meteor -- help \ ) && \ ########################### From 1b5a5bba1dfa364e16601f952d2f120511f9a0bb Mon Sep 17 00:00:00 2001 From: Stephen Moloney Date: Mon, 10 Apr 2017 11:49:56 +0100 Subject: [PATCH 5/5] rc.6 seems to work only for now. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 247817cc8..e49b6dfdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ 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.5} -ENV METEOR_EDGE ${METEOR_EDGE:-1.4.4-rc.9} +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:-./}