diff --git a/.travis.yml b/.travis.yml
index 93725d69..6c6cdd0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- - "9"
+ - 10
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y curl git tar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc6b8b4f..2a3faefe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,16 @@ Version 1.2.2
to the current one in researchSync.
- Fixed crash in researchSync when modded technologies are present only on some
nodes.
+- Fixed install failing due to bcrypt version less than 3 not being supported
+ on node v10.
+- Reordered install instructions to avoid problem with npm creating files owned
+ by root in the home directory.
+- Swapped curl out with wget in the install instructions as the latter comes
+ pre-installed on Ubuntu.
+
+### Breaking Changes
+
+- Node.js versions below 10 are no longer supported.
Version 1.2.1
diff --git a/Dockerfile b/Dockerfile
index b754a329..17f2bb2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9.11.2
+FROM node:10
RUN apt-get update && apt install git curl tar -y
RUN mkdir factorioClusterio
diff --git a/README.md b/README.md
index 16b35464..ac480c94 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,17 @@
-# Warning
-
-Do not use master branch to run your Clusterio - master now is a development version and may not work
-
-Use latest stable release: https://github.com/clusterio/factorioClusterio/releases/latest
-
-Or clone latest stable branch that has name format `x.y.z`
-
# factorioClusterio
Discord for development/support/play: https://discord.gg/5XuDkje
+## Important notice
+
+This is the stable branch of the project. The
+[master branch][http://github.com/clusterio/factorioClusterio/tree/master]
+is undergoing significant changes that breaks compatibility to plugins and
+existing installations and is not recommended for use.
+
### Ways to support me/the project:
* Contribute with code/documentation. Always nice to move the project forward
@@ -96,19 +95,21 @@ NodeJS does not support EOL ubuntu releases. Make sure you are on the most recen
Master and all slaves:
- sudo curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash -
- sudo apt install -y nodejs python-dev git wget curl tar build-essential
- sudo npm install pm2 -g
+ wget -O - https://deb.nodesource.com/setup_10.x | sudo -E bash -
+ sudo apt install -y nodejs python-dev git build-essential
git clone -b 1.2.x https://github.com/Danielv123/factorioClusterio.git
cd factorioClusterio
- curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64
+ wget -O factorio.tar.gz https://www.factorio.com/get-download/latest/headless/linux64
tar -xf factorio.tar.gz
npm install --only=production
cp config.json.dist config.json
node ./lib/npmPostinstall.js
+downloads and installs nodejs, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21.
-downloads and installs nodejs, pm2, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21.
+Optional step (if you want to use pm2):
+
+ sudo npm install pm2 -g
Now you need to edit the `config.json` file. If you skip this step nothing will work.
Pretty much all the blank fields should be filled in, except on the master where a few can be omitted.
@@ -167,7 +168,7 @@ Game Client = The people connecting to the server
**Requirements**
-download and install nodeJS 8 or 9 from http://nodejs.org
+download and install nodeJS 10 from http://nodejs.org
download and install git from https://git-scm.com/
diff --git a/package.json b/package.json
index 43149858..d6172335 100644
--- a/package.json
+++ b/package.json
@@ -16,11 +16,14 @@
],
"author": "Danielv123",
"license": "MIT",
+ "engines": {
+ "node": ">=10"
+ },
"dependencies": {
"as-table": "^1.0.31",
"averaged-timeseries": "^1.4.0",
"base64url": "^3.0.0",
- "bcrypt": "^2.0.1",
+ "bcrypt": "^3.0.6",
"bcrypt-promise": "^2.0.0",
"body-parser": "^1.18.2",
"cli": "^1.0.1",