upgrade to Node 14 (#2244)
* add quotes to docker-compose port range vars * upgrade to Node 14 * update CircleCI config to use Node 14 * upgrade dockerfiles to node 14 * update travis config for Node 14 * update npm package-lock * upgrade node-postgres to resolve Knex error - https://github.com/knex/knex/issues/3836 * bump Node to 14.17.5 for latest security release - https://nodejs.org/en/blog/vulnerability/aug-2021-security-releases/ * pin Node to latest in v14
This commit is contained in:
Родитель
ae91bf8e0c
Коммит
23d2f8596e
|
@ -71,7 +71,7 @@ jobs:
|
|||
command: |
|
||||
export NVM_DIR="/opt/circleci/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
nvm use 10
|
||||
nvm install 14 --default
|
||||
node -v
|
||||
cp .env-dist .env
|
||||
npm install
|
||||
|
|
|
@ -8,19 +8,19 @@ matrix:
|
|||
include:
|
||||
- name: "js lint"
|
||||
language: node_js
|
||||
node_js: 10
|
||||
node_js: 14
|
||||
script: "npm run lint:js"
|
||||
- name: "css lint"
|
||||
language: node_js
|
||||
node_js: 10
|
||||
node_js: 14
|
||||
script: "npm run lint:css"
|
||||
- name: "npm audit"
|
||||
language: node_js
|
||||
node_js: 10
|
||||
node_js: 14
|
||||
script: "npm run lint:audit"
|
||||
- name: "tests"
|
||||
language: node_js
|
||||
node_js: 10
|
||||
node_js: 14
|
||||
env:
|
||||
- NODE_ENV=tests
|
||||
install:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM node:10-alpine
|
||||
FROM node:14-alpine
|
||||
|
||||
RUN addgroup -g 10001 app && \
|
||||
adduser -D -G app -h /app -u 10001 app
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -42,7 +42,7 @@
|
|||
"nodemailer": "4.7.0",
|
||||
"nodemailer-express-handlebars": "3.3.0",
|
||||
"npm-run-all": "4.1.5",
|
||||
"pg": "7.18.2",
|
||||
"pg": "^8.7.1",
|
||||
"redis": "3.1.1",
|
||||
"sns-validator": "0.3.4",
|
||||
"uuid": "3.4.0"
|
||||
|
@ -80,7 +80,7 @@
|
|||
"wdio-video-reporter": "2.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": "10"
|
||||
"node": ">=14.17.5"
|
||||
},
|
||||
"homepage": "https://github.com/mozilla/blurts-server",
|
||||
"license": "MPL-2.0",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Build app for integration tests
|
||||
FROM node:10
|
||||
FROM node:14
|
||||
|
||||
RUN useradd -d /app -u 1001 -g 1000 app
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ services:
|
|||
context: ../..
|
||||
dockerfile: tests/integration/Dockerfile.integration-test.yml
|
||||
ports:
|
||||
- ${PORT}:${PORT}
|
||||
- "${PORT}:${PORT}"
|
||||
depends_on:
|
||||
- postgres
|
||||
environment:
|
||||
|
|
Загрузка…
Ссылка в новой задаче