Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: implement container exclusion and prune notifications
Alessandro291c0f20d570
diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.goindex 9f57cc675..aca78ca34 100644--- a/backend/internal/bootstrap/jobs_bootstrap.go+++ b/backend/internal/bootstrap/jobs_bootstrap.go@@ -30,7 +30,7 @@ func registerJobs(appCtx context.Context, newScheduler *pkg_scheduler.JobScheduleventCleanupJob := pkg_scheduler.NewEventCleanupJob(appServices.Event, appServices.Settings)newScheduler.RegisterJob(eventCleanupJob)- scheduledPruneJob := pkg_scheduler.NewScheduledPruneJob(appServices.System, appServices.Settings)+ scheduledPruneJob := pkg_scheduler.NewScheduledPruneJob(appServices.System, appServices.Settings, appServices.Notification)newScheduler.RegisterJob(scheduledPruneJob)fsWatcherJob, err := pkg_scheduler.RegisterFilesystemWatcherJob(appCtx, appServices.Project, appServices.Template, appServices.Settings)diff --git a/backend/internal/models/notification.go b/backend/internal/models/notification.goindex 868703f45..f288377d7 100644--- a/backend/internal/models/notification.go+++ b/backend/internal/models/notification.go@@ -41,6 +41,7 @@ const (NotificationEventImageUpdate NotificationEventType = "image_update"NotificationEventContainerUpdate NotificationEventType = "container_update"NotificationEventVulnerabilityFound NotificationEventType = "vulnerability_found"+ NotificationEventPruneReport NotificationEventType = "prune_report")type EmailTLSMode stringdiff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.goindex 03223c5e3..148f8e918 100644--- a/backend/internal/models/settings.go+++ b/backend/internal/models/settings.go@@ -53,23 +53,24 @@ type Settings struct {AccentColor SettingVariable `key:"accentColor,public,local" meta:"label=Accent Color;type=text;keywords=color,accent,theme,css,appearance,ui;category=general;description=Primary accent color for UI"`// Docker category- AutoUpdate SettingVariable `key:"autoUpdate" meta:"label=Auto Update;type=boolean;keywords=auto,update,automatic,upgrade,refresh,restart,deploy;category=internal;description=Automatically update containers when new images are available"`- AutoUpdateInterval SettingVariable `key:"autoUpdateInterval" meta:"label=Auto Update Interval;type=cron;keywords=auto,update,interval,frequency,schedule,automatic,timing;category=internal;description=How often to check for automatic updates (cron expression)"`- PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=internal;description=Enable automatic checking for image updates"`- PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=cron;keywords=interval,frequency,schedule,time,minutes,period,delay;category=internal;description=How often to check for image updates (cron expression)"`- EventCleanupInterval SettingVariable `key:"eventCleanupInterval" meta:"label=Event Cleanup Interval;type=cron;keywords=events,cleanup,retention,interval,frequency,schedule,history,logs,jobs;description=How often to delete old events (cron expression)"`- AnalyticsHeartbeatInterval SettingVariable `key:"analyticsHeartbeatInterval" meta:"label=Analytics Heartbeat Interval;type=cron;keywords=analytics,heartbeat,interval,frequency,schedule,telemetry,jobs;description=How often to send the anonymous analytics heartbeat (cron expression)"`- AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`- PruneMode SettingVariable `key:"dockerPruneMode" meta:"label=Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk;category=internal;description=Configure how unused Docker images are cleaned up"`- ScheduledPruneEnabled SettingVariable `key:"scheduledPruneEnabled" meta:"label=Scheduled Prune Enabled;type=boolean;keywords=prune,cleanup,maintenance,schedule,automatic;category=internal;description=Enable scheduled pruning of unused Docker resources"`- ScheduledPruneInterval SettingVariable `key:"scheduledPruneInterval" meta:"label=Scheduled Prune Interval;type=cron;keywords=prune,cleanup,interval,minutes,schedule;category=internal;description=How often to run scheduled prunes (cron expression)"`- ScheduledPruneContainers SettingVariable `key:"scheduledPruneContainers" meta:"label=Scheduled Prune Containers;type=boolean;keywords=prune,containers,cleanup,maintenance;category=internal;description=Remove stopped containers during scheduled prune"`- ScheduledPruneImages SettingVariable `key:"scheduledPruneImages" meta:"label=Scheduled Prune Images;type=boolean;keywords=prune,images,cleanup,maintenance;category=internal;description=Remove unused images during scheduled prune"`- ScheduledPruneVolumes SettingVariable `key:"scheduledPruneVolumes" meta:"label=Scheduled Prune Volumes;type=boolean;keywords=prune,volumes,cleanup,maintenance;category=internal;description=Remove unused volumes during scheduled prune"`- ScheduledPruneNetworks SettingVariable `key:"scheduledPruneNetworks" meta:"label=Scheduled Prune Networks;type=boolean;keywords=prune,networks,cleanup,maintenance;category=internal;description=Remove unused networks during scheduled prune"`- ScheduledPruneBuildCache SettingVariable `key:"scheduledPruneBuildCache" meta:"label=Scheduled Prune Build Cache;type=boolean;keywords=prune,build cache,cleanup,maintenance;category=internal;description=Remove Docker build cache during scheduled prune"`- MaxImageUploadSize SettingVariable `key:"maxImageUploadSize" meta:"label=Max Image Upload Size;type=number;keywords=upload,size,limit,maximum,image,tar,file,megabytes,mb,storage;category=internal;description=Maximum size in MB for image archive uploads (default: 500)"`- DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=internal;description=URI for Docker daemon"`+ AutoUpdate SettingVariable `key:"autoUpdate" meta:"label=Auto Update;type=boolean;keywords=auto,update,automatic,upgrade,refresh,restart,deploy;category=internal;description=Automatically update containers when new images are available"`+ AutoUpdateInterval SettingVariable `key:"autoUpdateInterval" meta:"label=Auto Update Interval;type=cron;keywords=auto,update,interval,frequency,schedule,automatic,timing;category=internal;description=How often to check for automatic updates (cron expression)"`+ AutoUpdateExcludedContainers SettingVariable `key:"autoUpdateExcludedContainers" meta:"label=Excluded Containers;type=text;keywords=exclude,containers,ignore,skip;category=internal;description=Comma-separated list of containers to exclude from auto-update"`+ PollingEnabled SettingVariable `key:"pollingEnabled" meta:"label=Enable Polling;type=boolean;keywords=polling,check,monitor,watch,scan,detection,automatic;category=internal;description=Enable automatic checking for image updates"`+ PollingInterval SettingVariable `key:"pollingInterval" meta:"label=Polling Interval;type=cron;keywords=interval,frequency,schedule,time,minutes,period,delay;category=internal;description=How often to check for image updates (cron expression)"`+ EventCleanupInterval SettingVariable `key:"eventCleanupInterval" meta:"label=Event Cleanup Interval;type=cron;keywords=events,cleanup,retention,interval,frequency,schedule,history,logs,jobs;description=How often to delete old events (cron expression)"`+ AnalyticsHeartbeatInterval SettingVariable `key:"analyticsHeartbeatInterval" meta:"label=Analytics Heartbeat Interval;type=cron;keywords=analytics,heartbeat,interval,frequency,schedule,telemetry,jobs;description=How often to send the anonymous analytics heartbeat (cron expression)"`+ AutoInjectEnv SettingVariable `key:"autoInjectEnv" meta:"label=Auto Inject Env Variables;type=boolean;keywords=auto,inject,env,environment,variables,interpolation;category=internal;description=Automatically inject project .env variables into all containers (default: false)"`+ PruneMode SettingVariable `key:"dockerPruneMode" meta:"label=Docker Prune Action;type=select;keywords=prune,cleanup,clean,remove,delete,unused,dangling,space,disk;category=internal;description=Configure how unused Docker images are cleaned up"`+ ScheduledPruneEnabled SettingVariable `key:"scheduledPruneEnabled" meta:"label=Scheduled Prune Enabled;type=boolean;keywords=prune,cleanup,maintenance,schedule,automatic;category=internal;description=Enable scheduled pruning of unused Docker resources"`+ ScheduledPruneInterval SettingVariable `key:"scheduledPruneInterval" meta:"label=Scheduled Prune Interval;type=cron;keywords=prune,cleanup,interval,minutes,schedule;category=internal;description=How often to run scheduled prunes (cron expression)"`+ ScheduledPruneContainers SettingVariable `key:"scheduledPruneContainers" meta:"label=Scheduled Prune Containers;type=boolean;keywords=prune,containers,cleanup,maintenance;category=internal;description=Remove stopped containers during scheduled prune"`+ ScheduledPruneImages SettingVariable `key:"scheduledPruneImages" meta:"label=Scheduled Prune Images;type=boolean;keywords=prune,images,cleanup,maintenance;category=internal;description=Remove unused images during scheduled prune"`+ ScheduledPruneVolumes SettingVariable `key:"scheduledPruneVolumes" meta:"label=Scheduled Prune Volumes;type=boolean;keywords=prune,volumes,cleanup,maintenance;category=internal;description=Remove unused volumes during scheduled prune"`+ ScheduledPruneNetworks SettingVariable `key:"scheduledPruneNetworks" meta:"label=Scheduled Prune Networks;type=boolean;keywords=prune,networks,cleanup,maintenance;category=internal;description=Remove unused networks during scheduled prune"`+ ScheduledPruneBuildCache SettingVariable `key:"scheduledPruneBuildCache" meta:"label=Scheduled Prune Build Cache;type=boolean;keywords=prune,build cache,cleanup,maintenance;category=internal;description=Remove Docker build cache during scheduled prune"`+ MaxImageUploadSize SettingVariable `key:"maxImageUploadSize" meta:"label=Max Image Upload Size;type=number;keywords=upload,size,limit,maximum,image,tar,file,megabytes,mb,storage;category=internal;description=Maximum size in MB for image archive uploads (default: 500)"`+ DockerHost SettingVariable `key:"dockerHost,public,envOverride" meta:"label=Docker Host;type=text;keywords=docker,host,daemon,socket,unix,remote;category=internal;description=URI for Docker daemon"`// Security categoryAuthLocalEnabled SettingVariable `key:"authLocalEnabled,public" meta:"label=Local Authentication;type=boolean;keywords=local,auth,authentication,username,password,login,credentials;category=security;description=Enable local username/password authentication" catmeta:"id=security;title=Security;icon=shield;url=/settings/security;description=Manage authentication and security settings"`diff --git a/backend/internal/services/apprise_service.go b/backend/internal/services/apprise_service.goindex 166b8a675..8aa04a0b1 100644--- a/backend/internal/services/apprise_service.go+++ b/backend/internal/services/apprise_service.go@@ -106,6 +106,10 @@ func (s *AppriseService) SendNotification(ctx context.Context, title, body, formif settings.ContainerUpdateTag != "" {tags = []string{settings.ContainerUpdateTag}}++ case models.NotificationEventPruneReport:+ // Handle tags for prune report if needed, or leave empty+case models.NotificationEventVulnerabilityFound:// No dedicated tag in AppriseSettings; notification is sent without a tag}diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex d9db51517..2ab4a5b04 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -21,6 +21,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/utils/notifications""github.com/getarcaneapp/arcane/backend/resources""github.com/getarcaneapp/arcane/types/imageupdate"+ "github.com/getarcaneapp/arcane/types/system")const logoURLPath = "/api/app-images/logo-email"@@ -2558,3 +2559,404 @@ func (s *NotificationService) MigrateDiscordWebhookUrlToFields(ctx context.Conteslog.InfoContext(ctx, "Successfully migrated Discord config")return nil}++func (s *NotificationService) SendPruneReportNotification(ctx context.Context, result *system.PruneAllResult) error {+ settings, err := s.GetAllSettings(ctx)+ if err != nil {+ return fmt.Errorf("failed to get notification settings: %w", err)+ }++ var errors []string+ for _, setting := range settings {+ if !setting.Enabled {+ continue+ }++ if !s.isEventEnabled(setting.Config, models.NotificationEventPruneReport) {+ continue+ }++ var sendErr error+ switch setting.Provider {+ case models.NotificationProviderDiscord:+ sendErr = s.sendDiscordPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderEmail:+ sendErr = s.sendEmailPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderTelegram:+ sendErr = s.sendTelegramPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderSignal:+ sendErr = s.sendSignalPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderSlack:+ sendErr = s.sendSlackPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderNtfy:+ sendErr = s.sendNtfyPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderPushover:+ sendErr = s.sendPushoverPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderGotify:+ sendErr = s.sendGotifyPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderGeneric:+ sendErr = s.sendGenericPruneNotification(ctx, result, setting.Config)+ default:+ slog.WarnContext(ctx, "Unknown notification provider", "provider", setting.Provider)+ continue+ }++ status := "success"+ var errMsg *string+ if sendErr != nil {+ status = "failed"+ msg := sendErr.Error()+ errMsg = &msg+ errors = append(errors, fmt.Sprintf("%s: %s", setting.Provider, msg))+ }++ s.logNotification(ctx, setting.Provider, "System Prune Report", status, errMsg, models.JSON{+ "spaceReclaimed": result.SpaceReclaimed,+ "eventType": string(models.NotificationEventPruneReport),+ })+ }++ if len(errors) > 0 {+ return fmt.Errorf("notification errors: %s", strings.Join(errors, "; "))+ }++ return nil+}++func (s *NotificationService) formatBytesInternal(bytes uint64) string {+ const unit = 1024+ if bytes < unit {+ return fmt.Sprintf("%d B", bytes)+ }+ div, exp := int64(unit), 0+ for n := bytes / unit; n >= unit; n /= unit {+ div *= unit+ exp+++ }+ return fmt.Sprintf("%.1f %cB", float64(bytes)/float64(div), "KMGTPE"[exp])+}++func (s *NotificationService) sendDiscordPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var discordConfig models.DiscordConfig+ if err := s.unmarshalConfigInternal(config, &discordConfig); err != nil {+ return err+ }++ if discordConfig.WebhookID == "" || discordConfig.Token == "" {+ return fmt.Errorf("discord webhook ID or token not configured")+ }++ s.decryptDiscordTokenInternal(&discordConfig)++ message := fmt.Sprintf("**🧹 System Prune Report**\n\n"++ "**Total Space Reclaimed:** %s\n\n"++ "**Breakdown:**\n"++ "- 📦 **Containers:** %s\n"++ "- 🖼️ **Images:** %s\n"++ "- 💾 **Volumes:** %s\n"++ "- 🏗️ **Build Cache:** %s\n",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ if err := notifications.SendDiscord(ctx, discordConfig, message); err != nil {+ return fmt.Errorf("failed to send Discord notification: %w", err)+ }++ return nil+}++func (s *NotificationService) sendTelegramPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var telegramConfig models.TelegramConfig+ if err := s.unmarshalConfigInternal(config, &telegramConfig); err != nil {+ return err+ }++ if telegramConfig.BotToken == "" || len(telegramConfig.ChatIDs) == 0 {+ return fmt.Errorf("telegram bot token or chat IDs not configured")+ }++ s.decryptTelegramTokenInternal(&telegramConfig)++ message := fmt.Sprintf("🧹 <b>System Prune Report</b>\n\n"++ "<b>Total Space Reclaimed:</b> %s\n\n"++ "<b>Breakdown:</b>\n"++ "- 📦 <b>Containers:</b> %s\n"++ "- 🖼️ <b>Images:</b> %s\n"++ "- 💾 <b>Volumes:</b> %s\n"++ "- 🏗️ <b>Build Cache:</b> %s\n",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ if telegramConfig.ParseMode == "" {+ telegramConfig.ParseMode = "HTML"+ }++ if err := notifications.SendTelegram(ctx, telegramConfig, message); err != nil {+ return fmt.Errorf("failed to send Telegram notification: %w", err)+ }++ return nil+}++func (s *NotificationService) sendEmailPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var emailConfig models.EmailConfig+ if err := s.unmarshalConfigInternal(config, &emailConfig); err != nil {+ return err+ }++ if err := s.validateEmailConfigInternal(&emailConfig); err != nil {+ return err+ }++ s.decryptEmailPasswordInternal(&emailConfig)++ htmlBody, _, err := s.renderPruneReportEmailTemplate(result)+ if err != nil {+ return fmt.Errorf("failed to render email template: %w", err)+ }++ subject := fmt.Sprintf("System Prune Report: %s Reclaimed", s.formatBytesInternal(result.SpaceReclaimed))+ if err := notifications.SendEmail(ctx, emailConfig, subject, htmlBody); err != nil {+ return fmt.Errorf("failed to send email: %w", err)+ }++ return nil+}++func (s *NotificationService) renderPruneReportEmailTemplate(result *system.PruneAllResult) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]interface{}{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "TotalSpaceReclaimed": s.formatBytesInternal(result.SpaceReclaimed),+ "ContainerSpaceReclaimed": s.formatBytesInternal(result.ContainerSpaceReclaimed),+ "ImageSpaceReclaimed": s.formatBytesInternal(result.ImageSpaceReclaimed),+ "VolumeSpaceReclaimed": s.formatBytesInternal(result.VolumeSpaceReclaimed),+ "BuildCacheSpaceReclaimed": s.formatBytesInternal(result.BuildCacheSpaceReclaimed),+ "Time": time.Now().Format(time.RFC1123),+ }++ return s.renderTemplatesInternal("prune-report", data)+}++func (s *NotificationService) sendSignalPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var signalConfig models.SignalConfig+ if err := s.unmarshalConfigInternal(config, &signalConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("🧹 System Prune Report\n\n"++ "Total Space Reclaimed: %s\n\n"++ "Breakdown:\n"++ "- Containers: %s\n"++ "- Images: %s\n"++ "- Volumes: %s\n"++ "- Build Cache: %s\n",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ return notifications.SendSignal(ctx, signalConfig, message)+}++func (s *NotificationService) sendSlackPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var slackConfig models.SlackConfig+ if err := s.unmarshalConfigInternal(config, &slackConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("*🧹 System Prune Report*\n\n"++ "*Total Space Reclaimed:* %s\n\n"++ "*Breakdown:*\n"++ "- 📦 *Containers:* %s\n"++ "- 🖼️ *Images:* %s\n"++ "- 💾 *Volumes:* %s\n"++ "- 🏗️ *Build Cache:* %s\n",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ return notifications.SendSlack(ctx, slackConfig, message)+}++func (s *NotificationService) sendNtfyPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var ntfyConfig models.NtfyConfig+ if err := s.unmarshalConfigInternal(config, &ntfyConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("Total Space Reclaimed: %s\n\n"++ "Breakdown:\n"++ "Containers: %s\n"++ "Images: %s\n"++ "Volumes: %s\n"++ "Build Cache: %s",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ // Ntfy sends the title as part of the message or needs a separate header not currently in config+ // For now, we omit the title attribute as it is not in the struct++ return notifications.SendNtfy(ctx, ntfyConfig, message)+}++func (s *NotificationService) sendPushoverPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var pushoverConfig models.PushoverConfig+ if err := s.unmarshalConfigInternal(config, &pushoverConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("Total Space Reclaimed: %s\n\n"++ "Breakdown:\n"++ "Containers: %s\n"++ "Images: %s\n"++ "Volumes: %s\n"++ "Build Cache: %s",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ if pushoverConfig.Title == "" {+ pushoverConfig.Title = "System Prune Report"+ }++ return notifications.SendPushover(ctx, pushoverConfig, message)+}++func (s *NotificationService) sendGotifyPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var gotifyConfig models.GotifyConfig+ if err := s.unmarshalConfigInternal(config, &gotifyConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("Total Space Reclaimed: %s\n"++ "Breakdown:\n"++ "Containers: %s\n"++ "Images: %s\n"++ "Volumes: %s\n"++ "Build Cache: %s",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ if gotifyConfig.Title == "" {+ gotifyConfig.Title = "System Prune Report"+ }++ return notifications.SendGotify(ctx, gotifyConfig, message)+}++func (s *NotificationService) sendGenericPruneNotification(ctx context.Context, result *system.PruneAllResult, config models.JSON) error {+ var genericConfig models.GenericConfig+ if err := s.unmarshalConfigInternal(config, &genericConfig); err != nil {+ return err+ }++ message := fmt.Sprintf("System Prune Report\n"++ "Total Space Reclaimed: %s\n"++ "Containers: %s\n"++ "Images: %s\n"++ "Volumes: %s\n"++ "Build Cache: %s",+ s.formatBytesInternal(result.SpaceReclaimed),+ s.formatBytesInternal(result.ContainerSpaceReclaimed),+ s.formatBytesInternal(result.ImageSpaceReclaimed),+ s.formatBytesInternal(result.VolumeSpaceReclaimed),+ s.formatBytesInternal(result.BuildCacheSpaceReclaimed))++ return notifications.SendGenericWithTitle(ctx, genericConfig, "System Prune Report", message)+}++// Helper methods to reduce code duplication+func (s *NotificationService) unmarshalConfigInternal(config models.JSON, dest interface{}) error {+ configBytes, err := json.Marshal(config)+ if err != nil {+ return fmt.Errorf("failed to marshal config: %w", err)+ }+ if err := json.Unmarshal(configBytes, dest); err != nil {+ return fmt.Errorf("failed to unmarshal config: %w", err)+ }+ return nil+}++func (s *NotificationService) validateEmailConfigInternal(config *models.EmailConfig) error {+ if config.SMTPHost == "" || config.SMTPPort == 0 {+ return fmt.Errorf("SMTP host or port not configured")+ }+ if len(config.ToAddresses) == 0 {+ return fmt.Errorf("no recipient email addresses configured")+ }+ return nil+}++func (s *NotificationService) decryptDiscordTokenInternal(config *models.DiscordConfig) {+ if config.Token != "" {+ if decrypted, err := crypto.Decrypt(config.Token); err == nil {+ config.Token = decrypted+ }+ }+}++func (s *NotificationService) decryptTelegramTokenInternal(config *models.TelegramConfig) {+ if config.BotToken != "" {+ if decrypted, err := crypto.Decrypt(config.BotToken); err == nil {+ config.BotToken = decrypted+ }+ }+}++func (s *NotificationService) decryptEmailPasswordInternal(config *models.EmailConfig) {+ if config.SMTPPassword != "" {+ if decrypted, err := crypto.Decrypt(config.SMTPPassword); err == nil {+ config.SMTPPassword = decrypted+ }+ }+}++func (s *NotificationService) renderTemplatesInternal(name string, data interface{}) (string, string, error) {+ htmlContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_html.tmpl", name))+ if err != nil {+ return "", "", fmt.Errorf("failed to read HTML template: %w", err)+ }++ htmlTmpl, err := template.New("html").Parse(string(htmlContent))+ if err != nil {+ return "", "", fmt.Errorf("failed to parse HTML template: %w", err)+ }++ var htmlBuf bytes.Buffer+ if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {+ return "", "", fmt.Errorf("failed to execute HTML template: %w", err)+ }++ textContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_text.tmpl", name))+ if err == nil {+ textTmpl, err := template.New("text").Parse(string(textContent))+ if err == nil {+ var textBuf bytes.Buffer+ if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err == nil {+ return htmlBuf.String(), textBuf.String(), nil+ }+ }+ }++ return htmlBuf.String(), "", nil+}diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex d1ee36366..46759e396 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -91,6 +91,7 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequestmu.Lock()result.ImagesDeleted = append(result.ImagesDeleted, localResult.ImagesDeleted...)result.SpaceReclaimed += localResult.SpaceReclaimed+ result.ImageSpaceReclaimed += localResult.ImageSpaceReclaimedmu.Unlock()}return nil@@ -107,6 +108,7 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequest} else {mu.Lock()result.SpaceReclaimed += localResult.SpaceReclaimed+ result.BuildCacheSpaceReclaimed += localResult.BuildCacheSpaceReclaimedmu.Unlock()}return nil@@ -126,6 +128,7 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequestmu.Lock()result.VolumesDeleted = append(result.VolumesDeleted, localResult.VolumesDeleted...)result.SpaceReclaimed += localResult.SpaceReclaimed+ result.VolumeSpaceReclaimed += localResult.VolumeSpaceReclaimedmu.Unlock()}return nil@@ -277,6 +280,7 @@ func (s *SystemService) pruneContainers(ctx context.Context, result *system.Prunresult.ContainersPruned = report.ContainersDeletedresult.SpaceReclaimed += report.SpaceReclaimed+ result.ContainerSpaceReclaimed += report.SpaceReclaimedreturn nil}@@ -324,6 +328,7 @@ func (s *SystemService) pruneImages(ctx context.Context, danglingOnly bool, resuresult.ImagesDeleted = idsToDeleteresult.SpaceReclaimed += report.SpaceReclaimed+ result.ImageSpaceReclaimed += report.SpaceReclaimedreturn nil}@@ -350,6 +355,7 @@ func (s *SystemService) pruneBuildCache(ctx context.Context, result *system.Prunslog.InfoContext(ctx, "build cache pruning completed", "cache_entries_deleted", len(report.CachesDeleted), "bytes_reclaimed", report.SpaceReclaimed)result.SpaceReclaimed += report.SpaceReclaimed+ result.BuildCacheSpaceReclaimed += report.SpaceReclaimedreturn nil}@@ -368,6 +374,7 @@ func (s *SystemService) pruneVolumes(ctx context.Context, result *system.PruneAlresult.VolumesDeleted = report.VolumesDeletedresult.SpaceReclaimed += report.SpaceReclaimed+ result.VolumeSpaceReclaimed += report.SpaceReclaimedreturn nil}diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 93cf1b3f2..030bbfef0 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -965,6 +965,16 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldID}slog.DebugContext(ctx, "restartContainersUsingOldIDs: scanning containers for matching images", "containers", len(list), "oldIDMatches", len(oldIDToNewRef), "oldRefMatches", len(oldRefToNewRef))+ // Parse excluded containers settings+ excludedSetting := s.settingsService.GetStringSetting(ctx, "autoUpdateExcludedContainers", "")+ excludedContainers := make(map[string]bool)+ if excludedSetting != "" {+ parts := strings.Split(excludedSetting, ",")+ for _, p := range parts {+ excludedContainers[strings.TrimSpace(p)] = true+ }+ }+updatedNorm := map[string]string{}for oldRef, nr := range oldRefToNewRef {updatedNorm[s.normalizeRef(oldRef)] = nr@@ -987,6 +997,20 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldIDtargetImageIDs := map[string][]string{}for _, c := range list {+ // Check exclusions first by container name(s)+ isExcluded := false+ for _, name := range c.Names {+ cleanName := strings.TrimPrefix(name, "/")+ if excludedContainers[cleanName] {+ isExcluded = true+ break+ }+ }+ if isExcluded {+ slog.DebugContext(ctx, "restartContainersUsingOldIDs: skipping excluded container", "containerId", c.ID, "names", c.Names)+ continue+ }+inspect, err := dcli.ContainerInspect(ctx, c.ID)if err != nil {continuediff --git a/backend/pkg/scheduler/scheduled_prune_job.go b/backend/pkg/scheduler/scheduled_prune_job.goindex 289d66821..a8bc5b6af 100644--- a/backend/pkg/scheduler/scheduled_prune_job.go+++ b/backend/pkg/scheduler/scheduled_prune_job.go@@ -14,14 +14,16 @@ import (const ScheduledPruneJobName = "scheduled-prune"type ScheduledPruneJob struct {- systemService *services.SystemService- settingsService *services.SettingsService+ systemService *services.SystemService+ settingsService *services.SettingsService+ notificationService *services.NotificationService}-func NewScheduledPruneJob(systemService *services.SystemService, settingsService *services.SettingsService) *ScheduledPruneJob {+func NewScheduledPruneJob(systemService *services.SystemService, settingsService *services.SettingsService, notificationService *services.NotificationService) *ScheduledPruneJob {return &ScheduledPruneJob{- systemService: systemService,- settingsService: settingsService,+ systemService: systemService,+ settingsService: settingsService,+ notificationService: notificationService,}}@@ -110,6 +112,11 @@ func (j *ScheduledPruneJob) Run(ctx context.Context) {if len(result.Errors) > 0 {slog.DebugContext(ctx, "scheduled prune run errors", "errors", result.Errors)}++ // Send notification+ if err := j.notificationService.SendPruneReportNotification(ctx, result); err != nil {+ slog.WarnContext(ctx, "failed to send prune report notification", "error", err)+ }}func (j *ScheduledPruneJob) Reschedule(ctx context.Context) error {diff --git a/backend/resources/email-templates/prune-report_html.tmpl b/backend/resources/email-templates/prune-report_html.tmplnew file mode 100644index 000000000..cb66d9e48--- /dev/null+++ b/backend/resources/email-templates/prune-report_html.tmpl@@ -0,0 +1,58 @@+{{define "root"}}+<!DOCTYPE html>+<html>+<head>+ <meta charset="UTF-8">+ <title>System Prune Report</title>+ <style>+ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif; line-height: 1.6; color: #333; }+ .container { max-width: 600px; margin: 0 auto; padding: 20px; }+ .header { text-align: center; margin-bottom: 30px; }+ .logo { max-width: 150px; height: auto; }+ .card { background: #f9f9f9; border-radius: 8px; padding: 20px; margin-bottom: 20px; border: 1px solid #eee; }+ .stat { display: flex; justify-content: space-between; margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 10px; }+ .stat:last-child { border-bottom: none; margin-bottom: 0; padding-bottom: 0; }+ .label { font-weight: 600; color: #555; }+ .value { font-family: monospace; font-size: 1.1em; color: #333; }+ .total { font-size: 1.2em; font-weight: bold; margin-bottom: 20px; text-align: center; color: #2ecc71; }+ .footer { font-size: 12px; color: #888; text-align: center; margin-top: 30px; }+ </style>+</head>+<body>+ <div class="container">+ <div class="header">+ <img src="{{.LogoURL}}" alt="Arcane Logo" class="logo">+ <h2>System Prune Report</h2>+ </div>++ <div class="total">+ Total Reclaimed: {{.TotalSpaceReclaimed}}+ </div>++ <div class="card">+ <div class="stat">+ <span class="label">📦 Containers</span>+ <span class="value">{{.ContainerSpaceReclaimed}}</span>+ </div>+ <div class="stat">+ <span class="label">🖼️ Images</span>+ <span class="value">{{.ImageSpaceReclaimed}}</span>+ </div>+ <div class="stat">+ <span class="label">💾 Volumes</span>+ <span class="value">{{.VolumeSpaceReclaimed}}</span>+ </div>+ <div class="stat">+ <span class="label">🏗️ Build Cache</span>+ <span class="value">{{.BuildCacheSpaceReclaimed}}</span>+ </div>+ </div>++ <div class="footer">+ <p>Generated by Arcane at {{.Time}}</p>+ <p><a href="{{.AppURL}}" style="color: #666; text-decoration: none;">Open Dashboard</a></p>+ </div>+ </div>+</body>+</html>+{{end}}diff --git a/backend/resources/email-templates/prune-report_text.tmpl b/backend/resources/email-templates/prune-report_text.tmplnew file mode 100644index 000000000..e6adf3779--- /dev/null+++ b/backend/resources/email-templates/prune-report_text.tmpl@@ -0,0 +1,17 @@+{{define "root"}}+SYSTEM PRUNE REPORT+===================++Total Space Reclaimed: {{.TotalSpaceReclaimed}}++BREAKDOWN+---------+📦 Containers: {{.ContainerSpaceReclaimed}}+🖼️ Images: {{.ImageSpaceReclaimed}}+💾 Volumes: {{.VolumeSpaceReclaimed}}+🏗️ Build Cache: {{.BuildCacheSpaceReclaimed}}++-------------------+Generated by Arcane at {{.Time}}+Dashboard: {{.AppURL}}+{{end}}diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex c11f019b7..4f614d3d1 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -180,6 +180,9 @@"scheduled_prune_networks_description": "Remove unused networks","scheduled_prune_build_cache_label": "Prune Build Cache","scheduled_prune_build_cache_description": "Remove Docker build cache",+ "auto_update_select_containers": "Select containers...",+ "auto_update_containers_excluded_one": "1 container excluded",+ "auto_update_containers_excluded_many": "{count} containers excluded","_comment_common_actions": "=== COMMON - ACTION STATES ===","common_action_creating": "Creating…","common_action_deleting": "Deleting…",@@ -1956,5 +1959,7 @@"environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","project_files": "Project Files",- "project_includes": "Includes"-}+ "project_includes": "Includes",+ "notifications_event_prune_report_label": "System Prune Report",+ "notifications_event_prune_report_description": "Receive a summary report when a scheduled prune operation completes"+}\ No newline at end of filediff --git a/frontend/src/lib/components/form/searchable-select.svelte b/frontend/src/lib/components/form/searchable-select.sveltenew file mode 100644index 000000000..88ce81b58--- /dev/null+++ b/frontend/src/lib/components/form/searchable-select.svelte@@ -0,0 +1,225 @@+<script lang="ts">+ import { ArcaneButton } from '$lib/components/arcane-button';+ import * as Command from '$lib/components/ui/command';+ import * as Popover from '$lib/components/ui/popover';+ import { Spinner } from '$lib/components/ui/spinner';+ import { m } from '$lib/paraglide/messages';+ import { cn } from '$lib/utils';+ import { CheckIcon, ArrowDownIcon } from '$lib/icons';+ import { tick } from 'svelte';+ import type { FormEventHandler } from 'svelte/elements';+ import type { Action, ArcaneButtonSize, ArcaneButtonTone } from '$lib/components/arcane-button';++ type SearchableSelectItem = {+ value: string;+ label: string;+ disabled?: boolean;+ hint?: string;+ selected?: boolean;+ };++ let {+ items,+ value = $bindable(''),+ displayText,+ onSelect,+ oninput,+ isLoading,+ disableSearch = false,+ selectText = m.common_select_option(),+ emptyText = m.common_no_results_found(),+ closeOnSelect = true,+ triggerId,+ placeholder,+ disabled = false,+ action = 'base',+ tone,+ variant = 'outline',+ size = 'sm',+ contentClass,+ commandClass,+ inputClass,+ listClass,+ itemClass,+ showCheckboxes = true,+ class: className+ }: {+ items: SearchableSelectItem[];+ value?: string;+ displayText?: string;+ oninput?: FormEventHandler<HTMLInputElement>;+ onSelect?: (value: string) => void;+ isLoading?: boolean;+ disableSearch?: boolean;+ selectText?: string;+ emptyText?: string;+ closeOnSelect?: boolean;+ triggerId?: string;+ placeholder?: boolean;+ disabled?: boolean;+ action?: Action;+ tone?: ArcaneButtonTone;+ variant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link';+ size?: ArcaneButtonSize;+ contentClass?: string;+ commandClass?: string;+ inputClass?: string;+ listClass?: string;+ itemClass?: string;+ showCheckboxes?: boolean;+ class?: string;+ } = $props();++ let open = $state(false);+ let filteredItems = $state<SearchableSelectItem[]>([]);++ const resolvedLabel = $derived.by(() => {+ if (displayText) return displayText;+ const match = items.find((item) => item.value === value);+ return match?.label ?? selectText;+ });++ const isPlaceholder = $derived.by(() => {+ if (placeholder !== undefined) return placeholder;+ if (displayText) return false;+ return !value;+ });++ const resolvedTone = $derived.by(() => {+ if (tone) return tone;+ switch (variant) {+ case 'ghost':+ return 'ghost';+ case 'link':+ return 'link';+ case 'destructive':+ return 'outline-destructive';+ case 'default':+ return 'outline-primary';+ case 'secondary':+ return 'outline';+ case 'outline':+ default:+ return 'outline';+ }+ });++ const isCompact = $derived(size === 'sm' || size === 'icon');++ function closeAndFocusTrigger() {+ if (!closeOnSelect) return;+ open = false;+ if (!triggerId) return;+ tick().then(() => {+ document.getElementById(triggerId)?.focus();+ });+ }++ function filterItems(searchString: string) {+ if (!searchString) {+ filteredItems = items;+ return;+ }+ filteredItems = items.filter((item) => item.label.toLowerCase().includes(searchString.toLowerCase()));+ }++ $effect(() => {+ filteredItems = items;+ });++ $effect(() => {+ if (open) {+ filteredItems = items;+ }+ });+</script>++<Popover.Root bind:open>+ <Popover.Trigger>+ {#snippet child({ props })}+ <ArcaneButton+ {action}+ tone={resolvedTone}+ {size}+ role="combobox"+ aria-expanded={open}+ {...props}+ {disabled}+ id={triggerId}+ class={cn(+ '[&>span]:flex [&>span]:w-full [&>span]:items-center [&>span]:justify-between',+ isCompact && 'h-8 px-2.5 text-sm',+ isPlaceholder && 'text-muted-foreground',+ className+ )}+ >+ <span class="min-w-0 flex-1 truncate text-left">{resolvedLabel}</span>+ <ArrowDownIcon class="ml-2 size-3 shrink-0 opacity-50" />+ </ArcaneButton>+ {/snippet}+ </Popover.Trigger>+ <Popover.Content+ class={cn(+ 'bg-popover text-popover-foreground backdrop-blur-0 w-[var(--bits-popover-anchor-width)] p-0 backdrop-saturate-100',+ contentClass+ )}+ >+ <Command.Root shouldFilter={false} class={cn('rounded-none bg-transparent', commandClass)}>+ {#if !disableSearch}+ <Command.Input+ placeholder={m.common_search()}+ class={cn(inputClass)}+ oninput={(e) => {+ filterItems(e.currentTarget.value);+ oninput?.(e);+ }}+ />+ {/if}+ <Command.Empty>+ {#if isLoading}+ <div class="flex w-full justify-center">+ <Spinner class="size-4" />+ </div>+ {:else}+ {emptyText}+ {/if}+ </Command.Empty>+ <Command.List class={cn(listClass)}>+ <Command.Group>+ {#each filteredItems as item (item.value)}+ {@const isSelected = item.selected ?? item.value === value}+ <Command.Item+ value={item.value}+ disabled={item.disabled}+ class={cn(itemClass)}+ onSelect={() => {+ if (item.disabled) return;+ onSelect?.(item.value);+ closeAndFocusTrigger();+ }}+ >+ {#if showCheckboxes}+ <div+ class={cn(+ 'border-primary flex size-4 shrink-0 items-center justify-center rounded-sm border',+ isSelected ? 'bg-primary text-primary-foreground' : 'opacity-50 [&_svg]:invisible'+ )}+ >+ <CheckIcon class="text-foreground size-6" />+ </div>+ {:else}+ <CheckIcon class={cn('mr-2 size-4', isSelected ? 'opacity-100' : 'opacity-0')} />+ {/if}+ <span class={cn('min-w-0 flex-1 truncate', item.disabled && 'text-muted-foreground')} title={item.label}>+ {item.label}+ </span>+ {#if item.hint}+ <span class="text-muted-foreground ml-auto text-xs">{item.hint}</span>+ {/if}+ </Command.Item>+ {/each}+ </Command.Group>+ </Command.List>+ </Command.Root>+ </Popover.Content>+</Popover.Root>diff --git a/frontend/src/lib/types/notification-providers.ts b/frontend/src/lib/types/notification-providers.tsindex cd7bd5b47..c7916ef15 100644--- a/frontend/src/lib/types/notification-providers.ts+++ b/frontend/src/lib/types/notification-providers.ts@@ -20,6 +20,7 @@ export interface BaseProviderFormValues {eventImageUpdate: boolean;eventContainerUpdate: boolean;eventVulnerabilityFound: boolean;+ eventPruneReport: boolean;}// Provider-specific form value types@@ -163,7 +164,8 @@ export function discordSettingsToFormValues(settings?: NotificationSettings): DiavatarUrl: (cfg?.avatarUrl as string) || '',eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -181,7 +183,8 @@ export function emailSettingsToFormValues(settings?: NotificationSettings): EmaitlsMode: ((cfg?.tlsMode as string) || 'starttls') as EmailTLSMode,eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -197,7 +200,8 @@ export function telegramSettingsToFormValues(settings?: NotificationSettings): Ttitle: (cfg?.title as string) || '',eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -216,7 +220,8 @@ export function signalSettingsToFormValues(settings?: NotificationSettings): SigdisableTls: (cfg?.disableTls as boolean) ?? false,eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -234,7 +239,8 @@ export function slackSettingsToFormValues(settings?: NotificationSettings): SlacthreadTs: (cfg?.threadTs as string) || '',eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -260,7 +266,8 @@ export function discordFormValuesToSettings(values: DiscordFormValues): Notificaevents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -284,7 +291,8 @@ export function emailFormValuesToSettings(values: EmailFormValues): Notificationevents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -306,7 +314,8 @@ export function telegramFormValuesToSettings(values: TelegramFormValues): Notifievents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -331,7 +340,8 @@ export function signalFormValuesToSettings(values: SignalFormValues): Notificatievents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -352,7 +362,8 @@ export function slackFormValuesToSettings(values: SlackFormValues): Notificationevents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -376,7 +387,8 @@ export function ntfySettingsToFormValues(settings?: NotificationSettings): NtfyFdisableTlsVerification: (cfg?.disableTlsVerification as boolean) ?? false,eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -392,7 +404,8 @@ export function pushoverSettingsToFormValues(settings?: NotificationSettings): Ptitle: (cfg?.title as string) || '',eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -410,7 +423,8 @@ export function gotifySettingsToFormValues(settings?: NotificationSettings): GotdisableTls: (cfg?.disableTls as boolean) ?? false,eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -434,7 +448,8 @@ export function genericSettingsToFormValues(settings?: NotificationSettings): GecustomHeaders: customHeadersStr,eventImageUpdate: events?.image_update ?? true,eventContainerUpdate: events?.container_update ?? true,- eventVulnerabilityFound: events?.vulnerability_found ?? true+ eventVulnerabilityFound: events?.vulnerability_found ?? true,+ eventPruneReport: events?.prune_report ?? true};}@@ -460,7 +475,8 @@ export function ntfyFormValuesToSettings(values: NtfyFormValues): NotificationSeevents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -482,7 +498,8 @@ export function pushoverFormValuesToSettings(values: PushoverFormValues): Notifievents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -503,7 +520,8 @@ export function gotifyFormValuesToSettings(values: GotifyFormValues): Notificatievents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};@@ -538,7 +556,8 @@ export function genericFormValuesToSettings(values: GenericFormValues): Notificaevents: {image_update: values.eventImageUpdate,container_update: values.eventContainerUpdate,- vulnerability_found: values.eventVulnerabilityFound+ vulnerability_found: values.eventVulnerabilityFound,+ prune_report: values.eventPruneReport}}};diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.tsindex a56b78367..5d4a818dc 100644--- a/frontend/src/lib/types/settings.type.ts+++ b/frontend/src/lib/types/settings.type.ts@@ -5,6 +5,7 @@ export type Settings = {diskUsagePath: string;autoUpdate: boolean;autoUpdateInterval: number;+ autoUpdateExcludedContainers?: string;pollingEnabled: boolean;pollingInterval: number;environmentHealthInterval: number;diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelteindex 0991172b7..090e8bd7a 100644--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte@@ -148,7 +148,8 @@scheduledPruneVolumes: z.boolean(),scheduledPruneNetworks: z.boolean(),scheduledPruneBuildCache: z.boolean(),- vulnerabilityScanEnabled: z.boolean()+ vulnerabilityScanEnabled: z.boolean(),+ autoUpdateExcludedContainers: z.string().optional()});// Build current settings object from environment and settings data@@ -171,7 +172,8 @@scheduledPruneVolumes: settings?.scheduledPruneVolumes ?? false,scheduledPruneNetworks: settings?.scheduledPruneNetworks ?? true,scheduledPruneBuildCache: settings?.scheduledPruneBuildCache ?? false,- vulnerabilityScanEnabled: settings?.vulnerabilityScanEnabled ?? false+ vulnerabilityScanEnabled: settings?.vulnerabilityScanEnabled ?? false,+ autoUpdateExcludedContainers: settings?.autoUpdateExcludedContainers || ''});// Custom save handler for environment-specific settings@@ -201,7 +203,8 @@scheduledPruneVolumes: formData.scheduledPruneVolumes,scheduledPruneNetworks: formData.scheduledPruneNetworks,scheduledPruneBuildCache: formData.scheduledPruneBuildCache,- vulnerabilityScanEnabled: formData.vulnerabilityScanEnabled+ vulnerabilityScanEnabled: formData.vulnerabilityScanEnabled,+ autoUpdateExcludedContainers: formData.autoUpdateExcludedContainers});}diff --git a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelteindex 44376a04c..c1e38bbe1 100644--- a/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte+++ b/frontend/src/routes/(app)/environments/[id]/components/JobsTab.svelte@@ -1,5 +1,7 @@<script lang="ts">+ import { SvelteSet } from 'svelte/reactivity';import { jobScheduleService } from '$lib/services/job-schedule-service';+ import { containerService } from '$lib/services/container-service';import { tryCatch } from '$lib/utils/try-catch';import JobCard from '$lib/components/job-card/job-card.svelte';import { Spinner } from '$lib/components/ui/spinner';@@ -7,15 +9,67 @@import * as Card from '$lib/components/ui/card';import { Label } from '$lib/components/ui/label';import { Switch } from '$lib/components/ui/switch';+ import SearchableSelect from '$lib/components/form/searchable-select.svelte';import { JobsIcon, AlertIcon } from '$lib/icons';- import type { JobListResponse, JobStatus, JobPrerequisite } from '$lib/types/job-schedule.type';+ import type { JobStatus, JobPrerequisite } from '$lib/types/job-schedule.type';+ import type { ContainerSummaryDto } from '$lib/types/container.type';let { formInputs, environmentId } = $props();- let jobsResponse = $state<JobListResponse | null>(null);- let isLoading = $state(true);- let isFirstLoad = $state(true);- let error = $state<string | null>(null);+ let refreshSignal = $state(0);++ const jobsPromise = $derived.by(async () => {+ refreshSignal; // trigger dependency+ if (!environmentId) return null;++ const result = await tryCatch(jobScheduleService.listJobs(environmentId));++ if (result.error) {+ throw result.error;+ }++ return {+ ...result.data,+ jobs: result.data.jobs.map((job) => ({+ ...job,+ prerequisites: job.prerequisites.map((prereq) => ({+ ...prereq,+ settingsUrl: resolveSettingsUrl(job, prereq)+ }))+ }))+ };+ });++ const containersPromise = $derived.by(async () => {+ if (!$formInputs.autoUpdate.value) return [];+ const result = await tryCatch(containerService.getContainers({ pagination: { page: 1, limit: 100 } }));+ if (result.error) throw result.error;+ return result.data.data;+ });++ const excludedContainers = new SvelteSet<string>();++ const exclusionLabel = $derived.by(() => {+ if (excludedContainers.size === 0) return m.auto_update_select_containers();+ if (excludedContainers.size === 1) return m.auto_update_containers_excluded_one();+ return m.auto_update_containers_excluded_many({ count: excludedContainers.size });+ });++ $effect(() => {+ const savedValue = $formInputs.autoUpdateExcludedContainers?.value || '';+ const names = savedValue+ .split(',')+ .map((s: string) => normalizeContainerName(s.trim()))+ .filter(Boolean);++ // Synchronize the SvelteSet with the form input value+ // Only update if there are actual changes to avoid unnecessary reactivity+ const currentNames = Array.from(excludedContainers);+ if (names.length !== currentNames.length || names.some((n: string) => !excludedContainers.has(n))) {+ excludedContainers.clear();+ names.forEach((n: string) => excludedContainers.add(n));+ }+ });function resolveSettingsUrl(job: JobStatus, prereq: JobPrerequisite): string | undefined {if (!prereq.settingsUrl) return undefined;@@ -37,39 +91,23 @@}}- async function loadJobs() {- if (isFirstLoad) {- isLoading = true;- }-- const result = await tryCatch(jobScheduleService.listJobs(environmentId));- isLoading = false;- isFirstLoad = false;+ function loadJobs() {+ refreshSignal++;+ }- if (result.error) {- if (!jobsResponse) {- error = result.error.message;- }- return;+ function toggleContainerExclusion(containerName: string) {+ const normalizedName = normalizeContainerName(containerName);+ if (excludedContainers.has(normalizedName)) {+ excludedContainers.delete(normalizedName);+ } else {+ excludedContainers.add(normalizedName);}- jobsResponse = {- ...result.data,- jobs: result.data.jobs.map((job) => ({- ...job,- prerequisites: job.prerequisites.map((prereq) => ({- ...prereq,- settingsUrl: resolveSettingsUrl(job, prereq)- }))- }))- };- }-- $effect(() => {- if (environmentId) {- loadJobs();+ const newValue = Array.from(excludedContainers).join(',');+ if ($formInputs.autoUpdateExcludedContainers) {+ $formInputs.autoUpdateExcludedContainers.value = newValue;}- });+ }const categories = [{ id: 'monitoring', label: m.jobs_monitoring_heading() },@@ -82,9 +120,8 @@const hiddenJobIds = new Set(['gitops-sync', 'filesystem-watcher']);- function getJobsByCategory(categoryId: string): JobStatus[] {- if (!jobsResponse) return [];- return jobsResponse.jobs.filter((j) => {+ function getJobsByCategory(categoryId: string, jobs: JobStatus[]): JobStatus[] {+ return jobs.filter((j) => {if (hiddenJobIds.has(j.id)) return false;if (j.category !== categoryId) return false;// Only show manager-only jobs on the local environment (ID "0")@@ -107,6 +144,37 @@return undefined;}}++ function getContainerName(c: ContainerSummaryDto): string {+ const rawName = c.names[0] || c.id.substring(0, 12);+ return normalizeContainerName(rawName);+ }++ function normalizeContainerName(name: string): string {+ return name.replace(/^\/+/, '');+ }++ function isContainerLabelExcluded(container: ContainerSummaryDto): boolean {+ const labels = container.labels || {};+ for (const [k, v] of Object.entries(labels)) {+ if (k.toLowerCase() === 'com.getarcaneapp.arcane.updater') {+ return ['false', '0', 'no', 'off'].includes(v.trim().toLowerCase());+ }+ }+ return false;+ }++ function mapContainerToItem(container: ContainerSummaryDto) {+ const name = getContainerName(container);+ const labelExcluded = isContainerLabelExcluded(container);+ return {+ value: name,+ label: name,+ disabled: labelExcluded,+ hint: labelExcluded ? '(Label)' : undefined,+ selected: excludedContainers.has(name) || labelExcluded+ };+ }</script><div class="space-y-6">@@ -120,105 +188,157 @@</div></Card.Header><Card.Content class="p-4 sm:p-6">- {#if isLoading && !jobsResponse}+ {#await jobsPromise}<div class="flex h-32 items-center justify-center"><Spinner class="size-8" /></div>- {:else if error && !jobsResponse}- <div class="border-destructive/50 bg-destructive/10 text-destructive rounded-lg border p-4">- {error}- </div>- {:else if jobsResponse}- <div class="space-y-8">- {#each categories as category (category.id)}- {@const categoryJobs = getJobsByCategory(category.id)}- {#if categoryJobs.length > 0}- <div class="space-y-4">- <h3 class="text-muted-foreground text-sm font-semibold tracking-tight uppercase">- {category.label}- </h3>- <div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-2">- {#each categoryJobs as job (job.id)}- <JobCard- {job}- {environmentId}- isAgent={jobsResponse.isAgent}- onScheduleUpdate={loadJobs}- enabledOverride={getEnabledOverride(job)}- >- {#snippet headerAccessory()}- {#if job.id === 'image-polling'}- <Switch bind:checked={$formInputs.pollingEnabled.value} />- {:else if job.id === 'auto-update'}- <Switch bind:checked={$formInputs.autoUpdate.value} disabled={!$formInputs.pollingEnabled.value} />- {:else if job.id === 'scheduled-prune'}- <Switch bind:checked={$formInputs.scheduledPruneEnabled.value} />- {:else if job.id === 'vulnerability-scan'}- <Switch bind:checked={$formInputs.vulnerabilityScanEnabled.value} />+ {:then jobsResponse}+ {#if jobsResponse}+ <div class="space-y-8">+ {#each categories as category (category.id)}+ {@const categoryJobs = getJobsByCategory(category.id, jobsResponse.jobs)}+ {#if categoryJobs.length > 0}+ <div class="space-y-4">+ <h3 class="text-muted-foreground text-sm font-semibold tracking-tight uppercase">+ {category.label}+ </h3>+ <div class="grid gap-4 sm:grid-cols-2 lg:grid-cols-2">+ {#each categoryJobs as job (job.id)}+ <JobCard+ {job}+ {environmentId}+ isAgent={jobsResponse.isAgent}+ onScheduleUpdate={loadJobs}+ enabledOverride={getEnabledOverride(job)}+ >+ {#snippet headerAccessory()}+ {#if job.id === 'image-polling'}+ <Switch bind:checked={$formInputs.pollingEnabled.value} />+ {:else if job.id === 'auto-update'}+ <Switch bind:checked={$formInputs.autoUpdate.value} disabled={!$formInputs.pollingEnabled.value} />+ {:else if job.id === 'scheduled-prune'}+ <Switch bind:checked={$formInputs.scheduledPruneEnabled.value} />+ {:else if job.id === 'vulnerability-scan'}+ <Switch bind:checked={$formInputs.vulnerabilityScanEnabled.value} />+ {/if}+ {/snippet}++ {#if job.id === 'auto-update' && $formInputs.autoUpdate.value}+ <div class="border-border/20 space-y-3 border-t pt-3">+ <div class="space-y-1">+ <Label class="text-sm font-medium">Excluded Containers</Label>+ <p class="text-muted-foreground text-xs">Select containers to exclude from automatic updates.</p>+ </div>++ {#await containersPromise}+ <SearchableSelect+ items={[]}+ displayText={exclusionLabel}+ placeholder={excludedContainers.size === 0}+ isLoading={true}+ emptyText="Loading containers..."+ size="sm"+ class="w-1/2"+ listClass="max-h-36"+ inputClass="h-8 py-1 text-sm"+ itemClass="py-1 text-sm"+ onSelect={(value) => toggleContainerExclusion(value)}+ />+ {:then containers}+ <SearchableSelect+ items={containers.map(mapContainerToItem)}+ displayText={exclusionLabel}+ placeholder={excludedContainers.size === 0}+ size="sm"+ class="w-1/2"+ listClass="max-h-36"+ inputClass="h-8 py-1 text-sm"+ itemClass="py-1 text-sm"+ onSelect={(value) => toggleContainerExclusion(value)}+ />+ {:catch error}+ <SearchableSelect+ items={[]}+ displayText={exclusionLabel}+ placeholder={excludedContainers.size === 0}+ emptyText={error.message || 'Failed to load containers'}+ size="sm"+ class="w-1/2"+ listClass="max-h-36"+ inputClass="h-8 py-1 text-sm"+ itemClass="py-1 text-sm"+ onSelect={(value) => toggleContainerExclusion(value)}+ />+ {/await}+ </div>{/if}- {/snippet}-- {#if job.id === 'scheduled-prune'}- {#if $formInputs.scheduledPruneEnabled.value}- <div class="border-border/20 space-y-4 border-t pt-3">- <div class="grid gap-3 sm:grid-cols-2">- <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">- <div class="space-y-0.5">- <Label class="text-sm font-medium">{m.scheduled_prune_containers_label()}</Label>- <p class="text-muted-foreground text-xs">{m.scheduled_prune_containers_description()}</p>++ {#if job.id === 'scheduled-prune'}+ {#if $formInputs.scheduledPruneEnabled.value}+ <div class="border-border/20 space-y-4 border-t pt-3">+ <div class="grid gap-3 sm:grid-cols-2">+ <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">+ <div class="space-y-0.5">+ <Label class="text-sm font-medium">{m.scheduled_prune_containers_label()}</Label>+ <p class="text-muted-foreground text-xs">{m.scheduled_prune_containers_description()}</p>+ </div>+ <Switch bind:checked={$formInputs.scheduledPruneContainers.value} /></div>- <Switch bind:checked={$formInputs.scheduledPruneContainers.value} />- </div>- <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">- <div class="space-y-0.5">- <Label class="text-sm font-medium">{m.scheduled_prune_images_label()}</Label>- <p class="text-muted-foreground text-xs">{m.scheduled_prune_images_description()}</p>+ <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">+ <div class="space-y-0.5">+ <Label class="text-sm font-medium">{m.scheduled_prune_images_label()}</Label>+ <p class="text-muted-foreground text-xs">{m.scheduled_prune_images_description()}</p>+ </div>+ <Switch bind:checked={$formInputs.scheduledPruneImages.value} /></div>- <Switch bind:checked={$formInputs.scheduledPruneImages.value} />- </div>- <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">- <div class="space-y-0.5">- <Label class="text-sm font-medium">{m.scheduled_prune_volumes_label()}</Label>- <p class="text-muted-foreground text-xs">{m.scheduled_prune_volumes_description()}</p>+ <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">+ <div class="space-y-0.5">+ <Label class="text-sm font-medium">{m.scheduled_prune_volumes_label()}</Label>+ <p class="text-muted-foreground text-xs">{m.scheduled_prune_volumes_description()}</p>+ </div>+ <Switch bind:checked={$formInputs.scheduledPruneVolumes.value} /></div>- <Switch bind:checked={$formInputs.scheduledPruneVolumes.value} />- </div>- <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">- <div class="space-y-0.5">- <Label class="text-sm font-medium">{m.scheduled_prune_networks_label()}</Label>- <p class="text-muted-foreground text-xs">{m.scheduled_prune_networks_description()}</p>+ <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">+ <div class="space-y-0.5">+ <Label class="text-sm font-medium">{m.scheduled_prune_networks_label()}</Label>+ <p class="text-muted-foreground text-xs">{m.scheduled_prune_networks_description()}</p>+ </div>+ <Switch bind:checked={$formInputs.scheduledPruneNetworks.value} /></div>- <Switch bind:checked={$formInputs.scheduledPruneNetworks.value} />- </div>- <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">- <div class="space-y-0.5">- <Label class="text-sm font-medium">{m.scheduled_prune_build_cache_label()}</Label>- <p class="text-muted-foreground text-xs">{m.scheduled_prune_build_cache_description()}</p>+ <div class="bg-muted/20 ring-border/20 flex items-start justify-between rounded-lg p-3 ring-1">+ <div class="space-y-0.5">+ <Label class="text-sm font-medium">{m.scheduled_prune_build_cache_label()}</Label>+ <p class="text-muted-foreground text-xs">{m.scheduled_prune_build_cache_description()}</p>+ </div>+ <Switch bind:checked={$formInputs.scheduledPruneBuildCache.value} /></div>- <Switch bind:checked={$formInputs.scheduledPruneBuildCache.value} /></div>- </div>- {#if $formInputs.scheduledPruneVolumes.value}- <div- class="flex items-start gap-3 rounded-lg border border-amber-500/30 bg-amber-500/10 p-3 text-amber-900 dark:text-amber-200"- >- <AlertIcon class="mt-0.5 size-4 shrink-0 text-amber-600 dark:text-amber-400" />- <div class="space-y-1 text-sm">- <p class="font-medium">{m.scheduled_prune_volumes_warning()}</p>+ {#if $formInputs.scheduledPruneVolumes.value}+ <div+ class="flex items-start gap-3 rounded-lg border border-amber-500/30 bg-amber-500/10 p-3 text-amber-900 dark:text-amber-200"+ >+ <AlertIcon class="mt-0.5 size-4 shrink-0 text-amber-600 dark:text-amber-400" />+ <div class="space-y-1 text-sm">+ <p class="font-medium">{m.scheduled_prune_volumes_warning()}</p>+ </div></div>- </div>- {/if}- </div>+ {/if}+ </div>+ {/if}{/if}- {/if}- </JobCard>- {/each}+ </JobCard>+ {/each}+ </div></div>- </div>- {/if}- {/each}+ {/if}+ {/each}+ </div>+ {/if}+ {:catch error}+ <div class="border-destructive/50 bg-destructive/10 text-destructive rounded-lg border p-4">+ {error.message || error}</div>- {/if}+ {/await}</Card.Content></Card.Root>-</div>+</div>\ No newline at end of filediff --git a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelteindex 2fbef0d48..f865fbc27 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte@@ -27,7 +27,8 @@avatarUrl: z.string(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -112,6 +113,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelteindex fe7168332..932470708 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte@@ -33,7 +33,8 @@tlsMode: z.enum(['none', 'starttls', 'ssl']),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -196,6 +197,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte b/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelteindex f50fe7b6c..f1b8c4b4b 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/EventSubscriptions.svelte@@ -8,6 +8,7 @@eventImageUpdate: boolean;eventContainerUpdate: boolean;eventVulnerabilityFound: boolean;+ eventPruneReport: boolean;disabled?: boolean;}@@ -16,6 +17,7 @@eventImageUpdate = $bindable(),eventContainerUpdate = $bindable(),eventVulnerabilityFound = $bindable(),+ eventPruneReport = $bindable(),disabled = false}: Props = $props();</script>@@ -39,6 +41,13 @@description={m.notifications_event_container_update_description()}/><SwitchWithLabel+ id="{providerId}-event-prune-report"+ bind:checked={eventPruneReport}+ {disabled}+ label={m.notifications_event_prune_report_label()}+ description={m.notifications_event_prune_report_description()}+ />+ <SwitchWithLabelid="{providerId}-event-vulnerability-found"bind:checked={eventVulnerabilityFound}{disabled}diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelteindex 85df58cda..a0583bea3 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte@@ -29,7 +29,8 @@customHeaders: z.string(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -134,6 +135,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelteindex 8d6f7b552..6a78be0bb 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte@@ -51,7 +51,8 @@disableTls: z.boolean(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -187,6 +188,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelteindex 8485393cd..aedbc6f8c 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte@@ -37,7 +37,8 @@disableTlsVerification: z.boolean(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -195,6 +196,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelteindex c2dbc024c..7dbe53f84 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte@@ -41,7 +41,8 @@title: z.string(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -155,6 +156,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelteindex 751e2c2b1..13114ba66 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte@@ -34,7 +34,8 @@disableTls: z.boolean(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -223,6 +224,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelteindex eece4a921..e088ff7db 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte@@ -30,7 +30,8 @@threadTs: z.string(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -149,6 +150,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelteindex 52f6780a7..eac75f888 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte@@ -31,7 +31,8 @@title: z.string(),eventImageUpdate: z.boolean(),eventContainerUpdate: z.boolean(),- eventVulnerabilityFound: z.boolean()+ eventVulnerabilityFound: z.boolean(),+ eventPruneReport: z.boolean()}).superRefine((d, ctx) => {if (!d.enabled) return;@@ -129,6 +130,7 @@bind:eventImageUpdate={values.eventImageUpdate}bind:eventContainerUpdate={values.eventContainerUpdate}bind:eventVulnerabilityFound={values.eventVulnerabilityFound}+ bind:eventPruneReport={values.eventPruneReport}{disabled}/>diff --git a/types/container/container.go b/types/container/container.goindex 8cd521bc6..3a9585cb7 100644--- a/types/container/container.go+++ b/types/container/container.go@@ -726,6 +726,11 @@ type Created struct {// NewSummary creates a Summary from a docker container.Summary.func NewSummary(c container.Summary) Summary {+ names := make([]string, 0, len(c.Names))+ for _, name := range c.Names {+ names = append(names, strings.TrimPrefix(name, "/"))+ }+ports := make([]Port, 0, len(c.Ports))for _, p := range c.Ports {ports = append(ports, Port{@@ -759,7 +764,7 @@ func NewSummary(c container.Summary) Summary {return Summary{ID: c.ID,- Names: c.Names,+ Names: names,Image: c.Image,ImageID: c.ImageID,Command: c.Command,diff --git a/types/system/prune.go b/types/system/prune.goindex 5da50da44..1449dcf7f 100644--- a/types/system/prune.go+++ b/types/system/prune.go@@ -60,6 +60,26 @@ type PruneAllResult struct {// Required: trueSpaceReclaimed uint64 `json:"spaceReclaimed"`+ // ContainerSpaceReclaimed is the amount of space reclaimed from containers in bytes.+ //+ // Required: false+ ContainerSpaceReclaimed uint64 `json:"containerSpaceReclaimed,omitempty"`++ // ImageSpaceReclaimed is the amount of space reclaimed from images in bytes.+ //+ // Required: false+ ImageSpaceReclaimed uint64 `json:"imageSpaceReclaimed,omitempty"`++ // VolumeSpaceReclaimed is the amount of space reclaimed from volumes in bytes.+ //+ // Required: false+ VolumeSpaceReclaimed uint64 `json:"volumeSpaceReclaimed,omitempty"`++ // BuildCacheSpaceReclaimed is the amount of space reclaimed from build cache in bytes.+ //+ // Required: false+ BuildCacheSpaceReclaimed uint64 `json:"buildCacheSpaceReclaimed,omitempty"`+// Success indicates if the prune operation was successful.//// Required: true