From: Ken Dreyer <kdreyer@redhat.com>
Date: Mon, 28 Sep 2020 23:25:48 +0000 (-0600)
Subject: mgr/dashboard: build with NodeJS 12.18.2
X-Git-Tag: v16.1.0~948^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3986ad5e362a1da09998a2dba50471341314a8c8;p=ceph.git

mgr/dashboard: build with NodeJS 12.18.2

Update the version of NodeJS that we use to build the dashboard.

RHEL 8 and CentOS 8 ship NodeJS 12.18.2, so I've picked this version to
make it easier to build outside of nodeenv.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/make-dist b/make-dist
index f73dcab20ed8..2904e63a9150 100755
--- a/make-dist
+++ b/make-dist
@@ -74,7 +74,7 @@ build_dashboard_frontend() {
 
   $CURR_DIR/src/tools/setup-virtualenv.sh $TEMP_DIR
   $TEMP_DIR/bin/pip install nodeenv
-  $TEMP_DIR/bin/nodeenv -p --node=12.16.2
+  $TEMP_DIR/bin/nodeenv -p --node=12.18.2
   cd src/pybind/mgr/dashboard/frontend
 
   . $TEMP_DIR/bin/activate
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index b0784611c508..d054bea9d4ef 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -34,7 +34,7 @@ else()
     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 -p --node=12.16.2
+    COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=12.18.2
     COMMAND mkdir ${mgr-dashboard-nodeenv-dir}/.npm
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "dashboard nodeenv is being installed"