starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-07 08:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: support NODE_PATH

Browse Source
This commit is contained in:
Ruben Fiszel
2024-08-12 19:56:27 +02:00
parent 36129fb470
commit 3c4b8377ed
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/bun_executor.rs
+12 -7
View File
@@ -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<String, String> {
let bun_envs: HashMap<String, String> = HashMap::from([
let mut bun_envs: HashMap<String, String> = 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<String
BUN_CACHE_DIR.to_string(),
),
]);
if let Some(ref node_path) = NODE_PATH.as_ref() {
bun_envs.insert(String::from("NODE_PATH"), node_path.to_string());
}
return bun_envs;
}
@@ -1507,7 +1512,7 @@ for await (const line of Readline.createInterface({{ input: process.stdin }})) {
let script_path = format!("{job_dir}/wrapper.mjs");
handle_dedicated_process(
&*NODE_PATH,
&*NODE_BIN_PATH,
job_dir,
context_envs,
envs,
backend/windmill-worker/src/worker.rs
+3 -1
View File
@@ -317,13 +317,15 @@ lazy_static::lazy_static! {
pub static ref DENO_PATH: String = std::env::var("DENO_PATH").unwrap_or_else(|_| "/usr/bin/deno".to_string());
pub static ref BUN_PATH: String = std::env::var("BUN_PATH").unwrap_or_else(|_| "/usr/bin/bun".to_string());
pub static ref NPM_PATH: String = std::env::var("NPM_PATH").unwrap_or_else(|_| "/usr/bin/npm".to_string());
pub static ref NODE_PATH: String = std::env::var("NODE_PATH").unwrap_or_else(|_| "/usr/bin/node".to_string());
pub static ref NODE_BIN_PATH: String = std::env::var("NODE_BIN_PATH").unwrap_or_else(|_| "/usr/bin/node".to_string());
pub static ref POWERSHELL_PATH: String = std::env::var("POWERSHELL_PATH").unwrap_or_else(|_| "/usr/bin/pwsh".to_string());
pub static ref PHP_PATH: String = std::env::var("PHP_PATH").unwrap_or_else(|_| "/usr/bin/php".to_string());
pub static ref COMPOSER_PATH: String = std::env::var("COMPOSER_PATH").unwrap_or_else(|_| "/usr/bin/composer".to_string());
pub static ref NSJAIL_PATH: String = std::env::var("NSJAIL_PATH").unwrap_or_else(|_| "nsjail".to_string());
pub static ref PATH_ENV: String = std::env::var("PATH").unwrap_or_else(|_| String::new());
pub static ref HOME_ENV: String = std::env::var("HOME").unwrap_or_else(|_| "/tmp".to_string());
pub static ref NODE_PATH: Option<String> = 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<String> = std::env::var("GOPRIVATE").ok();
pub static ref GOPROXY: Option<String> = std::env::var("GOPROXY").ok();