From ee78f3ff0aa8422baa28d53c2d6a03079ed39c5d Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 20 Mar 2026 09:28:50 +0000 Subject: [PATCH] Explicitly pass DOMAIN_SUFFIX and CADDY_API_URL to build script Environment inheritance from the server process was not reliably propagating these vars into the spawned bash subprocess. https://claude.ai/code/session_01FKCW3FDjNFj6jve4niMFXH --- server/src/builder.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/server/src/builder.rs b/server/src/builder.rs index ad27ffa..e9df54d 100644 --- a/server/src/builder.rs +++ b/server/src/builder.rs @@ -118,16 +118,21 @@ async fn run_build(state: &AppState, deploy_id: &str) -> anyhow::Result<()> { ) .await?; + let domain_suffix = std::env::var("DOMAIN_SUFFIX").unwrap_or_else(|_| "localhost".into()); + let caddy_api_url = std::env::var("CADDY_API_URL").unwrap_or_else(|_| "http://localhost:2019".into()); + let mut child = Command::new("bash") .arg(&build_script) - .env("APP_ID", &app.id) - .env("APP_NAME", &app.name) - .env("REPO_URL", &app.repo_url) - .env("BRANCH", &app.branch) - .env("PORT", app.port.to_string()) - .env("ENV_FILE", &env_file) - .env("SHA", deploy.sha.as_deref().unwrap_or("")) - .env("BUILD_DIR", &build_dir) + .env("APP_ID", &app.id) + .env("APP_NAME", &app.name) + .env("REPO_URL", &app.repo_url) + .env("BRANCH", &app.branch) + .env("PORT", app.port.to_string()) + .env("ENV_FILE", &env_file) + .env("SHA", deploy.sha.as_deref().unwrap_or("")) + .env("BUILD_DIR", &build_dir) + .env("DOMAIN_SUFFIX", &domain_suffix) + .env("CADDY_API_URL", &caddy_api_url) .stdout(std::process::Stdio::piped()) .stderr(std::process::Stdio::piped()) .spawn()