Skip to content

Modern Docker Management, Designed for Everyone

fix: clear image update records by image ID not just repo/tag (#1809)

Kyle Mendell34c38256d693
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index 2a398b642..1278d87a1 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -331,11 +331,20 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, dryRun bool) (*update
if stillUsed {
continue
}
- repo, tag := s.parseRepoAndTag(p.oldRef)
- if repo == "" || tag == "" {
- continue
+
+ clearedAny := false
+ for _, oldID := range p.oldIDs {
+ if oldID == "" {
+ continue
+ }
+ if err := s.clearImageUpdateRecordByID(ctx, oldID); err != nil {
+ slog.WarnContext(ctx, "failed to clear update record by image id", "imageID", oldID, "image", p.oldRef, "err", err)
+ continue
+ }
+ clearedAny = true
}
- if err := s.clearImageUpdateRecord(ctx, repo, tag); err == nil {
+
+ if clearedAny {
s.logAutoUpdate(ctx, models.EventSeverityInfo, models.JSON{
"phase": "record_clear",
"imageOld": p.oldRef,
@@ -556,8 +565,19 @@ func (s *UpdaterService) UpdateSingleContainer(ctx context.Context, containerID
})
out.Updated++
- // Clear the update record for this image
- if err := s.clearImageUpdateRecord(ctx, repo, tag); err != nil {
+ // Clear the update record for this exact image ID when no running container still uses it.
+ // This avoids repo-name canonicalization mismatches (e.g. "nginx" vs "docker.io/library/nginx").
+ if inspectBefore.Image != "" {
+ stillUsed, usageErr := s.anyImageIDsStillInUse(ctx, []string{inspectBefore.Image})
+ if usageErr != nil {
+ slog.WarnContext(ctx, "failed to check image usage before clearing update record", "imageID", inspectBefore.Image, "err", usageErr)
+ } else if !stillUsed {
+ if err := s.clearImageUpdateRecordByID(ctx, inspectBefore.Image); err != nil {
+ slog.WarnContext(ctx, "failed to clear update record by image id", "imageID", inspectBefore.Image, "err", err)
+ }
+ }
+ } else if err := s.clearImageUpdateRecord(ctx, repo, tag); err != nil {
+ // Fallback for unexpected cases where the old image ID is unavailable.
slog.WarnContext(ctx, "failed to clear update record", "repo", repo, "tag", tag, "err", err)
}
}
@@ -1391,6 +1411,13 @@ func (s *UpdaterService) clearImageUpdateRecord(ctx context.Context, repository,
Update("has_update", false).Error
}
+func (s *UpdaterService) clearImageUpdateRecordByID(ctx context.Context, imageID string) error {
+ return s.db.WithContext(ctx).
+ Model(&models.ImageUpdateRecord{}).
+ Where("id = ?", imageID).
+ Update("has_update", false).Error
+}
+
// parseRepoAndTag extracts repository and tag from a reference like "registry/repo:tag".
// Uses the last ":" occurring after the last "/" as the tag separator. Defaults tag to "latest".
func (s *UpdaterService) parseRepoAndTag(ref string) (string, string) {
diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.go
index 087a56ea0..2f7aeba0f 100644
--- a/backend/internal/services/updater_service_test.go
+++ b/backend/internal/services/updater_service_test.go
@@ -4,10 +4,14 @@ import (
"context"
"errors"
"testing"
+ "time"
"github.com/docker/docker/api/types/container"
+ "github.com/getarcaneapp/arcane/backend/internal/database"
+ glsqlite "github.com/glebarez/sqlite"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "gorm.io/gorm"
"github.com/getarcaneapp/arcane/backend/internal/models"
"github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater"
@@ -272,3 +276,44 @@ func TestCollectUsedImagesFromContainers_FastPathSkipsInspectLikeRefs(t *testing
assert.Contains(t, out, svc.normalizeRef("redis:7"))
assert.NotContains(t, out, svc.normalizeRef("sha256:abcdef"))
}
+
+func setupUpdaterServiceTestDB(t *testing.T) *database.DB {
+ t.Helper()
+
+ db, err := gorm.Open(glsqlite.Open(":memory:"), &gorm.Config{})
+ require.NoError(t, err)
+ require.NoError(t, db.AutoMigrate(&models.ImageUpdateRecord{}))
+
+ return &database.DB{DB: db}
+}
+
+func TestUpdaterService_ClearImageUpdateRecordByID_AvoidsRepoCanonicalMismatch(t *testing.T) {
+ ctx := context.Background()
+ db := setupUpdaterServiceTestDB(t)
+
+ record := models.ImageUpdateRecord{
+ ID: "sha256:old-image",
+ Repository: "nginx",
+ Tag: "latest",
+ HasUpdate: true,
+ UpdateType: models.UpdateTypeDigest,
+ CurrentVersion: "latest",
+ CheckTime: time.Now(),
+ }
+ require.NoError(t, db.WithContext(ctx).Create(&record).Error)
+
+ svc := &UpdaterService{db: db}
+
+ // Simulate the previous clear path that used normalized repo/tag.
+ require.NoError(t, svc.clearImageUpdateRecord(ctx, "docker.io/library/nginx", "latest"))
+
+ var unchanged models.ImageUpdateRecord
+ require.NoError(t, db.WithContext(ctx).Where("id = ?", record.ID).First(&unchanged).Error)
+ assert.True(t, unchanged.HasUpdate, "repo/tag clear should not match when repository canonicalization differs")
+
+ require.NoError(t, svc.clearImageUpdateRecordByID(ctx, record.ID))
+
+ var cleared models.ImageUpdateRecord
+ require.NoError(t, db.WithContext(ctx).Where("id = ?", record.ID).First(&cleared).Error)
+ assert.False(t, cleared.HasUpdate, "clear by image ID should always match the intended record")
+}