Skip to content

Modern Docker Management, Designed for Everyone

fix: image update available notifications now being sent

Kyle Mendell9500c9d5ffa2
diff --git a/backend/internal/services/apprise_service.go b/backend/internal/services/apprise_service.go
index 593fa10e7..377a17e5a 100644
--- a/backend/internal/services/apprise_service.go
+++ b/backend/internal/services/apprise_service.go
@@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
+ "errors"
"fmt"
"io"
"log/slog"
@@ -14,6 +15,7 @@ import (
"github.com/getarcaneapp/arcane/backend/internal/database"
"github.com/getarcaneapp/arcane/backend/internal/models"
"github.com/getarcaneapp/arcane/types/imageupdate"
+ "gorm.io/gorm"
)
type AppriseService struct {
@@ -39,6 +41,9 @@ type AppriseNotificationPayload struct {
func (s *AppriseService) GetSettings(ctx context.Context) (*models.AppriseSettings, error) {
var settings models.AppriseSettings
if err := s.db.WithContext(ctx).First(&settings).Error; err != nil {
+ if errors.Is(err, gorm.ErrRecordNotFound) {
+ return nil, nil
+ }
return nil, err
}
return &settings, nil
@@ -49,6 +54,9 @@ func (s *AppriseService) CreateOrUpdateSettings(ctx context.Context, apiURL stri
err := s.db.WithContext(ctx).First(&settings).Error
if err != nil {
+ if !errors.Is(err, gorm.ErrRecordNotFound) {
+ return nil, fmt.Errorf("failed to check apprise settings: %w", err)
+ }
settings = models.AppriseSettings{
APIURL: apiURL,
Enabled: enabled,
@@ -77,7 +85,7 @@ func (s *AppriseService) SendNotification(ctx context.Context, title, body, form
return fmt.Errorf("failed to get apprise settings: %w", err)
}
- if !settings.Enabled {
+ if settings == nil || !settings.Enabled {
return nil
}
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index 87ab497e8..7f897bd21 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -433,12 +433,12 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio
updateRecords []models.ImageUpdateRecord
)
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
// Fetch Docker images
g.Go(func() error {
var err error
- dockerImages, err = dockerClient.ImageList(ctx, image.ListOptions{})
+ dockerImages, err = dockerClient.ImageList(groupCtx, image.ListOptions{})
if err != nil {
return fmt.Errorf("failed to list Docker images: %w", err)
}
@@ -448,7 +448,7 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio
// Fetch containers to determine usage
g.Go(func() error {
var err error
- containers, err = dockerClient.ContainerList(ctx, container.ListOptions{All: true})
+ containers, err = dockerClient.ContainerList(groupCtx, container.ListOptions{All: true})
if err != nil {
return fmt.Errorf("failed to list containers: %w", err)
}
@@ -458,7 +458,7 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio
// Fetch update records from DB
g.Go(func() error {
if s.db != nil {
- return s.db.WithContext(ctx).Find(&updateRecords).Error
+ return s.db.WithContext(groupCtx).Find(&updateRecords).Error
}
return nil
})
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.go
index 1fd1e8e79..77d77fa81 100644
--- a/backend/internal/services/image_update_service.go
+++ b/backend/internal/services/image_update_service.go
@@ -953,19 +953,19 @@ func (s *ImageUpdateService) CheckMultipleImages(ctx context.Context, imageRefs
regAuthMap := s.buildRegistryAuthMap(ctx, rc, regRepos, credMap)
var mu sync.Mutex
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
g.SetLimit(10) // Limit concurrency
for _, img := range images {
g.Go(func() error {
- res := s.checkSingleImageInBatch(ctx, rc, regAuthMap, enabledRegs, img.parts)
+ res := s.checkSingleImageInBatch(groupCtx, rc, regAuthMap, enabledRegs, img.parts)
mu.Lock()
results[img.ref] = res
mu.Unlock()
- if err := s.saveUpdateResult(ctx, img.ref, res); err != nil {
- slog.WarnContext(ctx, "Failed to save update result", "imageRef", img.ref, "error", err.Error())
+ if err := s.saveUpdateResult(groupCtx, img.ref, res); err != nil {
+ slog.WarnContext(groupCtx, "Failed to save update result", "imageRef", img.ref, "error", err.Error())
}
return nil
})
@@ -1098,22 +1098,22 @@ func (s *ImageUpdateService) GetUpdateSummary(ctx context.Context) (*imageupdate
errorsCount int64
)
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
g.Go(func() error {
- return s.db.WithContext(ctx).Model(&models.ImageUpdateRecord{}).Count(&totalImages).Error
+ return s.db.WithContext(groupCtx).Model(&models.ImageUpdateRecord{}).Count(&totalImages).Error
})
g.Go(func() error {
- return s.db.WithContext(ctx).Model(&models.ImageUpdateRecord{}).Where("has_update = ?", true).Count(&imagesWithUpdates).Error
+ return s.db.WithContext(groupCtx).Model(&models.ImageUpdateRecord{}).Where("has_update = ?", true).Count(&imagesWithUpdates).Error
})
g.Go(func() error {
- return s.db.WithContext(ctx).Model(&models.ImageUpdateRecord{}).Where("has_update = ? AND update_type = ?", true, "digest").Count(&digestUpdates).Error
+ return s.db.WithContext(groupCtx).Model(&models.ImageUpdateRecord{}).Where("has_update = ? AND update_type = ?", true, "digest").Count(&digestUpdates).Error
})
g.Go(func() error {
- return s.db.WithContext(ctx).Model(&models.ImageUpdateRecord{}).Where("has_update = ? AND update_type = ?", true, "tag").Count(&tagUpdates).Error
+ return s.db.WithContext(groupCtx).Model(&models.ImageUpdateRecord{}).Where("has_update = ? AND update_type = ?", true, "tag").Count(&tagUpdates).Error
})
g.Go(func() error {
- return s.db.WithContext(ctx).Model(&models.ImageUpdateRecord{}).Where("last_error IS NOT NULL").Count(&errorsCount).Error
+ return s.db.WithContext(groupCtx).Model(&models.ImageUpdateRecord{}).Where("last_error IS NOT NULL").Count(&errorsCount).Error
})
if err := g.Wait(); err != nil {
diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.go
index 9639b5e7e..660b5e388 100644
--- a/backend/internal/services/notification_service.go
+++ b/backend/internal/services/notification_service.go
@@ -895,7 +895,13 @@ func (s *NotificationService) sendBatchDiscordNotification(ctx context.Context,
return fmt.Errorf("failed to unmarshal discord config: %w", err)
}
- if err := validateWebhookURL(discordConfig.WebhookURL); err != nil {
+ // Decrypt webhook URL if encrypted
+ webhookURL := discordConfig.WebhookURL
+ if decrypted, err := utils.Decrypt(webhookURL); err == nil {
+ webhookURL = decrypted
+ }
+
+ if err := validateWebhookURL(webhookURL); err != nil {
return fmt.Errorf("invalid webhook URL: %w", err)
}
@@ -943,7 +949,7 @@ func (s *NotificationService) sendBatchDiscordNotification(ctx context.Context,
return fmt.Errorf("failed to marshal Discord payload: %w", err)
}
- req, err := http.NewRequestWithContext(ctx, http.MethodPost, discordConfig.WebhookURL, bytes.NewReader(jsonPayload))
+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, webhookURL, bytes.NewReader(jsonPayload))
if err != nil {
return fmt.Errorf("failed to create HTTP request: %w", err)
}
diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.go
index 756fb4832..ca12305fb 100644
--- a/backend/internal/services/system_service.go
+++ b/backend/internal/services/system_service.go
@@ -70,18 +70,18 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequest
}
// 2. Prune other resources in parallel
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
if req.Images {
g.Go(func() error {
danglingOnly := req.Dangling
- if settingsDangling, _ := s.getDanglingModeFromSettings(ctx); settingsDangling != danglingOnly {
- slog.DebugContext(ctx, "Prune request overriding stored image prune mode", "settings_dangling_only", settingsDangling, "request_dangling_only", danglingOnly)
+ if settingsDangling, _ := s.getDanglingModeFromSettings(groupCtx); settingsDangling != danglingOnly {
+ slog.DebugContext(groupCtx, "Prune request overriding stored image prune mode", "settings_dangling_only", settingsDangling, "request_dangling_only", danglingOnly)
}
- slog.InfoContext(ctx, "Pruning images...", "dangling_only", danglingOnly)
+ slog.InfoContext(groupCtx, "Pruning images...", "dangling_only", danglingOnly)
localResult := &system.PruneAllResult{}
- if err := s.pruneImages(ctx, danglingOnly, localResult); err != nil {
+ if err := s.pruneImages(groupCtx, danglingOnly, localResult); err != nil {
mu.Lock()
result.Errors = append(result.Errors, fmt.Sprintf("Image pruning failed: %v", err))
result.Success = false
@@ -98,10 +98,10 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequest
if req.BuildCache {
g.Go(func() error {
- slog.InfoContext(ctx, "Pruning build cache...")
+ slog.InfoContext(groupCtx, "Pruning build cache...")
localResult := &system.PruneAllResult{}
- if err := s.pruneBuildCache(ctx, localResult, !req.Dangling); err != nil {
- slog.WarnContext(ctx, "Build cache pruning encountered an error", "error", err.Error())
+ if err := s.pruneBuildCache(groupCtx, localResult, !req.Dangling); err != nil {
+ slog.WarnContext(groupCtx, "Build cache pruning encountered an error", "error", err.Error())
// Build cache errors are often non-critical, but we log them
} else {
mu.Lock()
@@ -114,9 +114,9 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequest
if req.Volumes {
g.Go(func() error {
- slog.InfoContext(ctx, "Pruning unused volumes...")
+ slog.InfoContext(groupCtx, "Pruning unused volumes...")
localResult := &system.PruneAllResult{}
- if err := s.pruneVolumes(ctx, localResult); err != nil {
+ if err := s.pruneVolumes(groupCtx, localResult); err != nil {
mu.Lock()
result.Errors = append(result.Errors, fmt.Sprintf("Volume pruning failed: %v", err))
result.Success = false
@@ -133,9 +133,9 @@ func (s *SystemService) PruneAll(ctx context.Context, req system.PruneAllRequest
if req.Networks {
g.Go(func() error {
- slog.InfoContext(ctx, "Pruning unused networks...")
+ slog.InfoContext(groupCtx, "Pruning unused networks...")
localResult := &system.PruneAllResult{}
- if err := s.pruneNetworks(ctx, localResult); err != nil {
+ if err := s.pruneNetworks(groupCtx, localResult); err != nil {
mu.Lock()
result.Errors = append(result.Errors, fmt.Sprintf("Network pruning failed: %v", err))
result.Success = false
@@ -175,7 +175,7 @@ func (s *SystemService) performBatchContainerAction(ctx context.Context, contain
result := &containertypes.ActionResult{Success: true}
var mu sync.Mutex
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
// Limit concurrency to avoid overwhelming Docker daemon
g.SetLimit(5)
@@ -186,7 +186,7 @@ func (s *SystemService) performBatchContainerAction(ctx context.Context, contain
}
g.Go(func() error {
- err := action(ctx, c.ID)
+ err := action(groupCtx, c.ID)
mu.Lock()
defer mu.Unlock()
diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.go
index 76ffdb5e0..f1694afb2 100644
--- a/backend/internal/services/template_service.go
+++ b/backend/internal/services/template_service.go
@@ -508,7 +508,7 @@ func (s *TemplateService) loadRemoteTemplates(ctx context.Context) ([]models.Com
templates []models.ComposeTemplate
)
- g, ctx := errgroup.WithContext(ctx)
+ g, groupCtx := errgroup.WithContext(ctx)
for i := range registries {
reg := registries[i]
@@ -517,9 +517,9 @@ func (s *TemplateService) loadRemoteTemplates(ctx context.Context) ([]models.Com
}
g.Go(func() error {
- remoteTemplates, err := s.fetchRegistryTemplates(ctx, &reg)
+ remoteTemplates, err := s.fetchRegistryTemplates(groupCtx, &reg)
if err != nil {
- slog.WarnContext(ctx, "failed to fetch templates from registry", "registry", reg.Name, "url", reg.URL, "error", err)
+ slog.WarnContext(groupCtx, "failed to fetch templates from registry", "registry", reg.Name, "url", reg.URL, "error", err)
return nil // Don't fail the whole group if one registry fails
}