Skip to content

Fix progress bar crash on cached image rebuilds #894

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
realrajaryan merged 1 commit into from
Nov 17, 2025
Merged

Fix progress bar crash on cached image rebuilds #894

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
6 changes: 2 additions & 4 deletions Sources/ContainerBuild/BuildImageResolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,8 @@ struct BuildImageResolver: BuildPipelineHandler {
defer { progress.finish() }
progress.start()

guard let img = try? await ClientImage.pull(reference: ref, platform: platform, progressUpdate: progress.handler) else {
return try await ClientImage.fetch(reference: ref, platform: platform, progressUpdate: progress.handler)
}
return img
// Use fetch() which checks cache first, then pulls if needed
return try await ClientImage.fetch(reference: ref, platform: platform, progressUpdate: progress.handler)
Copy link
Contributor

@jglogan jglogan Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetch() only retrieves the manifest if needed, doesn't it?

I don't see how this actually pulls content. The code before the original progress bar changed looked like:

           guard let img = try? await ClientImage.pull(reference: ref, platform: platform) else {
                return try await ClientImage.fetch(reference: ref, platform: platform)

Copy link
Contributor Author

@realrajaryan realrajaryan Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original code was backwards. fetch() tries to get the image from the local cache first, and if not found, it calls pull().

}()

let index: Index = try await img.index()
Expand Down