summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-12-26 22:29:04 +0200
committerLauri Ojansivu <x@xet7.org>2018-12-26 22:29:04 +0200
commit77ff6349f6f85dc83d51ecc4078856846383048a (patch)
tree81d93a774b3b64b68e787f31903e2a616185d039
parent879ad4001dc4cce58dc04522bbd2433ac4b8f8bb (diff)
downloadwekan-77ff6349f6f85dc83d51ecc4078856846383048a.tar.gz
wekan-77ff6349f6f85dc83d51ecc4078856846383048a.tar.bz2
wekan-77ff6349f6f85dc83d51ecc4078856846383048a.zip
- Use Node 8.15.0 and MongoDB 3.2.22.
- Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken. Thanks to xet7 !
-rw-r--r--Dockerfile2
-rw-r--r--docker-compose.yml2
-rw-r--r--snapcraft.yaml4
-rwxr-xr-xstacksmith/user-scripts/build.sh9
4 files changed, 10 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index 896012f9..0a7479b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ ARG DEFAULT_AUTHENTICATION_METHOD
# DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
# ENV BUILD_DEPS="paxctl"
ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
- NODE_VERSION=v8.14.1 \
+ NODE_VERSION=v8.15.0 \
METEOR_RELEASE=1.6.0.1 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d635a33..4df91f75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -94,7 +94,7 @@ services:
# image: mongo:4.0.4
# b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
# Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
- image: mongo:3.2.21
+ image: mongo:3.2.22
#-------------------------------------------------------------------------------------
container_name: wekan-db
restart: always
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4831f150..d14d8037 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -65,7 +65,7 @@ apps:
parts:
mongodb:
- source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.21.tgz
+ source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz
plugin: dump
stage-packages: [libssl1.0.0]
filesets:
@@ -81,7 +81,7 @@ parts:
wekan:
source: .
plugin: nodejs
- node-engine: 8.14.1
+ node-engine: 8.15.0
node-packages:
- node-gyp
- node-pre-gyp
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
index f589bd82..c3b80eac 100755
--- a/stacksmith/user-scripts/build.sh
+++ b/stacksmith/user-scripts/build.sh
@@ -2,7 +2,7 @@
set -euxo pipefail
BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
-NODE_VERSION=v8.14.1
+NODE_VERSION=v8.15.0
#METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer
USE_EDGE=false
METEOR_EDGE=1.5-beta.17
@@ -19,8 +19,11 @@ sudo useradd --user-group --system --home-dir /home/wekan wekan
sudo mkdir -p /home/wekan
sudo chown wekan:wekan /home/wekan/
-# Using meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x
-sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app
+# CURRENTLY BROKEN: meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x
+# sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app
+
+# Using Meteor 1.6.x version of Wekan
+sudo -u wekan git clone https://github.com/wekan/wekan.git /home/wekan/app
sudo yum install -y ${BUILD_DEPS}