diff options
| -rw-r--r-- | doc/dev/developer_guide/dash-devel.rst | 4 | ||||
| -rwxr-xr-x | make-dist | 2 | ||||
| -rw-r--r-- | src/pybind/mgr/dashboard/frontend/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/dev/developer_guide/dash-devel.rst b/doc/dev/developer_guide/dash-devel.rst index cc158d7a3fc..262aa091f91 100644 --- a/doc/dev/developer_guide/dash-devel.rst +++ b/doc/dev/developer_guide/dash-devel.rst @@ -215,8 +215,8 @@ The build process is based on `Node.js <https://nodejs.org/>`_ and requires the Prerequisites ~~~~~~~~~~~~~ - * Node 12.18.2 or higher - * NPM 6.13.4 or higher + * Node 14.15.0 or higher + * NPM 6.14.9 or higher nodeenv: During Ceph's build we create a virtualenv with ``node`` and ``npm`` diff --git a/make-dist b/make-dist index 2fe9c8d3e4a..f2626871534 100755 --- a/make-dist +++ b/make-dist @@ -132,7 +132,7 @@ build_dashboard_frontend() { $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR $TEMP_DIR/bin/pip install nodeenv - $TEMP_DIR/bin/nodeenv --verbose -p --node=12.18.2 + $TEMP_DIR/bin/nodeenv --verbose -p --node=14.15.1 cd src/pybind/mgr/dashboard/frontend . $TEMP_DIR/bin/activate diff --git a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt index f92c34791c0..f34cde6fb61 100644 --- a/src/pybind/mgr/dashboard/frontend/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/frontend/CMakeLists.txt @@ -63,7 +63,7 @@ else(WITH_SYSTEM_NPM) OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm" COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir} COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv - COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=12.18.2 + COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv --verbose ${node_mirror_opt} -p --node=14.15.1 COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "dashboard nodeenv is being installed") |