From d951d17b785cccf07386ab719b84400a8d9847a8 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 26 Feb 2024 15:27:56 +0100 Subject: [PATCH] fix: add HOME to pip install --- ...b84ee4d6c44132758a6ff14f76485b7b089db25d47.json | 14 -------------- ...999025f4a3e79c87fc1c5b43e787fd8e19c555b44b.json | 14 ++++++++++++++ ...98a5d3369afe534519bf48f61f88f60786db870c24.json | 2 +- backend/windmill-worker/src/python_executor.rs | 2 ++ backend/windmill-worker/src/worker.rs | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) delete mode 100644 backend/.sqlx/query-019edf515dbc2c04960b29b84ee4d6c44132758a6ff14f76485b7b089db25d47.json create mode 100644 backend/.sqlx/query-1e43e6040ac95b586d4d73999025f4a3e79c87fc1c5b43e787fd8e19c555b44b.json diff --git a/backend/.sqlx/query-019edf515dbc2c04960b29b84ee4d6c44132758a6ff14f76485b7b089db25d47.json b/backend/.sqlx/query-019edf515dbc2c04960b29b84ee4d6c44132758a6ff14f76485b7b089db25d47.json deleted file mode 100644 index 4b7036c985..0000000000 --- a/backend/.sqlx/query-019edf515dbc2c04960b29b84ee4d6c44132758a6ff14f76485b7b089db25d47.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "UPDATE queue\n SET last_ping = null\n WHERE id = $1", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Uuid" - ] - }, - "nullable": [] - }, - "hash": "019edf515dbc2c04960b29b84ee4d6c44132758a6ff14f76485b7b089db25d47" -} diff --git a/backend/.sqlx/query-1e43e6040ac95b586d4d73999025f4a3e79c87fc1c5b43e787fd8e19c555b44b.json b/backend/.sqlx/query-1e43e6040ac95b586d4d73999025f4a3e79c87fc1c5b43e787fd8e19c555b44b.json new file mode 100644 index 0000000000..b64ace475a --- /dev/null +++ b/backend/.sqlx/query-1e43e6040ac95b586d4d73999025f4a3e79c87fc1c5b43e787fd8e19c555b44b.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE queue\n SET last_ping = null\n WHERE id = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "1e43e6040ac95b586d4d73999025f4a3e79c87fc1c5b43e787fd8e19c555b44b" +} diff --git a/backend/.sqlx/query-7ab02d2c060ed12531e6af98a5d3369afe534519bf48f61f88f60786db870c24.json b/backend/.sqlx/query-7ab02d2c060ed12531e6af98a5d3369afe534519bf48f61f88f60786db870c24.json index 45ddd29b01..f20c2c1562 100644 --- a/backend/.sqlx/query-7ab02d2c060ed12531e6af98a5d3369afe534519bf48f61f88f60786db870c24.json +++ b/backend/.sqlx/query-7ab02d2c060ed12531e6af98a5d3369afe534519bf48f61f88f60786db870c24.json @@ -27,7 +27,7 @@ "nullable": [ false, false, - false + true ] }, "hash": "7ab02d2c060ed12531e6af98a5d3369afe534519bf48f61f88f60786db870c24" diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs index 658f7f0208..f7b73c3b1f 100644 --- a/backend/windmill-worker/src/python_executor.rs +++ b/backend/windmill-worker/src/python_executor.rs @@ -864,6 +864,8 @@ pub async fn handle_python_reqs( envs.push(("NO_PROXY", no_proxy)); } + envs.push(("HOME", HOME_ENV.as_str())); + tracing::debug!("pip install command: {:?}", command_args); let mut flock_cmd = Command::new(FLOCK_PATH.as_str()); diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index 1e53d61a0b..329b82f5a6 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -284,7 +284,7 @@ lazy_static::lazy_static! { pub static ref POWERSHELL_PATH: String = std::env::var("POWERSHELL_PATH").unwrap_or_else(|_| "/usr/bin/pwsh".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(|_| String::new()); + pub static ref HOME_ENV: String = std::env::var("HOME").unwrap_or_else(|_| String::new("/tmp")); 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();