make it compatible

Signed-off-by: Bugen Zhao <[email protected]>
risingwavelabs · Mar 13, 2024 · 8978730 · 8978730
1 parent f5d2177
commit 8978730
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 101 deletions.
diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh
@@ -39,6 +39,8 @@ source "$HOME/.cargo/env"
 rustup show
 source ci/scripts/common.sh
 unset RUSTC_WRAPPER # disable sccache
+# TODO: uncomment this line to use embedded dashboard in release build
+# unset RISINGWAVE_CI # disable ci mode, this is critical for building and embedding the dashboard assets
 
 echo "--- Install protoc3"
 PROTOC_ARCH=${ARCH}

diff --git a/src/meta/src/dashboard/mod.rs b/src/meta/src/dashboard/mod.rs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 mod prometheus;
-mod proxy;
 
 use std::collections::HashMap;
 use std::net::SocketAddr;
@@ -416,7 +415,14 @@ impl DashboardService {
             .layer(cors_layer);
 
         let trace_ui_router = otlp_embedded::ui_app(srv.trace_state.clone(), "/trace/");
-        let dashboard_router = risingwave_meta_dashboard::router();
+        let dashboard_router = if let Some(ui_path) = ui_path {
+            // TODO(bugen): remove `ui_path`
+            get_service(ServeDir::new(ui_path))
+                .handle_error(|e| async move { match e {} })
+                .boxed_clone()
+        } else {
+            risingwave_meta_dashboard::router().boxed_clone()
+        };
 
         let app = Router::new()
             .fallback_service(dashboard_router)

diff --git a/src/meta/src/dashboard/proxy.rs b/src/meta/src/dashboard/proxy.rs