From b5197fa6732a6ae093a05962d1441a343c22a25f Mon Sep 17 00:00:00 2001 From: Jeff Tickle Date: Wed, 5 Jul 2017 11:36:37 -0400 Subject: Updated Dockerfile to build successfully when USE_EDGE=true --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7e76ee8..7a3539fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,9 +96,11 @@ RUN \ 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 && \ + 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/kadira-flow-router/package.js && \ + sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/.meteor/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ gosu wekan /home/wekan/.meteor/meteor -- help; \ fi && \ -- cgit v1.2.3-1-g7c22 From 2d595da6a676e61a659654abab32d716779982dc Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jul 2017 01:48:46 +0300 Subject: Build Dockerfile with and without of USE_EDGE=true. --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a3539fe..812ca538 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,14 +96,13 @@ RUN \ 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/.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/kadira-flow-router/package.js && \ - sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/.meteor/packages/meteor-useraccounts-core/package.js && \ - cd /home/wekan/.meteor && \ - gosu wekan /home/wekan/.meteor/meteor -- help; \ fi && \ + 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 /home/wekan/.meteor/meteor -- help; \ \ # Build app cd /home/wekan/app && \ -- cgit v1.2.3-1-g7c22 From 6fe4f00c44190a73bc5612ba076a120d03b59686 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jul 2017 01:52:05 +0300 Subject: Fix double slash issue. Thanks to jtickle ! Closes #1110 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 967c8aec..ef3f5d75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,10 @@ This release adds the following new features: and fixes the following bugs: -* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107). +* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107); +* [Double-slash issue](https://github.com/wekan/wekan/pull/1114). -Thanks to GitHub users GhassenRjab, nztqa and zarnifoulette for their contributions. +Thanks to GitHub users GhassenRjab, jtickle, nztqa and zarnifoulette for their contributions. # v0.27 2017-06-28 Wekan release -- cgit v1.2.3-1-g7c22