Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: don't clear real image records when marking ref-aliases up to date (#2474)
Giulio Savinif40f8d86d5a3
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.goindex b7564824c..984d6c7c1 100644--- a/backend/internal/services/image_update_service.go+++ b/backend/internal/services/image_update_service.go@@ -680,8 +680,11 @@ func (s *ImageUpdateService) MarkImageRefUpToDateAfterPull(ctx context.Context,if hasLookup {repositories := repositoryCandidatesSliceInternal(lookup.repositoryCandidates)if len(repositories) > 0 {+ // Only clear synthetic ref:: records, not real sha256 image ID records.+ // Clearing sha256 records would incorrectly mark containers that are still+ // running the old image as up-to-date (see: #2453).if err := tx.Model(&models.ImageUpdateRecord{}).- Where("tag = ? AND repository IN ?", lookup.tag, repositories).+ Where("id LIKE 'ref::%' AND tag = ? AND repository IN ?", lookup.tag, repositories).Update("has_update", false).Error; err != nil {return fmt.Errorf("clear stale image updates: %w", err)}diff --git a/backend/internal/services/image_update_service_test.go b/backend/internal/services/image_update_service_test.goindex 3727431c3..9bd57e4b2 100644--- a/backend/internal/services/image_update_service_test.go+++ b/backend/internal/services/image_update_service_test.go@@ -674,6 +674,8 @@ func TestImageUpdateService_MarkImageRefUpToDateAfterPull_ClearsMatchingRecordsArepository := serverURL.Host + "/team/app"now := time.Now().UTC().Add(-time.Hour)++ // Real sha256 records for OTHER containers running the old image — must not be cleared.require.NoError(t, db.Create(&models.ImageUpdateRecord{ID: "sha256:old-full",Repository: repository,@@ -693,18 +695,37 @@ func TestImageUpdateService_MarkImageRefUpToDateAfterPull_ClearsMatchingRecordsACheckTime: now.Add(time.Minute),}).Error)+ // Synthetic ref:: record — must be cleared when new image is pulled.+ syntheticID := "ref::" + repository + "@1.2.3"+ require.NoError(t, db.Create(&models.ImageUpdateRecord{+ ID: syntheticID,+ Repository: repository,+ Tag: "1.2.3",+ HasUpdate: true,+ UpdateType: models.UpdateTypeDigest,+ CurrentVersion: "1.2.3",+ CheckTime: now,+ }).Error)+svc := NewImageUpdateService(db, nil, nil, &DockerClientService{client: newTestDockerClient(t, server)}, nil, nil)require.NoError(t, svc.MarkImageRefUpToDateAfterPull(context.Background(), imageRef))+ // Sha256 records for old images that other containers are still running must stay HasUpdate=true.var fullRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:old-full").First(&fullRecord).Error)- assert.False(t, fullRecord.HasUpdate)+ assert.True(t, fullRecord.HasUpdate, "sha256 record for old image still in use must not be cleared")var shortRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:old-short").First(&shortRecord).Error)- assert.False(t, shortRecord.HasUpdate)+ assert.True(t, shortRecord.HasUpdate, "sha256 record for old image still in use must not be cleared")++ // Synthetic ref:: record must be cleared since a fresh image was pulled.+ var synthRecord models.ImageUpdateRecord+ require.NoError(t, db.WithContext(context.Background()).Where("id = ?", syntheticID).First(&synthRecord).Error)+ assert.False(t, synthRecord.HasUpdate, "synthetic ref:: record must be cleared after pull")+ // The newly pulled image record must be saved as up-to-date.var currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(context.Background()).Where("id = ?", "sha256:local-image-id").First(¤tRecord).Error)assert.False(t, currentRecord.HasUpdate)diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex ec8597c89..0c7e05f00 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -533,7 +533,7 @@ func TestBuildProjectImagePullPlan(t *testing.T) {assert.Equal(t, imagePullModeNever, plan["nginx:latest"])}-func TestProjectService_PullProjectImages_ClearsUpdateRecordsForPulledNonBuildRefs(t *testing.T) {+func TestProjectService_PullProjectImages_UpdatesCurrentImageRecordAfterPull(t *testing.T) {ctx := context.Background()db := setupProjectTestDB(t)@@ -608,18 +608,22 @@ func TestProjectService_PullProjectImages_ClearsUpdateRecordsForPulledNonBuildRerequire.NoError(t, svc.PullProjectImages(ctx, projectRecord.ID, io.Discard, systemUser, nil))+ // sha256:old-* records represent update records for OTHER containers still running+ // the old image. Pulling the image for one container must not mark them as up-to-date+ // (#2453: updating one container was incorrectly removing others from the update list).var fullRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:old-full").First(&fullRecord).Error)- assert.False(t, fullRecord.HasUpdate)+ assert.True(t, fullRecord.HasUpdate)var shortRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:old-short").First(&shortRecord).Error)- assert.False(t, shortRecord.HasUpdate)+ assert.True(t, shortRecord.HasUpdate)var buildRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:build-only").First(&buildRecord).Error)assert.True(t, buildRecord.HasUpdate)+ // The newly pulled image itself is correctly marked as up-to-date.var currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)assert.False(t, currentRecord.HasUpdate)@@ -629,7 +633,7 @@ func TestProjectService_PullProjectImages_ClearsUpdateRecordsForPulledNonBuildReassert.Equal(t, imageDigest, stringPtrToString(currentRecord.LatestDigest))}-func TestProjectService_EnsureImagesPresent_ClearsUpdateRecordsAfterPull(t *testing.T) {+func TestProjectService_EnsureImagesPresent_UpdatesCurrentImageRecordAfterPull(t *testing.T) {ctx := context.Background()db := setupProjectTestDB(t)@@ -669,9 +673,11 @@ func TestProjectService_EnsureImagesPresent_ClearsUpdateRecordsAfterPull(t *testimageRef: imagePullModeAlways,}, io.Discard, nil, systemUser))+ // sha256:old-api may still be in use by another container — pulling for one container+ // must not clear it (fixes #2453).var oldRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:old-api").First(&oldRecord).Error)- assert.False(t, oldRecord.HasUpdate)+ assert.True(t, oldRecord.HasUpdate)var currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)@@ -679,7 +685,7 @@ func TestProjectService_EnsureImagesPresent_ClearsUpdateRecordsAfterPull(t *testassert.Equal(t, imageDigest, stringPtrToString(currentRecord.LatestDigest))}-func TestProjectService_PullImageForService_ClearsUpdateRecordsAfterPull(t *testing.T) {+func TestProjectService_PullImageForService_UpdatesCurrentImageRecordAfterPull(t *testing.T) {ctx := context.Background()db := setupProjectTestDB(t)@@ -717,9 +723,10 @@ func TestProjectService_PullImageForService_ClearsUpdateRecordsAfterPull(t *testrequire.NoError(t, svc.pullImageForService(ctx, imageRef, io.Discard, nil))+ // sha256:old-worker may still be in use by another container — must not be cleared (fixes #2453).var oldRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:old-worker").First(&oldRecord).Error)- assert.False(t, oldRecord.HasUpdate)+ assert.True(t, oldRecord.HasUpdate)var currentRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", imageID).First(¤tRecord).Error)@@ -801,9 +808,10 @@ func TestProjectService_ComposePullSelectedServicesInternal_ReconcilesOnlyOnSuccrequire.NoError(t, svc.composePullSelectedServicesInternal(ctx, projectDef, []string{"app"}))+ // sha256:selected-old may still be used by another container — must not be cleared (fixes #2453).var selectedRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:selected-old").First(&selectedRecord).Error)- assert.False(t, selectedRecord.HasUpdate)+ assert.True(t, selectedRecord.HasUpdate)var sidecarRecord models.ImageUpdateRecordrequire.NoError(t, db.WithContext(ctx).Where("id = ?", "sha256:sidecar-old").First(&sidecarRecord).Error)