Skip to content

Modern Docker Management, Designed for Everyone

refactor: cleanup image,stack, and network services

Kyle Mendell66084a40dddf
diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.go
index 03640d304..bf8de6728 100644
--- a/backend/internal/services/image_service.go
+++ b/backend/internal/services/image_service.go
@@ -20,7 +20,6 @@ import (
"github.com/ofkm/arcane-backend/internal/database"
"github.com/ofkm/arcane-backend/internal/models"
"github.com/ofkm/arcane-backend/internal/utils"
- "gorm.io/gorm"
"gorm.io/gorm/clause"
)
@@ -446,85 +445,6 @@ func (s *ImageService) deleteAllImages(ctx context.Context) error {
return nil
}
-func (s *ImageService) GetImageByIDFromDB(ctx context.Context, id string) (*models.Image, error) {
- var image models.Image
- if err := s.db.WithContext(ctx).Where("id = ?", id).First(&image).Error; err != nil {
- if errors.Is(err, gorm.ErrRecordNotFound) {
- return nil, fmt.Errorf("image not found")
- }
- return nil, fmt.Errorf("failed to get image: %w", err)
- }
- return &image, nil
-}
-
-func (s *ImageService) UpdateImageUsage(ctx context.Context, id string, inUse bool) error {
- if err := s.db.WithContext(ctx).Model(&models.Image{}).Where("id = ?", id).Update("in_use", inUse).Error; err != nil {
- return fmt.Errorf("failed to update image usage: %w", err)
- }
- return nil
-}
-
-func (s *ImageService) GetImagesByRepository(ctx context.Context, repo string) ([]*models.Image, error) {
- var images []*models.Image
- if err := s.db.WithContext(ctx).Where("repo = ?", repo).Find(&images).Error; err != nil {
- return nil, fmt.Errorf("failed to get images by repository: %w", err)
- }
- return images, nil
-}
-
-func (s *ImageService) UpdateImageUpdate(ctx context.Context, imageID string, updateData *models.ImageUpdateRecord) error {
- var image models.Image
- if err := s.db.WithContext(ctx).Where("id = ?", imageID).First(&image).Error; err != nil {
- return fmt.Errorf("image not found in database: %w", err)
- }
-
- updateData.ID = imageID
- if err := s.db.WithContext(ctx).Clauses(clause.OnConflict{
- Columns: []clause.Column{{Name: "id"}},
- DoUpdates: clause.AssignmentColumns([]string{
- "repository", "tag", "has_update", "update_type",
- "current_version", "latest_version", "current_digest",
- "latest_digest", "check_time", "response_time_ms", "last_error",
- }),
- }).Create(updateData).Error; err != nil {
- return fmt.Errorf("failed to update image update record: %w", err)
- }
-
- return nil
-}
-
-func (s *ImageService) GetImagesNeedingMaturityCheck(ctx context.Context, olderThan time.Duration) ([]*models.Image, error) {
- cutoff := time.Now().Add(-olderThan)
-
- var images []*models.Image
- query := s.db.WithContext(ctx).
- Preload("MaturityRecord").
- Where("repo != ? AND tag != ?", "<none>", "<none>").
- Where("id NOT IN (SELECT id FROM image_maturity_table WHERE last_checked > ?)", cutoff)
-
- if err := query.Find(&images).Error; err != nil {
- return nil, fmt.Errorf("failed to get images needing maturity check: %w", err)
- }
-
- return images, nil
-}
-
-func (s *ImageService) GetImagesNeedingUpdateCheck(ctx context.Context, olderThan time.Duration) ([]*models.Image, error) {
- cutoff := time.Now().Add(-olderThan)
-
- var images []*models.Image
- query := s.db.WithContext(ctx).
- Preload("UpdateRecord").
- Where("repo != ? AND tag != ?", "<none>", "<none>").
- Where("id NOT IN (SELECT id FROM image_update_table WHERE check_time > ?)", cutoff)
-
- if err := query.Find(&images).Error; err != nil {
- return nil, fmt.Errorf("failed to get images needing update check: %w", err)
- }
-
- return images, nil
-}
-
func (s *ImageService) ListImagesWithUpdates(ctx context.Context) ([]*models.Image, error) {
_, err := s.ListImages(ctx)
if err != nil {
@@ -617,18 +537,3 @@ func (s *ImageService) GetTotalImageSize(ctx context.Context) (int64, error) {
}
return total, nil
}
-
-func (s *ImageService) CleanupOrphanedUpdateRecords(ctx context.Context, existingImageIDs []string) (int64, error) {
- var result *gorm.DB
- if len(existingImageIDs) == 0 {
- result = s.db.WithContext(ctx).Delete(&models.ImageUpdateRecord{})
- } else {
- result = s.db.WithContext(ctx).Where("id NOT IN ?", existingImageIDs).Delete(&models.ImageUpdateRecord{})
- }
-
- if result.Error != nil {
- return 0, fmt.Errorf("failed to cleanup orphaned update records: %w", result.Error)
- }
-
- return result.RowsAffected, nil
-}
diff --git a/backend/internal/services/network_service.go b/backend/internal/services/network_service.go
index 504e00b98..9bcb1ea9c 100644
--- a/backend/internal/services/network_service.go
+++ b/backend/internal/services/network_service.go
@@ -26,7 +26,13 @@ func NewNetworkService(db *database.DB, dockerService *DockerClientService, even
}
}
-// ListNetworks returns live Docker networks
+var defaultNetworkNames = map[string]bool{
+ "bridge": true,
+ "host": true,
+ "none": true,
+ "ingress": true,
+}
+
func (s *NetworkService) ListNetworks(ctx context.Context) ([]network.Summary, error) {
dockerClient, err := s.dockerService.CreateConnection(ctx)
if err != nil {
@@ -244,24 +250,15 @@ func (s *NetworkService) GetDefaultNetworks(ctx context.Context) ([]network.Summ
return nil, err
}
- defaultNames := map[string]bool{
- "bridge": true,
- "host": true,
- "none": true,
- "ingress": true,
- }
-
var defaults []network.Summary
for _, net := range networks {
- if defaultNames[net.Name] {
+ if defaultNetworkNames[net.Name] {
defaults = append(defaults, net)
}
}
-
return defaults, nil
}
-// GetNetworksByScope filters networks by scope (local, global, swarm)
func (s *NetworkService) GetNetworksByScope(ctx context.Context, scope string) ([]network.Summary, error) {
networks, err := s.ListNetworks(ctx)
if err != nil {
@@ -285,20 +282,12 @@ func (s *NetworkService) GetUserDefinedNetworks(ctx context.Context) ([]network.
return nil, err
}
- defaultNames := map[string]bool{
- "bridge": true,
- "host": true,
- "none": true,
- "ingress": true,
- }
-
var userDefined []network.Summary
for _, net := range networks {
- if !defaultNames[net.Name] {
+ if !defaultNetworkNames[net.Name] {
userDefined = append(userDefined, net)
}
}
-
return userDefined, nil
}
diff --git a/backend/internal/services/stack_service.go b/backend/internal/services/stack_service.go
index 7b20a82a3..d4fb94080 100644
--- a/backend/internal/services/stack_service.go
+++ b/backend/internal/services/stack_service.go
@@ -44,16 +44,6 @@ func NewStackService(db *database.DB, settingsService *SettingsService, eventSer
}
}
-type StackInfo struct {
- ID string `json:"id"`
- Name string `json:"name"`
- Status string `json:"status"`
- Services []StackServiceInfo `json:"services"`
- ServiceCount int `json:"service_count"`
- RunningCount int `json:"running_count"`
- ComposeYAML string `json:"compose_yaml,omitempty"`
-}
-
func (s *StackService) CreateStack(ctx context.Context, name, composeContent string, envContent *string, user models.User) (*models.Stack, error) {
stackID := uuid.New().String()
folderName := s.sanitizeStackName(name)
@@ -319,79 +309,6 @@ func (s *StackService) parseServicesFromComposeFile(ctx context.Context, compose
return services, nil
}
-func (s *StackService) GetStackInfo(ctx context.Context, stackID string) (*StackInfo, error) {
- stack, err := s.GetStackByID(ctx, stackID)
- if err != nil {
- return nil, err
- }
-
- services, err := s.GetStackServices(ctx, stackID)
- if err != nil {
- return nil, err
- }
-
- composeYAML, err := s.getProcessedComposeYAML(ctx, stackID)
- if err != nil {
- composeYAML = ""
- }
-
- serviceCount, runningCount := s.getServiceCounts(services)
-
- status := "stopped"
- if serviceCount > 0 {
- if runningCount == serviceCount {
- status = "running"
- } else if runningCount > 0 {
- status = "partially running"
- }
- }
-
- return &StackInfo{
- ID: stack.ID,
- Name: stack.Name,
- Status: status,
- Services: services,
- ServiceCount: serviceCount,
- RunningCount: runningCount,
- ComposeYAML: composeYAML,
- }, nil
-}
-
-func (s *StackService) getProcessedComposeYAML(ctx context.Context, stackID string) (string, error) {
- stack, err := s.GetStackByID(ctx, stackID)
- if err != nil {
- return "", err
- }
-
- composeFile := s.findComposeFile(stack.Path)
- if composeFile == "" {
- return "", fmt.Errorf("no compose file found")
- }
-
- options, err := cli.NewProjectOptions(
- []string{composeFile},
- cli.WithOsEnv,
- cli.WithDotEnv,
- cli.WithName(stack.Name),
- cli.WithWorkingDirectory(stack.Path),
- )
- if err != nil {
- return "", fmt.Errorf("failed to create project options: %w", err)
- }
-
- project, err := options.LoadProject(ctx)
- if err != nil {
- return "", fmt.Errorf("failed to load project: %w", err)
- }
-
- projectYAML, err := project.MarshalYAML()
- if err != nil {
- return "", fmt.Errorf("failed to marshal YAML: %w", err)
- }
-
- return string(projectYAML), nil
-}
-
func (s *StackService) RestartStack(ctx context.Context, stackID string, user models.User) error {
stack, err := s.GetStackByID(ctx, stackID)
if err != nil {
@@ -531,22 +448,6 @@ processResult:
return result, pagination, nil
}
-func (s *StackService) GetAllStacksWithDiscovery(ctx context.Context) (tracked []models.Stack, external []models.Stack, err error) {
- // Get tracked stacks with live sync
- tracked, err = s.ListStacks(ctx)
- if err != nil {
- return nil, nil, err
- }
-
- // Discover external stacks
- external, err = s.DiscoverExternalStacks(ctx)
- if err != nil {
- return tracked, nil, err
- }
-
- return tracked, external, nil
-}
-
// SyncAllStacksFromFilesystem scans the stacks directory and ensures database is in sync
func (s *StackService) SyncAllStacksFromFilesystem(ctx context.Context) error {
stacksDir, err := s.getStacksDirectory(ctx)
@@ -583,7 +484,7 @@ func (s *StackService) SyncAllStacksFromFilesystem(ctx context.Context) error {
if errors.Is(err, gorm.ErrRecordNotFound) {
// Auto-import external stack
- if _, importErr := s.ImportExternalStack(ctx, dirName, dirName, systemUser); importErr != nil {
+ if _, importErr := s.importExternalStack(ctx, dirName, dirName, systemUser); importErr != nil {
fmt.Printf("Warning: failed to auto-import stack %s: %v\n", dirName, importErr)
}
} else if err == nil {
@@ -827,56 +728,6 @@ func (s *StackService) RedeployStack(ctx context.Context, stackID string, profil
return s.DeployStack(ctx, stackID, systemUser)
}
-// DiscoverExternalStacks scans the configured stacks directory and returns any
-// folders with a compose file not already tracked in the database.
-func (s *StackService) DiscoverExternalStacks(ctx context.Context) ([]models.Stack, error) {
- dir, err := s.getStacksDirectory(ctx)
- if err != nil {
- return nil, fmt.Errorf("failed to get stacks directory: %w", err)
- }
- entries, err := os.ReadDir(dir)
- if err != nil {
- return nil, fmt.Errorf("failed to read stacks directory: %w", err)
- }
- var externals []models.Stack
- for _, e := range entries {
- if !e.IsDir() {
- continue
- }
- name := e.Name()
- path := filepath.Join(dir, name)
- if s.findComposeFile(path) == "" {
- continue
- }
- var count int64
- s.db.WithContext(ctx).
- Model(&models.Stack{}).
- Where("path = ?", path).
- Or("dir_name = ?", name).
- Count(&count)
- if count > 0 {
- continue
- }
-
- // Invoke docker-compose ps to get real status & counts
- status, svcCount, runningCount := models.StackStatusUnknown, 0, 0
- if st, tot, run, err := s.getLiveStackStatus(ctx, path, name); err == nil {
- status, svcCount, runningCount = st, tot, run
- }
-
- externals = append(externals, models.Stack{
- ID: "", // not yet persisted
- Name: name,
- DirName: &name,
- Path: path,
- Status: status,
- ServiceCount: svcCount,
- RunningCount: runningCount,
- })
- }
- return externals, nil
-}
-
// getLiveStackStatus runs `docker-compose ps --format json` in the stackDir
// and returns a status plus total / running service counts.
func (s *StackService) getLiveStackStatus(ctx context.Context, stackDir, projectName string) (models.StackStatus, int, int, error) {
@@ -935,35 +786,6 @@ func (s *StackService) getLiveStackStatus(ctx context.Context, stackDir, project
}
}
-func (s *StackService) ValidateStackCompose(ctx context.Context, composeContent string) error {
- tempDir, err := os.MkdirTemp("", "stack-validation")
- if err != nil {
- return fmt.Errorf("failed to create temp directory: %w", err)
- }
- defer os.RemoveAll(tempDir)
-
- composePath := filepath.Join(tempDir, "compose.yaml")
- if err := os.WriteFile(composePath, []byte(composeContent), 0600); err != nil {
- return fmt.Errorf("failed to write compose file: %w", err)
- }
-
- options, err := cli.NewProjectOptions(
- []string{composePath},
- cli.WithOsEnv,
- cli.WithWorkingDirectory(tempDir),
- )
- if err != nil {
- return fmt.Errorf("failed to create project options: %w", err)
- }
-
- _, err = options.LoadProject(ctx)
- if err != nil {
- return fmt.Errorf("invalid compose file: %w", err)
- }
-
- return nil
-}
-
func (s *StackService) GetStackLogs(ctx context.Context, stackID string, tail int, follow bool) (string, error) {
stack, err := s.GetStackByID(ctx, stackID)
if err != nil {
@@ -1195,40 +1017,33 @@ func (s *StackService) saveStackFiles(stackPath, composeContent string, envConte
return nil
}
-func (s *StackService) findComposeFile(stackDir string) string {
- composeFiles := []string{
- "compose.yaml",
- "compose.yml",
- "docker-compose.yaml",
- "docker-compose.yml",
- }
+// Centralize compose filename candidates once.
+var composeFileCandidates = []string{
+ "compose.yaml",
+ "compose.yml",
+ "docker-compose.yaml",
+ "docker-compose.yml",
+}
- for _, filename := range composeFiles {
+// findFirstExistingComposeFile returns (fullPath, filename) of the first compose file found.
+func findFirstExistingComposeFile(stackDir string) (string, string) {
+ for _, filename := range composeFileCandidates {
fullPath := filepath.Join(stackDir, filename)
- if _, err := os.Stat(fullPath); err == nil {
- return fullPath
+ if info, err := os.Stat(fullPath); err == nil && !info.IsDir() {
+ return fullPath, filename
}
}
+ return "", ""
+}
- return ""
+func (s *StackService) findComposeFile(stackDir string) string {
+ full, _ := findFirstExistingComposeFile(stackDir)
+ return full
}
func (s *StackService) findComposeFileName(stackDir string) string {
- composeFiles := []string{
- "compose.yaml",
- "compose.yml",
- "docker-compose.yaml",
- "docker-compose.yml",
- }
-
- for _, filename := range composeFiles {
- fullPath := filepath.Join(stackDir, filename)
- if _, err := os.Stat(fullPath); err == nil {
- return filename // Return just the filename, not the full path
- }
- }
-
- return ""
+ _, name := findFirstExistingComposeFile(stackDir)
+ return name
}
func (s *StackService) parseComposePS(output string) ([]StackServiceInfo, error) {
@@ -1336,10 +1151,7 @@ func (s *StackService) getServiceCounts(services []StackServiceInfo) (total int,
return total, running
}
-// ImportExternalStack creates a DB record for a compose directory
-// that isn't yet tracked by Arcane.
-func (s *StackService) ImportExternalStack(ctx context.Context, dirName, stackName string, user models.User) (*models.Stack, error) {
- // base path that DiscoverExternalStacks scanned
+func (s *StackService) importExternalStack(ctx context.Context, dirName, stackName string, user models.User) (*models.Stack, error) {
stacksDir, err := s.getStacksDirectory(ctx)
if err != nil {
return nil, fmt.Errorf("failed to get stacks directory: %w", err)