diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs index 9f665e1009..a1bc2ed299 100644 --- a/backend/windmill-worker/src/bun_executor.rs +++ b/backend/windmill-worker/src/bun_executor.rs @@ -18,8 +18,8 @@ use crate::{ write_file_binary, }, AuthedClientBackgroundTask, BUNFIG_INSTALL_SCOPES, BUN_BUNDLE_CACHE_DIR, BUN_CACHE_DIR, - BUN_DEPSTAR_CACHE_DIR, BUN_PATH, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NODE_PATH, - NPM_CONFIG_REGISTRY, NPM_PATH, NSJAIL_PATH, PATH_ENV, TZ_ENV, + BUN_DEPSTAR_CACHE_DIR, BUN_PATH, DISABLE_NSJAIL, DISABLE_NUSER, HOME_ENV, NODE_BIN_PATH, + NODE_PATH, NPM_CONFIG_REGISTRY, NPM_PATH, NSJAIL_PATH, PATH_ENV, TZ_ENV, }; use tokio::{fs::File, process::Command}; @@ -1165,7 +1165,7 @@ try {{ "--config", "run.config.proto", "--", - &NODE_PATH, + &NODE_BIN_PATH, "/tmp/nodejs/wrapper.mjs", ] } else if codebase.is_some() || has_bundle_cache { @@ -1207,7 +1207,7 @@ try {{ let cmd = if annotation.nodejs_mode { let script_path = format!("{job_dir}/wrapper.mjs"); - let mut bun_cmd = Command::new(&*NODE_PATH); + let mut bun_cmd = Command::new(&*NODE_BIN_PATH); bun_cmd .current_dir(job_dir) .env_clear() @@ -1248,7 +1248,7 @@ try {{ start_child_process( cmd, if annotation.nodejs_mode { - &*NODE_PATH + &*NODE_BIN_PATH } else { &*BUN_PATH }, @@ -1274,7 +1274,7 @@ try {{ } pub async fn get_common_bun_proc_envs(base_internal_url: &str) -> HashMap { - let bun_envs: HashMap = HashMap::from([ + let mut bun_envs: HashMap = HashMap::from([ (String::from("PATH"), PATH_ENV.clone()), (String::from("HOME"), HOME_ENV.clone()), (String::from("TZ"), TZ_ENV.clone()), @@ -1291,6 +1291,11 @@ pub async fn get_common_bun_proc_envs(base_internal_url: &str) -> HashMap = std::env::var("NODE_PATH").ok(); + pub static ref TZ_ENV: String = std::env::var("TZ").unwrap_or_else(|_| String::new()); pub static ref GOPRIVATE: Option = std::env::var("GOPRIVATE").ok(); pub static ref GOPROXY: Option = std::env::var("GOPROXY").ok();