summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-12-20 14:11:41 +0200
committerLauri Ojansivu <x@xet7.org>2017-12-20 14:11:41 +0200
commit0c15048bdd1da5928525585b1d24c5dbe8a68bbc (patch)
tree2ece91b977673cddb28566c29d60eaf065b531a1
parent74877fd10d083a5ebd19d17128d26306426f1204 (diff)
downloadwekan-0c15048bdd1da5928525585b1d24c5dbe8a68bbc.tar.gz
wekan-0c15048bdd1da5928525585b1d24c5dbe8a68bbc.tar.bz2
wekan-0c15048bdd1da5928525585b1d24c5dbe8a68bbc.zip
Use Node 4.6.7. Add paxctl fix to snap.
-rw-r--r--CHANGELOG.md10
-rw-r--r--Dockerfile2
-rw-r--r--snapcraft.yaml7
3 files changed, 15 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57e538b9..58da6d0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+* Update to Node 4.8.7
+
+Thanks to GitHub user xet7 for contributions.
+
# v0.62 2017-12-12 Wekan release
This release fixes the following bugs:
@@ -17,7 +25,7 @@ This release adds the following new features:
* [Make it easier to see the Add Card button at top of list](https://github.com/wekan/wekan/pull/1392);
* [Add mixmax:smart-disconnect to lower CPU usage when browser tab is not selected](https://github.com/wekan/wekan-mongodb/issues/2);
* Update tranlations. Add Latvian language;
-* Update to Node 4.8.4 and MongoDB 3.2.18.
+* Update to Node 4.8.6 and MongoDB 3.2.18.
and fixes the following bugs:
diff --git a/Dockerfile b/Dockerfile
index f8027594..70f1af2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ARG SRC_PATH
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl"
ENV GOSU_VERSION=1.10
-ENV NODE_VERSION ${NODE_VERSION:-v4.8.6}
+ENV NODE_VERSION ${NODE_VERSION:-v4.8.7}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1}
ENV USE_EDGE ${USE_EDGE:-false}
ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 18e06e72..18b980f8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -70,7 +70,7 @@ parts:
wekan:
source: .
plugin: nodejs
- node-engine: 4.8.6
+ node-engine: 4.8.7
node-packages:
- n
- npm@4.6.1
@@ -84,11 +84,14 @@ parts:
- capnproto
- npm
- curl
+ - paxctl
prepare: |
echo "Cleaning environment first"
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
echo "Installing node"
- n 4.8.6
+ n 4.8.7
+ echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
+ paxctl -mC `which node`
echo "Installing meteor"
curl https://install.meteor.com/ -o install_meteor.sh
sed -i "s|RELEASE=.*|RELEASE=\"1.4.4.1\"|g" install_meteor.sh