From c3ce44e20209e9697452f4e2c68a5fafb9e781e2 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Mon, 28 Nov 2022 13:56:21 -0700 Subject: [PATCH] force docker image removal (#1985) --- backend/src/install/cleanup.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/src/install/cleanup.rs b/backend/src/install/cleanup.rs index a54ef1227..65de230fb 100644 --- a/backend/src/install/cleanup.rs +++ b/backend/src/install/cleanup.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::path::PathBuf; use std::sync::Arc; -use bollard::image::ListImagesOptions; +use bollard::image::{ListImagesOptions, RemoveImageOptions}; use patch_db::{DbHandle, LockReceipt, LockTargetId, LockType, PatchDbHandle, Verifier}; use sqlx::{Executor, Postgres}; use tracing::instrument; @@ -132,7 +132,16 @@ pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Res }) .map(|tag| async { let tag = tag; // move into future - ctx.docker.remove_image(&tag, None, None).await + ctx.docker + .remove_image( + &tag, + Some(RemoveImageOptions { + force: true, + noprune: false, + }), + None, + ) + .await }), ) .await,