handle multiple image tags having the same hash and increase timeout (#1844)

This commit is contained in:
Aiden McClelland
2022-09-29 09:52:04 -06:00
committed by GitHub
parent f37cfda365
commit 71b19e6582
2 changed files with 17 additions and 5 deletions

View File

@@ -119,10 +119,20 @@ pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Res
.await
.apply(|res| errors.handle(res));
errors.extend(
futures::future::join_all(images.into_iter().flatten().map(|image| async {
let image = image; // move into future
ctx.docker.remove_image(&image.id, None, None).await
}))
futures::future::join_all(
images
.into_iter()
.flatten()
.flat_map(|image| image.repo_tags)
.filter(|tag| {
tag.starts_with(&format!("start9/{}/", id))
&& tag.ends_with(&format!(":{}", version))
})
.map(|tag| async {
let tag = tag; // move into future
ctx.docker.remove_image(&tag, None, None).await
}),
)
.await,
);
let pkg_archive_dir = ctx