update to nodejs v14

This commit is contained in:
wh1te909
2021-03-26 06:32:24 +00:00
parent c77dbe44dc
commit 4e4238d486
6 changed files with 39 additions and 21 deletions

View File

@@ -1,4 +1,4 @@
FROM node:12-alpine AS builder
FROM node:14-alpine AS builder
WORKDIR /home/node/app

View File

@@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:14-alpine
WORKDIR /home/node/app

View File

@@ -1,6 +1,6 @@
#!/bin/bash
SCRIPT_VERSION="43"
SCRIPT_VERSION="44"
SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh'
sudo apt install -y curl wget dirmngr gnupg lsb-release
@@ -212,7 +212,7 @@ sudo sed -i 's/worker_connections.*/worker_connections 2048;/g' /etc/nginx/nginx
print_green 'Installing NodeJS'
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
sudo apt update
sudo apt install -y gcc g++ make
sudo apt install -y nodejs

View File

@@ -1,6 +1,6 @@
#!/bin/bash
SCRIPT_VERSION="21"
SCRIPT_VERSION="22"
SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/restore.sh'
sudo apt update
@@ -129,7 +129,7 @@ rm -rf ${nats_tmp}
print_green 'Installing NodeJS'
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
sudo apt update
sudo apt install -y gcc g++ make
sudo apt install -y nodejs

View File

@@ -1,6 +1,6 @@
#!/bin/bash
SCRIPT_VERSION="115"
SCRIPT_VERSION="116"
SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/update.sh'
LATEST_SETTINGS_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py'
YELLOW='\033[1;33m'
@@ -160,6 +160,24 @@ if ! [[ $HAS_NATS220 ]]; then
rm -rf ${nats_tmp}
fi
HAS_NODE14=$(/usr/bin/node --version | grep v14)
if ! [[ $HAS_NODE14 ]]; then
printf >&2 "${GREEN}Updating NodeJS to v14${NC}\n"
sudo systemctl stop meshcentral
sudo apt remove -y nodejs
sudo rm -rf /usr/lib/node_modules
sudo rm -rf /home/${USER}/.npm/*
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
sudo apt update
sudo apt install -y nodejs
sudo npm install -g npm
sudo chown ${USER}:${USER} -R /meshcentral
cd /meshcentral
rm -rf node_modules/
npm install meshcentral@${LATEST_MESH_VER}
sudo systemctl start meshcentral
fi
sudo npm install -g npm
cd /rmm

28
web/package-lock.json generated
View File

@@ -7,12 +7,12 @@
"": {
"version": "0.1.8",
"dependencies": {
"@quasar/extras": "^1.9.20",
"@quasar/extras": "^1.10.0",
"apexcharts": "^3.23.1",
"axios": "^0.21.1",
"dotenv": "^8.2.0",
"qrcode.vue": "^1.7.0",
"quasar": "^1.15.7",
"quasar": "^1.15.9",
"vue-apexcharts": "^1.6.0"
},
"devDependencies": {
@@ -2027,9 +2027,9 @@
}
},
"node_modules/@quasar/extras": {
"version": "1.9.20",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.9.20.tgz",
"integrity": "sha512-MQrxrKW1de4neFJ+tLDxvnDRTuoiFkPuw6/dkbFRbQPG2NE1Ry+TbYuRlhBixYNNolTrhXesv6G/4NJ+Ev3XXQ==",
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.0.tgz",
"integrity": "sha512-H71Y/6pxunwiEN+oo9OBGM96ncM2QreVdnb2t2iStVHduju3nnypw9euBCshhYxKE/ORHZoOBRDoiddUOyaUdA==",
"funding": {
"type": "github",
"url": "https://donate.quasar.dev"
@@ -14946,9 +14946,9 @@
}
},
"node_modules/quasar": {
"version": "1.15.7",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.7.tgz",
"integrity": "sha512-LwIWtNQlEd2XZpdNbJ/gvPQBLGZ1JmeaAfXXYmktu7gTKeX0q0zv/xZ5QW9W+1J/MctCPSuVr/sVlitG9mfjRA==",
"version": "1.15.9",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.9.tgz",
"integrity": "sha512-Bx+EtUaN4fvU4EiQRkC28A7lt5WHeTE1rmP4a0BAUgg92iZkRjDZfm+OVlqjjCgOYQdcb8pitkvg/L9xxvNLdg==",
"engines": {
"node": ">= 10.0.0",
"npm": ">= 5.6.0",
@@ -22581,9 +22581,9 @@
}
},
"@quasar/extras": {
"version": "1.9.20",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.9.20.tgz",
"integrity": "sha512-MQrxrKW1de4neFJ+tLDxvnDRTuoiFkPuw6/dkbFRbQPG2NE1Ry+TbYuRlhBixYNNolTrhXesv6G/4NJ+Ev3XXQ=="
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.0.tgz",
"integrity": "sha512-H71Y/6pxunwiEN+oo9OBGM96ncM2QreVdnb2t2iStVHduju3nnypw9euBCshhYxKE/ORHZoOBRDoiddUOyaUdA=="
},
"@quasar/fastclick": {
"version": "1.1.4",
@@ -33126,9 +33126,9 @@
"dev": true
},
"quasar": {
"version": "1.15.7",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.7.tgz",
"integrity": "sha512-LwIWtNQlEd2XZpdNbJ/gvPQBLGZ1JmeaAfXXYmktu7gTKeX0q0zv/xZ5QW9W+1J/MctCPSuVr/sVlitG9mfjRA=="
"version": "1.15.9",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-1.15.9.tgz",
"integrity": "sha512-Bx+EtUaN4fvU4EiQRkC28A7lt5WHeTE1rmP4a0BAUgg92iZkRjDZfm+OVlqjjCgOYQdcb8pitkvg/L9xxvNLdg=="
},
"query-string": {
"version": "5.1.1",