Skip to content

Commit c3527c7

Browse files
committed
Fix custom image metadata and readiness check bugs
- Only set imageRef to req.ImageName after ImportLocalImage succeeds, so metadata never references a custom image that failed to be created. - Pass repo:tag (not just repo) to waitForImageReady for re-tagged images, so non-latest tags are correctly checked for readiness.
1 parent e64a0d4 commit c3527c7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/builds/manager.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,14 +622,15 @@ func (m *manager) runBuild(ctx context.Context, id string, req CreateBuildReques
622622
if tag == "" {
623623
tag = "latest"
624624
}
625-
imageRef = req.ImageName
626625
if _, err := m.imageManager.ImportLocalImage(buildCtx, repo, tag, result.ImageDigest); err != nil {
627626
m.logger.Warn("failed to re-tag image", "build_id", id, "image_name", req.ImageName, "error", err)
628627
// Don't fail the build - the image is still accessible via builds/{id}
629628
} else {
630629
m.logger.Info("re-tagged build image", "build_id", id, "from", buildRepo, "to", repo)
630+
imageRef = req.ImageName
631631
// Wait for the re-tagged image to be ready
632-
if err := m.waitForImageReady(buildCtx, repo); err != nil {
632+
retaggedRef := repo + ":" + tag
633+
if err := m.waitForImageReady(buildCtx, retaggedRef); err != nil {
633634
m.logger.Warn("re-tagged image conversion timed out", "build_id", id, "image_name", req.ImageName, "error", err)
634635
}
635636
}

0 commit comments

Comments
 (0)