Skip to content

Fixes Failed Container Build not being Deleted #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArchieAtkinson merged 1 commit into from
Aug 30, 2025
Merged

Fixes Failed Container Build not being Deleted #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/docker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ pub enum DockerError {
#[diagnostic(code(cli::container::entering))]
EnteringContainer(String),

#[error("The following command return an error code:\n\n{cmd}\n\n")]
#[diagnostic(code(cli::container::command::exitcode), help("{stderr}"))]
CommandExitCode { cmd: String, stderr: String },
#[error("The following command return an error code:\n\n{cmd}\n\n{stdout}")]
#[diagnostic(code(cli::container::command::exitcode))]
CommandExitCode { cmd: String, stdout: String },

#[error("The following command failed due to an unknown signal:\n{0}")]
#[diagnostic(code(cli::container::command::killed))]
Expand Down Expand Up @@ -214,6 +214,8 @@ impl DockerHandler {
..Default::default()
};

Spinner::new("Removing Container");

self.docker
.remove_container(&self.env.name, Some(option))
.await
Expand Down Expand Up @@ -311,7 +313,7 @@ impl DockerHandler {
Some(0) => Ok(output),
Some(_) => Err(DockerError::CommandExitCode {
cmd: command,
stderr: String::from_utf8(output.stderr.clone()).unwrap(),
stdout: String::from_utf8(output.stdout.clone()).unwrap(),
}
.into()),
}
Expand Down
5 changes: 2 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ async fn main() -> Result<()> {
};

if let Err(command_error) = result {
if let Err(stop_error) = docker.stop_container_if_running().await {
return Err(command_error.wrap_err(stop_error));
}
docker.stop_container_if_running().await?;
docker.delete_container_if_exists().await?;
return Err(command_error);
}

Expand Down
13 changes: 3 additions & 10 deletions tests/docker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ fn badly_formed_dockerfile() -> Result<()> {
"#};
write!(&dockerfile, "{}", content).unwrap();

TestHarness::new()
TestOutput::new()
.config(&formatdoc!(
r#"
dockerfile = "{}"
Expand All @@ -409,15 +409,8 @@ fn badly_formed_dockerfile() -> Result<()> {
dockerfile.path().to_str().unwrap(),
))?
.args(vec!["--config-path", "[config_path]", "[name]"])?
.run(DEFAULT_TIMEOUT)?
// Can't test full output as we don't know the image name
.expect_string("Error: cli::container::command::exitcode")?
.expect_string("The following command return an error code:")?
.expect_string(indoc!(
r#"help: #0 building with "default" instance using docker driver"#
))?
.expect_terminate()?
.failure(1)?;
.stderr("Error: cli::container::command::exitcode")?
.code(1)?;

dockerfile.close().unwrap();
Ok(())
Expand Down