Switch to Node 16 by default (#19751)
* Switch to Node 16 by default * Fix python image tag to include node
This commit is contained in:
Родитель
86889fa914
Коммит
e906a7f6bf
|
@ -5,12 +5,6 @@
|
|||
# DOCKER_PASS - Login password for docker hub user
|
||||
version: 2.1
|
||||
|
||||
orbs:
|
||||
# This is needed to be able to install Node.js 14 in the primary container,
|
||||
# which provides python only (the convenience cimg/python:3.9-node provides
|
||||
# node 16).
|
||||
node: circleci/node@5.0.0
|
||||
|
||||
references:
|
||||
# We declare the autograph configuration here to be able to fully leverage
|
||||
# Docker executors. This configuration should be kept in sync with the
|
||||
|
@ -283,7 +277,9 @@ references:
|
|||
|
||||
docker-images:
|
||||
# These versions should try to match what we run in production.
|
||||
- &python "cimg/python:3.10"
|
||||
# Note that the cimg/python:3.10-node convenience image provides
|
||||
# nodejs 16.x, which we need to build assets and run the linter.
|
||||
- &python "cimg/python:3.10-node"
|
||||
- &redis "redis:6.2"
|
||||
- &memcached "memcached:1.4"
|
||||
- &mysql "mysql:8.0.28"
|
||||
|
@ -477,8 +473,6 @@ commands:
|
|||
sudo apt-get install -y gettext pngcrush librsvg2-bin libmysqlclient-dev
|
||||
sudo cp ./docker/etc/mime.types /etc/mime.types
|
||||
sudo touch /addons-server-docker-container
|
||||
- node/install:
|
||||
node-version: '14'
|
||||
- run:
|
||||
name: Install dockerize
|
||||
command: |
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
deb https://deb.nodesource.com/node_14.x buster main
|
||||
deb-src https://deb.nodesource.com/node_14.x buster main
|
||||
deb https://deb.nodesource.com/node_16.x buster main
|
||||
deb-src https://deb.nodesource.com/node_16.x buster main
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"version": "0.0.17",
|
||||
"private": true,
|
||||
"engines": {
|
||||
"node": ">= 10.13"
|
||||
"node": ">= 16.17"
|
||||
},
|
||||
"dependencies": {
|
||||
"@claviska/jquery-minicolors": "2.3.6",
|
||||
|
|
Загрузка…
Ссылка в новой задаче