Skip to content

Modern Docker Management, Designed for Everyone

fix: preserve tag when saving update records for tag@digest-pinned images (#3242)

Panos Koutsovasilis45b2da93c1b7
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.go
index 5abcd88a5..64f65d0a0 100644
--- a/backend/internal/services/image_update_service.go
+++ b/backend/internal/services/image_update_service.go
@@ -647,6 +647,7 @@ func (s *ImageUpdateService) inspectLocalImageSnapshotInternal(ctx context.Conte
}
repo, tag := extractRepoAndTagFromImage(inspectResponse.InspectResponse)
+ tag = tagWithFallbackInternal(tag, s.parseImageReference(imageRef))
return &localImageSnapshot{
ImageID: inspectResponse.ID,
@@ -682,7 +683,7 @@ func (s *ImageUpdateService) CheckImageUpdateByID(ctx context.Context, imageID s
if err != nil {
return nil, err
}
- if saveErr := s.saveUpdateResultByIDInternal(ctx, imageID, result); saveErr != nil {
+ if saveErr := s.saveUpdateResultByIDInternal(ctx, imageID, result, s.parseImageReference(imageRef)); saveErr != nil {
slog.WarnContext(ctx, "Failed to save update result by ID", "imageID", imageID, "error", saveErr.Error())
}
return result, nil
@@ -712,7 +713,7 @@ func (s *ImageUpdateService) saveUpdateResultWithSnapshotInternal(ctx context.Co
return s.savePreparedUpdateResultInternal(ctx, syntheticID, repository, parts.Tag, result)
}
- return s.saveUpdateResultByIDInternal(ctx, imageID, result)
+ return s.saveUpdateResultByIDInternal(ctx, imageID, result, parts)
}
func buildImageUpdateRepositoryInternal(parts *ImageParts) string {
@@ -900,7 +901,7 @@ func savePreparedUpdateResultWithTxInternal(tx *gorm.DB, imageID, repo, tag stri
return tx.Save(updateRecord).Error
}
-func (s *ImageUpdateService) saveUpdateResultByIDInternal(ctx context.Context, imageID string, result *imageupdate.Response) error {
+func (s *ImageUpdateService) saveUpdateResultByIDInternal(ctx context.Context, imageID string, result *imageupdate.Response, fallback *ImageParts) error {
dockerClient, err := s.dockerClientInternal(ctx)
if err != nil {
return err
@@ -915,9 +916,17 @@ func (s *ImageUpdateService) saveUpdateResultByIDInternal(ctx context.Context, i
}
repo, tag := extractRepoAndTagFromImage(dockerImage.InspectResponse)
+ tag = tagWithFallbackInternal(tag, fallback)
return s.savePreparedUpdateResultInternal(ctx, imageID, repo, tag, result)
}
+func tagWithFallbackInternal(tag string, fallback *ImageParts) string {
+ if tag == "<none>" && fallback != nil && strings.TrimSpace(fallback.Tag) != "" {
+ return fallback.Tag
+ }
+ return tag
+}
+
func (s *ImageUpdateService) savePreparedUpdateResultInternal(ctx context.Context, imageID, repo, tag string, result *imageupdate.Response) error {
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
return savePreparedUpdateResultWithTxInternal(tx, imageID, repo, tag, result)
diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.go
index fb72dfd51..c9df557b9 100644
--- a/backend/internal/services/image_update_service_test.go
+++ b/backend/internal/services/image_update_service_test.go
@@ -574,6 +574,49 @@ func TestImageUpdateService_CheckMultipleImages_SkippedDigestPinnedReferenceClea
assert.Equal(t, pinnedDigest, stringPtrToString(saved.LatestDigest))
}
+func TestImageUpdateService_CheckMultipleImages_DigestPinnedTagPreservedWhenLocalImageHasNoRepoTags(t *testing.T) {
+ db := setupImageUpdateTestDB(t)
+ pinnedDigest := digest.FromString("valkey-pinned").String()
+
+ server := newImageUpdateNoRepoTagsServer(t, "sha256:pinned-local-id", pinnedDigest)
+ defer server.Close()
+
+ serverURL, err := url.Parse(server.URL)
+ require.NoError(t, err)
+ repository := serverURL.Host + "/valkey/valkey"
+ imageRef := repository + ":9@" + pinnedDigest
+
+ dockerService := &DockerClientService{client: newTestDockerClient(t, server)}
+ svc := NewImageUpdateService(db, nil, nil, dockerService, nil, nil, nil)
+
+ results, err := svc.CheckMultipleImages(context.Background(), []string{imageRef}, nil)
+ require.NoError(t, err)
+ require.Contains(t, results, imageRef)
+ assert.False(t, results[imageRef].HasUpdate)
+ assert.Empty(t, results[imageRef].Error)
+
+ var saved models.ImageUpdateRecord
+ require.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:pinned-local-id").First(&saved).Error)
+ assert.Equal(t, "9", saved.Tag, "tag should come from the original tag@digest reference, not fall back to the RepoDigests-only placeholder")
+}
+
+func newImageUpdateNoRepoTagsServer(t *testing.T, imageID, localDigest string) *httptest.Server {
+ t.Helper()
+
+ return httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ if strings.Contains(r.URL.Path, "/images/") && strings.HasSuffix(r.URL.Path, "/json") {
+ w.Header().Set("Content-Type", "application/json")
+ require.NoError(t, json.NewEncoder(w).Encode(dockertypesimage.InspectResponse{
+ ID: imageID,
+ RepoTags: []string{},
+ RepoDigests: []string{r.Host + "/valkey/valkey@" + localDigest},
+ }))
+ return
+ }
+ http.NotFound(w, r)
+ }))
+}
+
func TestImageUpdateService_CheckImageUpdate_UsesRegistryFallback(t *testing.T) {
db := setupImageUpdateTestDB(t)
localDigest := digest.FromString("localdigest").String()