Skip to content

Modern Docker Management, Designed for Everyone

fix: container cache leak from docker subscription (#2624)

Kyle Mendell66ee2b863aff
diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.go
index 509c0b8a0..6928ea2d9 100644
--- a/backend/internal/bootstrap/services_bootstrap.go
+++ b/backend/internal/bootstrap/services_bootstrap.go
@@ -85,7 +85,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Config
svcs.Build = services.NewBuildService(db, svcs.Settings, svcs.Docker, svcs.ContainerRegistry, svcs.GitRepository, svcs.Event)
svcs.BuildWorkspace = services.NewBuildWorkspaceService(svcs.Settings)
svcs.Project = services.NewProjectService(db, svcs.Settings, svcs.Event, svcs.Image, svcs.Docker, svcs.Build, cfg)
- svcs.Container = services.NewContainerService(db, svcs.Event, svcs.Docker, svcs.Image, svcs.Settings, svcs.Project)
+ svcs.Container = services.NewContainerService(ctx, db, svcs.Event, svcs.Docker, svcs.Image, svcs.Settings, svcs.Project)
svcs.Dashboard = services.NewDashboardService(
db,
svcs.Docker,
diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.go
index deeabf8b4..2677f2ba9 100644
--- a/backend/internal/services/container_service.go
+++ b/backend/internal/services/container_service.go
@@ -57,7 +57,7 @@ type ContainerListResult struct {
Counts containertypes.StatusCounts
}
-func NewContainerService(db *database.DB, eventService *EventService, dockerService *DockerClientService, imageService *ImageService, settingsService *SettingsService, projectService *ProjectService) *ContainerService {
+func NewContainerService(ctx context.Context, db *database.DB, eventService *EventService, dockerService *DockerClientService, imageService *ImageService, settingsService *SettingsService, projectService *ProjectService) *ContainerService {
svc := &ContainerService{
db: db,
eventService: eventService,
@@ -67,19 +67,28 @@ func NewContainerService(db *database.DB, eventService *EventService, dockerServ
projectService: projectService,
updateInfoCache: cache.NewKeyed[string, *imagetypes.UpdateInfo](),
}
- svc.subscribeUpdateInfoCacheInvalidationInternal()
+ svc.subscribeUpdateInfoCacheInvalidationInternal(ctx)
return svc
}
-func (s *ContainerService) subscribeUpdateInfoCacheInvalidationInternal() {
+func (s *ContainerService) subscribeUpdateInfoCacheInvalidationInternal(ctx context.Context) {
if s.dockerService == nil || s.updateInfoCache == nil || s.dockerService.EventBus() == nil {
return
}
ch := make(chan events.Message, 16)
- s.dockerService.EventBus().Subscribe(events.ImageEventType, ch)
+ unsubscribe := s.dockerService.EventBus().Subscribe(events.ImageEventType, ch)
go func() {
- for range ch {
- s.updateInfoCache.InvalidateAll()
+ defer unsubscribe()
+ for {
+ select {
+ case <-ctx.Done():
+ return
+ case _, ok := <-ch:
+ if !ok {
+ return
+ }
+ s.updateInfoCache.InvalidateAll()
+ }
}
}()
}