admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: refactor run_containers error handling (#1541)

Browse Source
This commit is contained in:
Gideon
2025-11-20 10:08:15 +01:00
committed by GitHub
parent 9d662e36a1
commit dfb8342d8b
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/steps/containers.rs
View File

@@ -11,7 +11,7 @@ use tracing::{debug, error, warn};
use wildmatch::WildMatch; use wildmatch::WildMatch;
use crate::command::CommandExt; use crate::command::CommandExt;
use crate::error::{self, SkipStep, TopgradeError}; use crate::error::{SkipStep, TopgradeError};
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::{execution_context::ExecutionContext, utils::require}; use crate::{execution_context::ExecutionContext, utils::require};
use rust_i18n::t; use rust_i18n::t;
@@ -185,7 +185,6 @@ pub fn run_containers(ctx: &ExecutionContext) -> Result<()> {
)); ));
} }
let mut success = true;
let containers = let containers =
list_containers(&crt, ctx.config().containers_ignored_tags()).context("Failed to list Docker containers")?; list_containers(&crt, ctx.config().containers_ignored_tags()).context("Failed to list Docker containers")?;
debug!("Containers to inspect: {:?}", containers); debug!("Containers to inspect: {:?}", containers);
@@ -220,29 +219,21 @@ pub fn run_containers(ctx: &ExecutionContext) -> Result<()> {
continue; continue;
} }
success = false; return Err(e);
} }
} }
if ctx.config().containers_system_prune() { if ctx.config().containers_system_prune() {
// Run system prune to clean up unused containers, networks, and build cache // Run system prune to clean up unused containers, networks, and build cache
if let Err(e) = ctx.execute(&crt).args(["system", "prune", "--force"]).status_checked() { ctx.execute(&crt)
error!("Running system prune failed: {}", e); .args(["system", "prune", "--force"])
success = false; .status_checked()?
}
// Only run `image prune` if we don't run `system prune` // Only run `image prune` if we don't run `system prune`
} else if ctx.config().cleanup() { } else if ctx.config().cleanup() {
// Remove dangling images // Remove dangling images
debug!("Removing dangling images"); debug!("Removing dangling images");
if let Err(e) = ctx.execute(&crt).args(["image", "prune", "-f"]).status_checked() { ctx.execute(&crt).args(["image", "prune", "-f"]).status_checked()?
error!("Removing dangling images failed: {}", e);
success = false;
}
} }
if success { Ok(())
Ok(())
} else {
Err(eyre!(error::StepFailed))
}
} }