GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

Fix LXD socket handling in container mode
All checks were successful
BotServer CI / build (push) Successful in 11m6s
Details

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-03-15 18:58:21 -03:00
parent bf5ee0bef2
commit ba53a0c178
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core/package_manager/facade.rs
View file

@ -12,11 +12,7 @@ use std::collections::HashMap;
use std::fmt::Write as FmtWrite; use std::fmt::Write as FmtWrite;
use std::path::PathBuf; use std::path::PathBuf;
fn safe_lxc(args: &[&str]) -> Option<std::process::Output> { fn safe_lxc(args: &[&str]) -> Option<std::process::Output> {
let mut cmd_res = SafeCommand::new("lxc").and_then(|c| c.args(args)); let cmd_res = SafeCommand::new("lxc").and_then(|c| c.args(args));
if std::path::Path::new("/tmp/lxd.sock").exists() {
cmd_res = cmd_res.and_then(|c| c.env("LXD_SOCKET", "/tmp/lxd.sock"));
}
match cmd_res { match cmd_res {
Ok(cmd) => match cmd.execute() { Ok(cmd) => match cmd.execute() {
@ -34,11 +30,7 @@ fn safe_lxc(args: &[&str]) -> Option<std::process::Output> {
} }
fn safe_lxd(args: &[&str]) -> Option<std::process::Output> { fn safe_lxd(args: &[&str]) -> Option<std::process::Output> {
let mut cmd_res = SafeCommand::new("lxd").and_then(|c| c.args(args)); let cmd_res = SafeCommand::new("lxd").and_then(|c| c.args(args));
if std::path::Path::new("/tmp/lxd.sock").exists() {
cmd_res = cmd_res.and_then(|c| c.env("LXD_SOCKET", "/tmp/lxd.sock"));
}
cmd_res.ok().and_then(|cmd| cmd.execute().ok()) cmd_res.ok().and_then(|cmd| cmd.execute().ok())
} }
@ -1099,18 +1091,12 @@ Store credentials in Vault:
.replace("{{DB_PASSWORD}}", &db_password); .replace("{{DB_PASSWORD}}", &db_password);
if target == "local" { if target == "local" {
trace!("Executing command: {}", rendered_cmd); trace!("Executing command: {}", rendered_cmd);
let mut cmd = SafeCommand::new("bash") let cmd = SafeCommand::new("bash")
.and_then(|c| c.arg("-c")) .and_then(|c| c.arg("-c"))
.and_then(|c| c.trusted_shell_script_arg(&rendered_cmd)) .and_then(|c| c.trusted_shell_script_arg(&rendered_cmd))
.and_then(|c| c.working_dir(&bin_path)) .and_then(|c| c.working_dir(&bin_path))
.map_err(|e| anyhow::anyhow!("Failed to build bash command: {}", e))?; .map_err(|e| anyhow::anyhow!("Failed to build bash command: {}", e))?;
if std::path::Path::new("/tmp/lxd.sock").exists() {
cmd = cmd
.env("LXD_SOCKET", "/tmp/lxd.sock")
.map_err(|e| anyhow::anyhow!("Failed to set env: {}", e))?;
}
let output = cmd.execute().with_context(|| { let output = cmd.execute().with_context(|| {
format!("Failed to execute command for component '{}'", component) format!("Failed to execute command for component '{}'", component)
})?; })?;