Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: only send prune summary when resources are pruned (#1703)
Kyle Mendell9ee20121b4af
diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 525093b9d..6a48df540 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -24,7 +24,23 @@ import ("github.com/getarcaneapp/arcane/types/system")-const logoURLPath = "/api/app-images/logo-email"+const (+ logoURLPath = "/api/app-images/logo-email"++ notificationTestTypeSimple = "simple"+ notificationTestTypeImageUpdate = "image-update"+ notificationTestTypeBatchImageUpdate = "batch-image-update"+ notificationTestTypeVulnerability = "vulnerability-found"+ notificationTestTypePruneReport = "prune-report"+)++var supportedNotificationTestTypes = map[string]struct{}{+ notificationTestTypeSimple: {},+ notificationTestTypeImageUpdate: {},+ notificationTestTypeBatchImageUpdate: {},+ notificationTestTypeVulnerability: {},+ notificationTestTypePruneReport: {},+}// VulnerabilityNotificationPayload is the data sent to all providers for vulnerability_found events.// Only vulnerabilities with a fixed version should trigger this notification.@@ -844,9 +860,16 @@ func (s *NotificationService) TestNotification(ctx context.Context, provider modif err != nil {return fmt.Errorf("please save your %s settings before testing", provider)}+ testType = strings.TrimSpace(testType)+ if testType == "" {+ testType = notificationTestTypeSimple+ }+ if _, ok := supportedNotificationTestTypes[testType]; !ok {+ return fmt.Errorf("unsupported notification test type: %s", testType)+ }// Test vulnerability notification (all providers)- if testType == "vulnerability-found" {+ if testType == notificationTestTypeVulnerability {payload := VulnerabilityNotificationPayload{CVEID: fmt.Sprintf("Daily Summary - %s", time.Now().UTC().Format("2006-01-02")),Severity: "Critical:1 High:3 Medium:2 Low:1 Unknown:0",@@ -880,6 +903,47 @@ func (s *NotificationService) TestNotification(ctx context.Context, provider mod}}+ if testType == notificationTestTypePruneReport {+ result := &system.PruneAllResult{+ Success: true,+ ContainersPruned: []string{"a1b2c3d4e5f6", "f6e5d4c3b2a1"},+ ImagesDeleted: []string{"sha256:1111111111111111111111111111111111111111111111111111111111111111"},+ VolumesDeleted: []string{"arcane_test_volume"},+ NetworksDeleted: []string{"arcane_test_network"},+ SpaceReclaimed: 3825205248,+ ContainerSpaceReclaimed: 503316480,+ ImageSpaceReclaimed: 2449473536,+ VolumeSpaceReclaimed: 641728512,+ BuildCacheSpaceReclaimed: 230162432,+ Errors: []string{},+ }++ switch provider {+ case models.NotificationProviderDiscord:+ return s.sendDiscordPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderEmail:+ return s.sendEmailPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderTelegram:+ return s.sendTelegramPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderSignal:+ return s.sendSignalPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderSlack:+ return s.sendSlackPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderNtfy:+ return s.sendNtfyPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderPushover:+ return s.sendPushoverPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderGotify:+ return s.sendGotifyPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderMatrix:+ return s.sendMatrixPruneNotification(ctx, result, setting.Config)+ case models.NotificationProviderGeneric:+ return s.sendGenericPruneNotification(ctx, result, setting.Config)+ default:+ return fmt.Errorf("unknown provider: %s", provider)+ }+ }+testUpdate := &imageupdate.Response{HasUpdate: true,UpdateType: "digest",@@ -893,10 +957,10 @@ func (s *NotificationService) TestNotification(ctx context.Context, provider modcase models.NotificationProviderDiscord:return s.sendDiscordNotification(ctx, "test/image:latest", testUpdate, setting.Config)case models.NotificationProviderEmail:- if testType == "image-update" {+ if testType == notificationTestTypeImageUpdate {return s.sendEmailNotification(ctx, "nginx:latest", testUpdate, setting.Config)}- if testType == "batch-image-update" {+ if testType == notificationTestTypeBatchImageUpdate {// Create test batch updates with multiple imagestestUpdates := map[string]*imageupdate.Response{"nginx:latest": {@@ -2714,6 +2778,13 @@ func (s *NotificationService) MigrateDiscordWebhookUrlToFields(ctx context.Conte}func (s *NotificationService) SendPruneReportNotification(ctx context.Context, result *system.PruneAllResult) error {+ hasChanges := pruneResultHasChangesInternal(result)+ hasErrors := result != nil && len(result.Errors) > 0+ if !hasChanges && !hasErrors {+ slog.InfoContext(ctx, "skipping prune report notification because no resources were pruned and no errors were reported")+ return nil+ }+settings, err := s.GetAllSettings(ctx)if err != nil {return fmt.Errorf("failed to get notification settings: %w", err)@@ -2774,10 +2845,28 @@ func (s *NotificationService) SendPruneReportNotification(ctx context.Context, rif len(errors) > 0 {return fmt.Errorf("notification errors: %s", strings.Join(errors, "; "))}+ if hasErrors && !hasChanges {+ slog.WarnContext(ctx, "sending prune report notification with errors but no resources were pruned", "errorCount", len(result.Errors))+ }return nil}+func pruneResultHasChangesInternal(result *system.PruneAllResult) bool {+ if result == nil {+ return false+ }++ if result.SpaceReclaimed > 0 {+ return true+ }++ return len(result.ContainersPruned) > 0 ||+ len(result.ImagesDeleted) > 0 ||+ len(result.VolumesDeleted) > 0 ||+ len(result.NetworksDeleted) > 0+}+func (s *NotificationService) formatBytesInternal(bytes uint64) string {const unit = 1024if bytes < unit {diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.goindex b122879db..9fc7864f1 100644--- a/backend/internal/services/vulnerability_service.go+++ b/backend/internal/services/vulnerability_service.go@@ -591,6 +591,161 @@ func (s *VulnerabilityService) GetScanSummariesByImageIDs(ctx context.Context, ireturn result, nil}+type scheduledScanNotificationSummary struct {+ totalFixable int+ imagesWithFixable int+ severityCounts map[string]int+ sampleCVEs []string+ seenCVEs map[string]struct{}+}++func newScheduledScanNotificationSummary() *scheduledScanNotificationSummary {+ return &scheduledScanNotificationSummary{+ severityCounts: map[string]int{+ "CRITICAL": 0,+ "HIGH": 0,+ "MEDIUM": 0,+ "LOW": 0,+ "UNKNOWN": 0,+ },+ sampleCVEs: make([]string, 0, 5),+ seenCVEs: make(map[string]struct{}),+ }+}++func scheduledScanImageTargetInternal(img imagetypes.Summary) (imageID, imageName string, shouldScan bool) {+ imageID = img.ID+ imageName = imageID+ if len(img.RepoTags) > 0 {+ imageName = img.RepoTags[0]+ } else if len(img.RepoDigests) > 0 {+ imageName = img.RepoDigests[0]+ }++ // Skip intermediate / dangling images with no usable name.+ if imageName == "<none>:<none>" || imageName == imageID {+ return imageID, imageName, false+ }++ return imageID, imageName, true+}++func (s *VulnerabilityService) runScheduledImageScanInternal(+ ctx context.Context,+ containerID, imageName, imageID, scannerVersion string,+) (*vulnerability.ScanResult, int64, error) {+ startTime := time.Now()+ releaseSlot, slotErr := s.acquireTrivyScanSlotInternal(ctx)+ if slotErr != nil {+ return nil, 0, slotErr+ }++ var result *vulnerability.ScanResult+ var scanErr error+ func() {+ defer releaseSlot()+ result, scanErr = s.execTrivyScanInContainer(ctx, containerID, imageName, imageID, scannerVersion)+ }()++ return result, time.Since(startTime).Milliseconds(), scanErr+}++func (s *VulnerabilityService) saveScheduledFailedScanInternal(+ ctx context.Context,+ envID, imageID, imageName string,+ user models.User,+ duration int64,+ scanErr error,+) {+ failedResult := &vulnerability.ScanResult{+ ImageID: imageID,+ ImageName: imageName,+ ScanTime: time.Now(),+ Status: vulnerability.ScanStatusFailed,+ Error: scanErr.Error(),+ Duration: duration,+ }+ if saveErr := s.saveScanResult(ctx, failedResult); saveErr != nil {+ slog.WarnContext(ctx, "failed to save failed scan result", "error", saveErr)+ }+ s.logScheduledScanEvent(ctx, envID, imageID, imageName, user, false, scanErr.Error())+}++func (s *VulnerabilityService) saveScheduledSuccessfulScanInternal(+ ctx context.Context,+ envID, imageID, imageName string,+ user models.User,+ result *vulnerability.ScanResult,+ duration int64,+) {+ result.Duration = duration+ s.ensureSummary(result)+ if saveErr := s.saveScanResult(ctx, result); saveErr != nil {+ slog.WarnContext(ctx, "failed to save scan result", "error", saveErr)+ }+ s.logScheduledScanEvent(ctx, envID, imageID, imageName, user, true, "")+}++func (s *VulnerabilityService) collectScheduledFixableSummaryInternal(+ ctx context.Context,+ result *vulnerability.ScanResult,+ summary *scheduledScanNotificationSummary,+) {+ fixableVulns := s.fixedVulnerabilitiesForNotifications(ctx, result)+ if len(fixableVulns) == 0 {+ return+ }++ summary.imagesWithFixable+++ for i := range fixableVulns {+ v := fixableVulns[i]+ summary.totalFixable++++ sev := strings.ToUpper(strings.TrimSpace(string(v.Severity)))+ if _, ok := summary.severityCounts[sev]; !ok {+ sev = "UNKNOWN"+ }+ summary.severityCounts[sev]++++ cveID := strings.TrimSpace(v.VulnerabilityID)+ if cveID == "" {+ continue+ }+ if _, alreadyAdded := summary.seenCVEs[cveID]; alreadyAdded {+ continue+ }+ summary.seenCVEs[cveID] = struct{}{}+ if len(summary.sampleCVEs) < 5 {+ summary.sampleCVEs = append(summary.sampleCVEs, cveID)+ }+ }+}++func (s *VulnerabilityService) sendScheduledVulnerabilitySummaryInternal(+ ctx context.Context,+ scanned int,+ summary *scheduledScanNotificationSummary,+) {+ if summary.totalFixable == 0 || s.notificationService == nil {+ return+ }++ summaryDate := time.Now().UTC().Format("2006-01-02")+ payload := VulnerabilityNotificationPayload{+ CVEID: fmt.Sprintf("Daily Summary - %s", summaryDate),+ Severity: fmt.Sprintf("Critical:%d High:%d Medium:%d Low:%d Unknown:%d", summary.severityCounts["CRITICAL"], summary.severityCounts["HIGH"], summary.severityCounts["MEDIUM"], summary.severityCounts["LOW"], summary.severityCounts["UNKNOWN"]),+ ImageName: fmt.Sprintf("%d image(s) scanned, %d with fixable vulnerabilities", scanned, summary.imagesWithFixable),+ FixedVersion: fmt.Sprintf("%d fixable vulnerability record(s)", summary.totalFixable),+ }+ if len(summary.sampleCVEs) > 0 {+ payload.PkgName = strings.Join(summary.sampleCVEs, ", ")+ }++ if err := s.notificationService.SendVulnerabilityNotification(ctx, payload); err != nil {+ slog.WarnContext(ctx, "failed to send daily vulnerability summary notification", "error", err)+ }+}+// ScanAllImages scans all Docker images for vulnerabilities. It is intended// for use by the scheduled vulnerability scan job. A single long-running Trivy// container is created and reused for every image via docker exec, which avoids@@ -630,134 +785,33 @@ func (s *VulnerabilityService) ScanAllImages(ctx context.Context, envID string,}()scannerVersion := s.GetTrivyVersion(ctx)- totalFixable := 0- imagesWithFixable := 0- severityCounts := map[string]int{- "CRITICAL": 0,- "HIGH": 0,- "MEDIUM": 0,- "LOW": 0,- "UNKNOWN": 0,- }- sampleCVEs := make([]string, 0, 5)- seenCVEs := make(map[string]struct{})+ notificationSummary := newScheduledScanNotificationSummary()for _, img := range images {if ctx.Err() != nil {return scanned, failed, ctx.Err()}- imageID := img.ID- imageName := imageID- if len(img.RepoTags) > 0 {- imageName = img.RepoTags[0]- } else if len(img.RepoDigests) > 0 {- imageName = img.RepoDigests[0]- }-- // Skip intermediate / dangling images with no name- if imageName == "<none>:<none>" || imageName == imageID {+ imageID, imageName, shouldScan := scheduledScanImageTargetInternal(img)+ if !shouldScan {continue}slog.InfoContext(ctx, "scheduled vulnerability scan: scanning image", "image", imageName, "imageId", imageID)- startTime := time.Now()- releaseSlot, slotErr := s.acquireTrivyScanSlotInternal(ctx)- if slotErr != nil {- failed++- failedResult := &vulnerability.ScanResult{- ImageID: imageID,- ImageName: imageName,- ScanTime: time.Now(),- Status: vulnerability.ScanStatusFailed,- Error: slotErr.Error(),- Duration: 0,- }- if saveErr := s.saveScanResult(ctx, failedResult); saveErr != nil {- slog.WarnContext(ctx, "failed to save failed scan result", "error", saveErr)- }- s.logScheduledScanEvent(ctx, envID, imageID, imageName, user, false, slotErr.Error())- continue- }- var result *vulnerability.ScanResult- var scanErr error- func() {- defer releaseSlot()- result, scanErr = s.execTrivyScanInContainer(ctx, containerID, imageName, imageID, scannerVersion)- }()- duration := time.Since(startTime).Milliseconds()-+ result, duration, scanErr := s.runScheduledImageScanInternal(ctx, containerID, imageName, imageID, scannerVersion)if scanErr != nil {failed++- failedResult := &vulnerability.ScanResult{- ImageID: imageID,- ImageName: imageName,- ScanTime: time.Now(),- Status: vulnerability.ScanStatusFailed,- Error: scanErr.Error(),- Duration: duration,- }- if saveErr := s.saveScanResult(ctx, failedResult); saveErr != nil {- slog.WarnContext(ctx, "failed to save failed scan result", "error", saveErr)- }- s.logScheduledScanEvent(ctx, envID, imageID, imageName, user, false, scanErr.Error())+ s.saveScheduledFailedScanInternal(ctx, envID, imageID, imageName, user, duration, scanErr)continue}scanned++- result.Duration = duration- s.ensureSummary(result)- if saveErr := s.saveScanResult(ctx, result); saveErr != nil {- slog.WarnContext(ctx, "failed to save scan result", "error", saveErr)- }-- fixableVulns := s.fixedVulnerabilitiesForNotifications(ctx, result)- if len(fixableVulns) > 0 {- imagesWithFixable++- }- for i := range fixableVulns {- v := fixableVulns[i]- totalFixable++-- sev := strings.ToUpper(strings.TrimSpace(string(v.Severity)))- if _, ok := severityCounts[sev]; !ok {- sev = "UNKNOWN"- }- severityCounts[sev]++-- cveID := strings.TrimSpace(v.VulnerabilityID)- if cveID == "" {- continue- }- if _, alreadyAdded := seenCVEs[cveID]; alreadyAdded {- continue- }- seenCVEs[cveID] = struct{}{}- if len(sampleCVEs) < 5 {- sampleCVEs = append(sampleCVEs, cveID)- }- }-- s.logScheduledScanEvent(ctx, envID, imageID, imageName, user, true, "")+ s.saveScheduledSuccessfulScanInternal(ctx, envID, imageID, imageName, user, result, duration)+ s.collectScheduledFixableSummaryInternal(ctx, result, notificationSummary)}- if totalFixable > 0 && s.notificationService != nil {- summaryDate := time.Now().UTC().Format("2006-01-02")- payload := VulnerabilityNotificationPayload{- CVEID: fmt.Sprintf("Daily Summary - %s", summaryDate),- Severity: fmt.Sprintf("Critical:%d High:%d Medium:%d Low:%d Unknown:%d", severityCounts["CRITICAL"], severityCounts["HIGH"], severityCounts["MEDIUM"], severityCounts["LOW"], severityCounts["UNKNOWN"]),- ImageName: fmt.Sprintf("%d image(s) scanned, %d with fixable vulnerabilities", scanned, imagesWithFixable),- FixedVersion: fmt.Sprintf("%d fixable vulnerability record(s)", totalFixable),- }- if len(sampleCVEs) > 0 {- payload.PkgName = strings.Join(sampleCVEs, ", ")- }-- if err := s.notificationService.SendVulnerabilityNotification(ctx, payload); err != nil {- slog.WarnContext(ctx, "failed to send daily vulnerability summary notification", "error", err)- }- }+ s.sendScheduledVulnerabilitySummaryInternal(ctx, scanned, notificationSummary)return scanned, failed, nil}diff --git a/backend/resources/email-templates/batch-image-updates_html.tmpl b/backend/resources/email-templates/batch-image-updates_html.tmplindex 9443c22f8..ef6200ceb 100644--- a/backend/resources/email-templates/batch-image-updates_html.tmpl+++ b/backend/resources/email-templates/batch-image-updates_html.tmpl@@ -3,4 +3,4 @@<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:16px;line-height:24px;color:#cbd5e1;margin:0 0 16px 0;margin-top:0;margin-right:0;margin-bottom:16px;margin-left:0">{{.UpdateCount}} container images have updates available.</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:rgba(15, 23, 42, 0.5);border:1px solid rgba(148, 163, 184, 0.1);padding:20px;border-radius:12px"><tbody><tr><td><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:160px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Updates Available:</p></td><td data-id="__react-email-column"><p style="font-size:24px;line-height:24px;font-weight:700;color:#34d399;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.UpdateCount}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:160px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Checked At:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.CheckTime}}</p></td></tr></tbody></table></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px;background-color:rgba(15, 23, 42, 0.3);border:1px solid rgba(148, 163, 184, 0.1);padding:16px;border-radius:8px"><tbody><tr><td><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:0 0 12px 0;margin-top:0;margin-right:0;margin-bottom:12px;margin-left:0">Images with Updates:</p>{{range .ImageList}}<p style="font-size:13px;line-height:20px;color:#cbd5e1;margin:4px 0;font-family:monospace">• {{.}}</p>{{end}}</td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td>-<p style="font-size:13px;line-height:20px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">Log in to Arcane to view details and update your containers.</p></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}\ No newline at end of file+<p style="font-size:13px;line-height:20px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">Log in to Arcane to view details and update your containers.</p></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/batch-image-updates_text.tmpl b/backend/resources/email-templates/batch-image-updates_text.tmplindex 7b1caafa7..45866cfaf 100644--- a/backend/resources/email-templates/batch-image-updates_text.tmpl+++ b/backend/resources/email-templates/batch-image-updates_text.tmpl@@ -19,4 +19,4 @@ Images with Updates:Log in to Arcane to view details and update your containers.-Open Arcane Dashboard → {{.AppURL}}{{end}}\ No newline at end of file+Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/backend/resources/email-templates/container-update_html.tmpl b/backend/resources/email-templates/container-update_html.tmplindex 8d8929da7..ce06abe60 100644--- a/backend/resources/email-templates/container-update_html.tmpl+++ b/backend/resources/email-templates/container-update_html.tmpl@@ -6,4 +6,4 @@<hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Previous Version:</p></td><td data-id="__react-email-column"><p style="font-size:13px;line-height:24px;color:#e2e8f0;font-family:'Courier New', Courier, monospace;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.OldDigest}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Current Version:</p></td><td data-id="__react-email-column"><p style="font-size:13px;line-height:24px;color:#e2e8f0;font-family:'Courier New', Courier, monospace;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.NewDigest}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Updated At:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.UpdateTime}}</p></td></tr></tbody></table></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:13px;line-height:20px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">This is an automated notification from Arcane. Your container has been restarted with the new image version.</p></td></tr></tbody></table></div>-<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}\ No newline at end of file+<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/container-update_text.tmpl b/backend/resources/email-templates/container-update_text.tmplindex 3be2bf671..c636a3133 100644--- a/backend/resources/email-templates/container-update_text.tmpl+++ b/backend/resources/email-templates/container-update_text.tmpl@@ -39,4 +39,4 @@ Updated At:This is an automated notification from Arcane. Your container has been restarted with the new image version.-Open Arcane Dashboard → {{.AppURL}}{{end}}\ No newline at end of file+Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/backend/resources/email-templates/image-update_html.tmpl b/backend/resources/email-templates/image-update_html.tmplindex 3d0f97098..a87e0fee7 100644--- a/backend/resources/email-templates/image-update_html.tmpl+++ b/backend/resources/email-templates/image-update_html.tmpl@@ -6,4 +6,4 @@<hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Current Digest:</p></td><td data-id="__react-email-column"><p style="font-size:13px;line-height:24px;color:#e2e8f0;font-family:'Courier New', Courier, monospace;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.CurrentDigest}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Latest Digest:</p></td><td data-id="__react-email-column"><p style="font-size:13px;line-height:24px;color:#e2e8f0;font-family:'Courier New', Courier, monospace;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.LatestDigest}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Checked At:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.CheckTime}}</p></td></tr></tbody></table></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:13px;line-height:20px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">This is an automated notification from Arcane.<!-- --> Please review and update your container when ready.</p></td></tr></tbody></table></div>-<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}\ No newline at end of file+<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/image-update_text.tmpl b/backend/resources/email-templates/image-update_text.tmplindex 9f0740fe7..da985a3d0 100644--- a/backend/resources/email-templates/image-update_text.tmpl+++ b/backend/resources/email-templates/image-update_text.tmpl@@ -39,4 +39,4 @@ Checked At:This is an automated notification from Arcane. Please review and update your container when ready.-Open Arcane Dashboard → {{.AppURL}}{{end}}\ No newline at end of file+Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/backend/resources/email-templates/prune-report_html.tmpl b/backend/resources/email-templates/prune-report_html.tmplindex cb66d9e48..029a9ccce 100644--- a/backend/resources/email-templates/prune-report_html.tmpl+++ b/backend/resources/email-templates/prune-report_html.tmpl@@ -1,58 +1,8 @@-{{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}}+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body style="background-color:#0f172a"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td style="padding:40px 20px;background-color:#0f172a;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>+<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:rgba(30, 41, 59, 0.6);backdrop-filter:blur(20px);-webkit-backdrop-filter:blur(20px);border:1px solid rgba(148, 163, 184, 0.1);padding:32px;border-radius:16px;box-shadow:0 8px 32px 0 rgba(0, 0, 0, 0.37)"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f1f5f9">System Prune Report</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>+<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;text-align:center;background-color:rgba(15, 23, 42, 0.5);border:1px solid rgba(148, 163, 184, 0.1);padding:20px;border-radius:12px"><tbody><tr><td><p style="font-size:12px;line-height:18px;letter-spacing:0.08em;text-transform:uppercase;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">Total Reclaimed</p><p style="font-size:30px;line-height:36px;font-weight:700;color:#34d399;margin:8px 0 0 0;margin-top:8px;margin-right:0;margin-bottom:0;margin-left:0">{{.TotalSpaceReclaimed}}</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:18px;background-color:rgba(15, 23, 42, 0.5);border:1px solid rgba(148, 163, 184, 0.1);padding:20px;border-radius:12px"><tbody><tr><td>+<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:180px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Containers:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;font-family:monospace;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.ContainerSpaceReclaimed}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%">+<td data-id="__react-email-column" style="width:180px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Images:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;font-family:monospace;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.ImageSpaceReclaimed}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:180px;vertical-align:top;padding-right:12px">+<p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Volumes:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;font-family:monospace;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.VolumeSpaceReclaimed}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:180px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Build Cache:</p></td>+<td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;font-family:monospace;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.BuildCacheSpaceReclaimed}}</p></td></tr></tbody></table></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px"><tbody><tr><td><p style="font-size:12px;line-height:18px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">Generated by Arcane at <!-- -->{{.Time}}</p></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">+<a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/prune-report_text.tmpl b/backend/resources/email-templates/prune-report_text.tmplindex e6adf3779..1cca1f97d 100644--- a/backend/resources/email-templates/prune-report_text.tmpl+++ b/backend/resources/email-templates/prune-report_text.tmpl@@ -1,17 +1,31 @@-{{define "root"}}-SYSTEM PRUNE REPORT-===================+{{define "root"}}SYSTEM PRUNE REPORT-Total Space Reclaimed: {{.TotalSpaceReclaimed}}+Total Reclaimed-BREAKDOWN-----------📦 Containers: {{.ContainerSpaceReclaimed}}-🖼️ Images: {{.ImageSpaceReclaimed}}-💾 Volumes: {{.VolumeSpaceReclaimed}}-🏗️ Build Cache: {{.BuildCacheSpaceReclaimed}}+{{.TotalSpaceReclaimed}}++Containers:++{{.ContainerSpaceReclaimed}}++----------------------------------------++Images:++{{.ImageSpaceReclaimed}}++----------------------------------------++Volumes:++{{.VolumeSpaceReclaimed}}++----------------------------------------++Build Cache:++{{.BuildCacheSpaceReclaimed}}--------------------Generated by Arcane at {{.Time}}-Dashboard: {{.AppURL}}-{{end}}++Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/backend/resources/email-templates/test_html.tmpl b/backend/resources/email-templates/test_html.tmplindex e14fd7548..1a3dacd13 100644--- a/backend/resources/email-templates/test_html.tmpl+++ b/backend/resources/email-templates/test_html.tmpl@@ -1,3 +1,3 @@{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body style="background-color:#0f172a"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td style="padding:40px 20px;background-color:#0f172a;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:rgba(30, 41, 59, 0.6);backdrop-filter:blur(20px);-webkit-backdrop-filter:blur(20px);border:1px solid rgba(148, 163, 184, 0.1);padding:32px;border-radius:16px;box-shadow:0 8px 32px 0 rgba(0, 0, 0, 0.37)"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f1f5f9">Test Email</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>-<p style="font-size:16px;line-height:24px;color:#cbd5e1;margin-top:16px;margin-bottom:0">Your email setup is working correctly!</p></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}\ No newline at end of file+<p style="font-size:16px;line-height:24px;color:#cbd5e1;margin-top:16px;margin-bottom:0">Your email setup is working correctly!</p></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/test_text.tmpl b/backend/resources/email-templates/test_text.tmplindex 3f4b89e90..3e2978acb 100644--- a/backend/resources/email-templates/test_text.tmpl+++ b/backend/resources/email-templates/test_text.tmpl@@ -2,4 +2,4 @@Your email setup is working correctly!-Open Arcane Dashboard → {{.AppURL}}{{end}}\ No newline at end of file+Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/backend/resources/email-templates/vulnerability-summary_html.tmpl b/backend/resources/email-templates/vulnerability-summary_html.tmplindex 47a5d3ebd..c195c7723 100644--- a/backend/resources/email-templates/vulnerability-summary_html.tmpl+++ b/backend/resources/email-templates/vulnerability-summary_html.tmpl@@ -4,4 +4,4 @@<td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Overview}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:170px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Fixable vulnerabilities:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;font-weight:600;color:#34d399;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.FixableCount}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:170px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Severity breakdown:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.SeverityBreakdown}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-top:1px solid #eaeaea;border-color:rgba(148, 163, 184, 0.2);margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:170px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#94a3b8;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Sample CVEs:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e2e8f0;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.SampleCVEs}}</p></td></tr></tbody></table></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:13px;line-height:20px;color:#94a3b8;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">-Open Arcane to review full vulnerability details and remediation actions.</p></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}\ No newline at end of file+Open Arcane to review full vulnerability details and remediation actions.</p></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px;padding-top:24px"><tbody><tr><td><p style="font-size:14px;line-height:20px;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a78bfa;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}diff --git a/backend/resources/email-templates/vulnerability-summary_text.tmpl b/backend/resources/email-templates/vulnerability-summary_text.tmplindex d665ad2bd..e1bf16765 100644--- a/backend/resources/email-templates/vulnerability-summary_text.tmpl+++ b/backend/resources/email-templates/vulnerability-summary_text.tmpl@@ -26,4 +26,4 @@ Sample CVEs:Open Arcane to review full vulnerability details and remediation actions.-Open Arcane Dashboard → {{.AppURL}}{{end}}\ No newline at end of file+Open Arcane Dashboard → {{.AppURL}}{{end}}diff --git a/email-templates/build.ts b/email-templates/build.tsindex 5d0f18a21..a52130de1 100644--- a/email-templates/build.ts+++ b/email-templates/build.ts@@ -74,7 +74,7 @@ async function buildTemplateFile(Component: any, templateName: string, isPlainTeconst maxLen = isPlainText ? 78 : 998; // RFC-safeconst safe = tagAwareWrap(normalized, maxLen);- const goTemplate = `{{define "root"}}${safe}{{end}}`;+ const goTemplate = `{{define "root"}}${safe}{{end}}\n`;const suffix = isPlainText ? '_text.tmpl' : '_html.tmpl';const templatePath = path.join(outputDir, `${templateName}${suffix}`);diff --git a/email-templates/emails/prune-report.tsx b/email-templates/emails/prune-report.tsxnew file mode 100644index 000000000..1ce76d5b1--- /dev/null+++ b/email-templates/emails/prune-report.tsx@@ -0,0 +1,178 @@+import { Column, Hr, Row, Section, Text } from '@react-email/components';+import { BaseTemplate } from '../components/base-template';+import CardHeader from '../components/card-header';+import { sharedPreviewProps, sharedTemplateProps } from '../props';++interface PruneReportEmailProps {+ logoURL: string;+ appURL: string;+ totalSpaceReclaimed: string;+ containerSpaceReclaimed: string;+ imageSpaceReclaimed: string;+ volumeSpaceReclaimed: string;+ buildCacheSpaceReclaimed: string;+ time: string;+}++export const PruneReportEmail = ({+ logoURL,+ appURL,+ totalSpaceReclaimed,+ containerSpaceReclaimed,+ imageSpaceReclaimed,+ volumeSpaceReclaimed,+ buildCacheSpaceReclaimed,+ time,+}: PruneReportEmailProps) => {+ return (+ <BaseTemplate logoURL={logoURL} appURL={appURL}>+ <CardHeader title="System Prune Report" />++ <Section style={totalSectionStyle}>+ <Text style={totalLabelStyle}>Total Reclaimed</Text>+ <Text style={totalValueStyle}>{totalSpaceReclaimed}</Text>+ </Section>++ <Section style={breakdownSectionStyle}>+ <Row style={infoRowStyle}>+ <Column style={labelColumnStyle}>+ <Text style={labelStyle}>Containers:</Text>+ </Column>+ <Column>+ <Text style={valueStyle}>{containerSpaceReclaimed}</Text>+ </Column>+ </Row>++ <Hr style={dividerStyle} />++ <Row style={infoRowStyle}>+ <Column style={labelColumnStyle}>+ <Text style={labelStyle}>Images:</Text>+ </Column>+ <Column>+ <Text style={valueStyle}>{imageSpaceReclaimed}</Text>+ </Column>+ </Row>++ <Hr style={dividerStyle} />++ <Row style={infoRowStyle}>+ <Column style={labelColumnStyle}>+ <Text style={labelStyle}>Volumes:</Text>+ </Column>+ <Column>+ <Text style={valueStyle}>{volumeSpaceReclaimed}</Text>+ </Column>+ </Row>++ <Hr style={dividerStyle} />++ <Row style={infoRowStyle}>+ <Column style={labelColumnStyle}>+ <Text style={labelStyle}>Build Cache:</Text>+ </Column>+ <Column>+ <Text style={valueStyle}>{buildCacheSpaceReclaimed}</Text>+ </Column>+ </Row>+ </Section>++ <Section style={{ marginTop: '20px' }}>+ <Text style={footerStyle}>Generated by Arcane at {time}</Text>+ </Section>+ </BaseTemplate>+ );+};++export default PruneReportEmail;++const totalSectionStyle = {+ marginTop: '20px',+ textAlign: 'center' as const,+ backgroundColor: 'rgba(15, 23, 42, 0.5)',+ border: '1px solid rgba(148, 163, 184, 0.1)',+ padding: '20px',+ borderRadius: '12px',+};++const totalLabelStyle = {+ fontSize: '12px',+ lineHeight: '18px',+ letterSpacing: '0.08em',+ textTransform: 'uppercase' as const,+ color: '#94a3b8',+ margin: '0',+};++const totalValueStyle = {+ fontSize: '30px',+ lineHeight: '36px',+ fontWeight: '700' as const,+ color: '#34d399',+ margin: '8px 0 0 0',+};++const breakdownSectionStyle = {+ marginTop: '18px',+ backgroundColor: 'rgba(15, 23, 42, 0.5)',+ border: '1px solid rgba(148, 163, 184, 0.1)',+ padding: '20px',+ borderRadius: '12px',+};++const infoRowStyle = {+ marginBottom: '0',+};++const labelColumnStyle = {+ width: '180px',+ verticalAlign: 'top' as const,+ paddingRight: '12px',+};++const labelStyle = {+ fontSize: '14px',+ fontWeight: '600' as const,+ color: '#94a3b8',+ margin: '8px 0',+};++const valueStyle = {+ fontSize: '14px',+ color: '#e2e8f0',+ margin: '8px 0',+ wordBreak: 'break-word' as const,+ fontFamily: 'monospace',+};++const dividerStyle = {+ borderColor: 'rgba(148, 163, 184, 0.2)',+ margin: '4px 0',+};++const footerStyle = {+ fontSize: '12px',+ lineHeight: '18px',+ color: '#94a3b8',+ margin: '0',+};++PruneReportEmail.TemplateProps = {+ ...sharedTemplateProps,+ totalSpaceReclaimed: '{{.TotalSpaceReclaimed}}',+ containerSpaceReclaimed: '{{.ContainerSpaceReclaimed}}',+ imageSpaceReclaimed: '{{.ImageSpaceReclaimed}}',+ volumeSpaceReclaimed: '{{.VolumeSpaceReclaimed}}',+ buildCacheSpaceReclaimed: '{{.BuildCacheSpaceReclaimed}}',+ time: '{{.Time}}',+};++PruneReportEmail.PreviewProps = {+ ...sharedPreviewProps,+ totalSpaceReclaimed: '3.4 GB',+ containerSpaceReclaimed: '480 MB',+ imageSpaceReclaimed: '2.1 GB',+ volumeSpaceReclaimed: '612 MB',+ buildCacheSpaceReclaimed: '228 MB',+ time: 'Tue, 10 Feb 2026 19:30:00 UTC',+};diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 0b3150be1..630fedc9b 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1682,6 +1682,7 @@"notifications_email_test_batch_image_update": "Batch Image Updates Email","notifications_email_test_vulnerability_found": "Vulnerability Found Email","notifications_test_vulnerability_notification": "Test Vulnerability Notification",+ "notifications_test_prune_report_notification": "Test Prune Report Notification","notifications_apprise_title": "Apprise Integration","notifications_apprise_description": "Configure Apprise API for unified notifications across multiple services","notifications_apprise_enabled_label": "Enable Apprise",diff --git a/frontend/src/lib/services/notification-service.ts b/frontend/src/lib/services/notification-service.tsindex a548390b7..ee7e00fbc 100644--- a/frontend/src/lib/services/notification-service.ts+++ b/frontend/src/lib/services/notification-service.ts@@ -17,7 +17,8 @@ export default class NotificationService extends BaseAPIService {async testNotification(provider: string, type: string = 'simple'): Promise<TestNotificationResponse> {const envId = await environmentStore.getCurrentEnvironmentId();- return this.handleResponse(this.api.post(`/environments/${envId}/notifications/test/${provider}?type=${type}`));+ const encodedType = encodeURIComponent(type);+ return this.handleResponse(this.api.post(`/environments/${envId}/notifications/test/${provider}?type=${encodedType}`));}async getAppriseSettings(environmentId?: string): Promise<AppriseSettings> {diff --git a/frontend/src/routes/(app)/settings/notifications/+page.svelte b/frontend/src/routes/(app)/settings/notifications/+page.svelteindex 0ebf300b3..ef9ccd5a1 100644--- a/frontend/src/routes/(app)/settings/notifications/+page.svelte+++ b/frontend/src/routes/(app)/settings/notifications/+page.svelte@@ -597,7 +597,7 @@bind:values={matrixValues}disabled={isReadOnly}{isTesting}- onTest={() => testNotification('matrix')}+ onTest={(testType) => testNotification('matrix', testType)}/></Tabs.Content>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelteindex 45a000279..c4ed48651 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/DiscordProviderForm.svelte@@ -141,6 +141,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelteindex a1e54df6b..1e024b278 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/EmailProviderForm.svelte@@ -233,6 +233,10 @@<SendEmailIcon class="size-4" />{m.notifications_email_test_vulnerability_found()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelteindex e0435c7da..f507decec 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/GenericProviderForm.svelte@@ -163,6 +163,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelteindex c0a9c740c..558389194 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/GotifyProviderForm.svelte@@ -216,6 +216,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/MatrixProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/MatrixProviderForm.svelteindex 9c8459cac..721a641b5 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/MatrixProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/MatrixProviderForm.svelte@@ -1,11 +1,12 @@<script lang="ts">+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu';import { ArcaneButton } from '$lib/components/arcane-button/index.js';import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';import { Label } from '$lib/components/ui/label';import * as Select from '$lib/components/ui/select/index.js';import { m } from '$lib/paraglide/messages';- import { SendEmailIcon } from '$lib/icons';+ import { ArrowDownIcon, SendEmailIcon } from '$lib/icons';import { z } from 'zod/v4';import type { MatrixFormValues } from '$lib/types/notification-providers';import ProviderFormWrapper from './ProviderFormWrapper.svelte';@@ -15,7 +16,7 @@values: MatrixFormValues;disabled?: boolean;isTesting?: boolean;- onTest?: () => void;+ onTest?: (testType?: string) => void;}let { values = $bindable(), disabled = false, isTesting = false, onTest }: Props = $props();@@ -146,15 +147,34 @@{#if onTest}<div class="pt-2">- <ArcaneButton- action="base"- tone="outline"- onclick={onTest}- disabled={disabled || isTesting}- loading={isTesting}- icon={SendEmailIcon}- customLabel={m.notifications_test_notification()}- />+ <DropdownMenu.Root>+ <DropdownMenu.Trigger>+ <ArcaneButton+ action="base"+ tone="outline"+ disabled={disabled || isTesting}+ loading={isTesting}+ icon={SendEmailIcon}+ customLabel={m.notifications_test_notification()}+ >+ <ArrowDownIcon class="ml-2 size-4" />+ </ArcaneButton>+ </DropdownMenu.Trigger>+ <DropdownMenu.Content align="start">+ <DropdownMenu.Item onclick={() => onTest()}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_notification()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('vulnerability-found')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_vulnerability_notification()}+ </DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item>+ </DropdownMenu.Content>+ </DropdownMenu.Root></div>{/if}</ProviderFormWrapper>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelteindex c6fde7e6d..cb1873d1b 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/NtfyProviderForm.svelte@@ -224,6 +224,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelteindex 4a471af3e..ccff5ecc7 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/PushoverProviderForm.svelte@@ -184,6 +184,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelteindex 0a9901da9..4607dc382 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/SignalProviderForm.svelte@@ -252,6 +252,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelteindex 7ff808c5b..e1b220e08 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/SlackProviderForm.svelte@@ -178,6 +178,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>diff --git a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelteindex f9c6c7dcd..3173e4e60 100644--- a/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte+++ b/frontend/src/routes/(app)/settings/notifications/providers/TelegramProviderForm.svelte@@ -158,6 +158,10 @@<SendEmailIcon class="size-4" />{m.notifications_test_vulnerability_notification()}</DropdownMenu.Item>+ <DropdownMenu.Item onclick={() => onTest('prune-report')}>+ <SendEmailIcon class="size-4" />+ {m.notifications_test_prune_report_notification()}+ </DropdownMenu.Item></DropdownMenu.Content></DropdownMenu.Root></div>