]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Fix dashboard languages make configuration 35276/head
authorTiago Melo <tmelo@suse.com>
Wed, 27 May 2020 12:51:04 +0000 (12:51 +0000)
committerTiago Melo <tmelo@suse.com>
Wed, 27 May 2020 13:07:08 +0000 (13:07 +0000)
We have to manually pass DASHBOARD_FRONTEND_LANGS to the build command of the
dashboard.

This was a regression introduced in 1a6a8381a55e59a3c5e6b7fbc6c525f0cac2b854.

Fixes: https://tracker.ceph.com/issues/45720
Signed-off-by: Tiago Melo <tmelo@suse.com>
src/pybind/mgr/dashboard/CMakeLists.txt

index 1861d3c738f29b1aaab52e3a18896174040dbadd..e94817d4fa1385c216cbdd0028dcef51c7769786 100644 (file)
@@ -92,7 +92,7 @@ endif()
 
 add_npm_command(
   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
-  COMMAND npm run build:localize -- ${npm_args}
+  COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" npm run build:localize -- ${npm_args}
   DEPENDS ${frontend_src} frontend/node_modules
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
   COMMENT "dashboard frontend is being created"