Skip to content

fix: sidecar-install: include images in prune #112

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
queil merged 1 commit into from
Mar 12, 2026
+15 −4
Merged

fix: sidecar-install: include images in prune #112

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
19 changes: 15 additions & 4 deletions src/cmd/prune.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use crate::{api::Api, model::types::AnyError, util::labels::Labels};
use bollard::{
query_parameters::{ListContainersOptions, ListVolumesOptions, RemoveVolumeOptions},
service::ContainerSummary,
};

use crate::{api::Api, model::types::AnyError, util::labels::Labels};
use bollard_stubs::query_parameters::ListImagesOptions;

impl<'a> Api<'a> {
async fn prune(&self, filters: Labels, force: bool) -> Result<(), AnyError> {
Expand All @@ -18,11 +18,22 @@ impl<'a> Api<'a> {
.await?
{
if let ContainerSummary { id: Some(id), .. } = cs {
log::debug!("Force remove container: {}", &id);
log::debug!("Remove container: {}", &id);
self.container.remove(&id, force).await?
}
}

let ls_images_options = ListImagesOptions {
all: true,
filters: Some(filters.clone().into()),
..Default::default()
};

for img in self.client.list_images(Some(ls_images_options)).await? {
log::debug!("Remove image: {}", &img.id);
self.image.remove_local(&img.id, force).await?
}

let ls_vol_options = ListVolumesOptions {
filters: Some(filters.into()),
..Default::default()
Expand All @@ -40,7 +51,7 @@ impl<'a> Api<'a> {
};

for v in volumes {
log::debug!("Force remove volume: {}", &v.name);
log::debug!("Remove volume: {}", &v.name);
self.client
.remove_volume(&v.name, Some(rm_vol_options.clone()))
.await?
Expand Down
Loading