diff --git a/lib/apps/fabro-server/src/server.rs b/lib/apps/fabro-server/src/server.rs index 512291d5f..aaa4a3afc 100644 --- a/lib/apps/fabro-server/src/server.rs +++ b/lib/apps/fabro-server/src/server.rs @@ -151,7 +151,7 @@ use crate::sandbox_access::{ SandboxInventory, }; use crate::server_secrets::ServerSecrets; -use crate::spawn_env::apply_render_graph_env; +use crate::spawn_env::{SandboxConnectionEnv, apply_render_graph_env}; use crate::worker_control::{ LocalWorkerControlBus, WORKER_CONTROL_ACK_WAIT, WorkerControlAcks, WorkerControlBus, WorkerControlBusError, @@ -3957,7 +3957,7 @@ fn worker_launch_spec( active_config_path: state.active_config_path().to_path_buf(), github_app_private_key, fabro_home: fabro_config::Home::from_env().root().to_path_buf(), - sandbox_connection_env: crate::spawn_env::SandboxConnectionEnv::from_lookup(|name| { + sandbox_connection_env: SandboxConnectionEnv::from_lookup(|name| { state.config_env_lookup(name) }), }) diff --git a/lib/apps/fabro-server/src/worker_runtime.rs b/lib/apps/fabro-server/src/worker_runtime.rs index aadc79023..bf02f398e 100644 --- a/lib/apps/fabro-server/src/worker_runtime.rs +++ b/lib/apps/fabro-server/src/worker_runtime.rs @@ -12,7 +12,7 @@ use futures_util::future::BoxFuture; use tokio::io::AsyncRead; use tokio::process::Command; -use crate::spawn_env::{SandboxConnectionEnv, apply_worker_env}; +use crate::spawn_env::{self, SandboxConnectionEnv}; #[async_trait] pub(crate) trait WorkerRuntime: Send + Sync { @@ -114,7 +114,7 @@ impl LocalWorkerRuntime { .stdout(worker_stdout) .stderr(Stdio::piped()); - apply_worker_env(&mut cmd); + spawn_env::apply_worker_env(&mut cmd); spec.sandbox_connection_env.apply(&mut cmd); if let Some(level) = spec.fabro_log.as_deref() { cmd.env(EnvVars::FABRO_LOG, level);