Skip to content

Modern Docker Management, Designed for Everyone

fix: resolve project status using effective compose project name (#2198)

Giulio Savini7bc80b0b059f
diff --git a/backend/internal/models/project.go b/backend/internal/models/project.go
index 4322d794b..d6b118041 100644
--- a/backend/internal/models/project.go
+++ b/backend/internal/models/project.go
@@ -13,14 +13,15 @@ const (
)
type Project struct {
- Name string `json:"name" sortable:"true"`
- DirName *string `json:"dir_name"`
- Path string `json:"path" sortable:"true" gorm:"uniqueIndex"`
- Status ProjectStatus `json:"status" sortable:"true"`
- StatusReason *string `json:"status_reason"`
- ServiceCount int `json:"service_count" sortable:"true"`
- RunningCount int `json:"running_count" sortable:"true"`
- GitOpsManagedBy *string `json:"gitops_managed_by,omitempty" gorm:"column:gitops_managed_by"`
+ Name string `json:"name" sortable:"true"`
+ DirName *string `json:"dir_name"`
+ Path string `json:"path" sortable:"true" gorm:"uniqueIndex"`
+ Status ProjectStatus `json:"status" sortable:"true"`
+ StatusReason *string `json:"status_reason"`
+ ServiceCount int `json:"service_count" sortable:"true"`
+ RunningCount int `json:"running_count" sortable:"true"`
+ GitOpsManagedBy *string `json:"gitops_managed_by,omitempty" gorm:"column:gitops_managed_by"`
+ ComposeProjectName *string `json:"compose_project_name,omitempty" gorm:"column:compose_project_name"`
BaseModel
}
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index e1d564eb8..9f2c84ebc 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -244,6 +244,20 @@ func buildProjectImagePullPlan(services composetypes.Services) map[string]imageP
return plan
}
+// lookupProjectContainers returns containers matched to a project, trying the
+// normalized directory name first and falling back to the effective compose
+// project name (from COMPOSE_PROJECT_NAME) when it differs.
+func lookupProjectContainers(p models.Project, containersByProject map[string][]container.Summary) []container.Summary {
+ normName := normalizeComposeProjectName(p.Name)
+ if c := containersByProject[normName]; len(c) > 0 {
+ return c
+ }
+ if p.ComposeProjectName != nil && *p.ComposeProjectName != normName {
+ return containersByProject[*p.ComposeProjectName]
+ }
+ return nil
+}
+
func normalizeComposeProjectName(name string) string {
if name == "" {
return ""
@@ -1242,23 +1256,20 @@ func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPa
Where("path = ?", dirPath).
First(&existing).Error
- filesystemProject := models.Project{
- Name: dirName,
- Path: dirPath,
- }
- serviceCount, serviceCountErr := s.countServicesFromCompose(ctx, filesystemProject)
+ serviceCount, composeProjectName, serviceCountErr := s.loadComposeMetadataForSyncInternal(ctx, dirPath, dirName)
if errors.Is(err, gorm.ErrRecordNotFound) {
// Create a minimal project entry
reason := "Project discovered from filesystem, status pending Docker service query"
proj := &models.Project{
- Name: dirName,
- DirName: new(dirName),
- Path: dirPath,
- Status: models.ProjectStatusUnknown,
- StatusReason: new(reason),
- ServiceCount: serviceCount,
- RunningCount: 0,
+ Name: dirName,
+ DirName: new(dirName),
+ Path: dirPath,
+ Status: models.ProjectStatusUnknown,
+ StatusReason: new(reason),
+ ServiceCount: serviceCount,
+ RunningCount: 0,
+ ComposeProjectName: composeProjectName,
}
slog.InfoContext(ctx, "Discovered new project with unknown status",
"project", dirName,
@@ -1288,6 +1299,9 @@ func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPa
} else if serviceCountErr != nil {
slog.WarnContext(ctx, "failed to refresh compose service count during project sync", "projectID", existing.ID, "path", dirPath, "error", serviceCountErr)
}
+ if serviceCountErr == nil && !utils.StringPtrEqual(existing.ComposeProjectName, composeProjectName) {
+ updates["compose_project_name"] = composeProjectName
+ }
if len(updates) == 0 {
return nil
}
@@ -1456,8 +1470,7 @@ func (s *ProjectService) GetProjectStatusCounts(ctx context.Context) (folderCoun
// 3. Calculate status for each project
for _, p := range projectsList {
- normName := normalizeComposeProjectName(p.Name)
- projectContainers := containersByProject[normName]
+ projectContainers := lookupProjectContainers(p, containersByProject)
// Convert to ProjectServiceInfo (minimal needed for calculateProjectStatus)
var services []ProjectServiceInfo
@@ -3334,9 +3347,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir string
resp.IconURL = meta.ProjectIconURL
resp.URLs = meta.ProjectURLS
- // Find containers for this project
- normName := normalizeComposeProjectName(p.Name)
- projectContainers := containersByProject[normName]
+ projectContainers := lookupProjectContainers(p, containersByProject)
var services []ProjectServiceInfo
runningCount := 0
@@ -3465,6 +3476,49 @@ func (s *ProjectService) countServicesFromCompose(ctx context.Context, p models.
return len(proj.Services), nil
}
+// loadComposeMetadataForSyncInternal loads the compose file once and returns
+// both the service count and the effective compose project name. This avoids
+// parsing the compose file twice during project sync (once for service count
+// and once for the project name).
+// The effective name is nil when it matches the normalized directory name.
+func (s *ProjectService) loadComposeMetadataForSyncInternal(ctx context.Context, dirPath, dirName string) (serviceCount int, composeProjectName *string, err error) {
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
+ projectsDirectory, pErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
+ if pErr != nil {
+ return 0, nil, pErr
+ }
+
+ pathMapper, pmErr := s.getPathMapper(ctx)
+ if pmErr != nil {
+ slog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)
+ }
+
+ normName := normalizeComposeProjectName(dirName)
+ autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)
+
+ // First, try loading without forcing a project name so compose-go can
+ // resolve COMPOSE_PROJECT_NAME from the .env file. If this fails (e.g.
+ // no .env and directory name is not a valid compose project name), fall
+ // back to the normalized directory name.
+ proj, _, err := projects.LoadComposeProjectFromDir(ctx, dirPath, "", projectsDirectory, autoInjectEnv, pathMapper)
+ if err != nil {
+ proj, _, err = projects.LoadComposeProjectFromDir(ctx, dirPath, normName, projectsDirectory, autoInjectEnv, pathMapper)
+ if err != nil {
+ return 0, nil, err
+ }
+ }
+
+ serviceCount = len(proj.Services)
+
+ // If compose-go resolved a different name (from COMPOSE_PROJECT_NAME),
+ // store it so we can match containers correctly.
+ if proj.Name != "" && proj.Name != normName {
+ composeProjectName = new(proj.Name)
+ }
+
+ return serviceCount, composeProjectName, nil
+}
+
func (s *ProjectService) calculateProjectStatus(services []ProjectServiceInfo) models.ProjectStatus {
if len(services) == 0 {
return models.ProjectStatusUnknown
diff --git a/backend/pkg/utils/ptr_util.go b/backend/pkg/utils/ptr_util.go
index 9699fabd3..775443827 100644
--- a/backend/pkg/utils/ptr_util.go
+++ b/backend/pkg/utils/ptr_util.go
@@ -6,3 +6,13 @@ func DerefString(p *string) string {
}
return *p
}
+
+func StringPtrEqual(a, b *string) bool {
+ if a == nil && b == nil {
+ return true
+ }
+ if a == nil || b == nil {
+ return false
+ }
+ return *a == *b
+}
diff --git a/backend/resources/migrations/postgres/048_add_compose_project_name.down.sql b/backend/resources/migrations/postgres/048_add_compose_project_name.down.sql
new file mode 100644
index 000000000..03e0bf5c4
--- /dev/null
+++ b/backend/resources/migrations/postgres/048_add_compose_project_name.down.sql
@@ -0,0 +1 @@
+ALTER TABLE projects DROP COLUMN compose_project_name;
diff --git a/backend/resources/migrations/postgres/048_add_compose_project_name.up.sql b/backend/resources/migrations/postgres/048_add_compose_project_name.up.sql
new file mode 100644
index 000000000..9155e4826
--- /dev/null
+++ b/backend/resources/migrations/postgres/048_add_compose_project_name.up.sql
@@ -0,0 +1 @@
+ALTER TABLE projects ADD COLUMN compose_project_name TEXT;
diff --git a/backend/resources/migrations/sqlite/048_add_compose_project_name.down.sql b/backend/resources/migrations/sqlite/048_add_compose_project_name.down.sql
new file mode 100644
index 000000000..517e327b7
--- /dev/null
+++ b/backend/resources/migrations/sqlite/048_add_compose_project_name.down.sql
@@ -0,0 +1,36 @@
+PRAGMA foreign_keys=OFF;
+
+ALTER TABLE projects RENAME TO projects_old;
+
+CREATE TABLE projects (
+ id TEXT PRIMARY KEY,
+ name TEXT NOT NULL,
+ dir_name TEXT,
+ path TEXT NOT NULL,
+ status TEXT NOT NULL,
+ service_count INTEGER NOT NULL DEFAULT 0,
+ running_count INTEGER NOT NULL DEFAULT 0,
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ updated_at DATETIME,
+ status_reason TEXT,
+ gitops_managed_by TEXT
+);
+
+INSERT INTO projects (
+ id, name, dir_name, path, status, service_count, running_count,
+ created_at, updated_at, status_reason, gitops_managed_by
+)
+SELECT
+ id, name, dir_name, path, status, service_count, running_count,
+ created_at, updated_at, status_reason, gitops_managed_by
+FROM projects_old;
+
+DROP TABLE projects_old;
+
+CREATE INDEX IF NOT EXISTS idx_projects_status ON projects(status);
+CREATE INDEX IF NOT EXISTS idx_projects_name ON projects(name);
+CREATE INDEX IF NOT EXISTS idx_projects_gitops_managed_by ON projects(gitops_managed_by);
+CREATE INDEX IF NOT EXISTS idx_projects_dir_name_not_null ON projects(dir_name) WHERE dir_name IS NOT NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_projects_path_unique ON projects(path);
+
+PRAGMA foreign_keys=ON;
diff --git a/backend/resources/migrations/sqlite/048_add_compose_project_name.up.sql b/backend/resources/migrations/sqlite/048_add_compose_project_name.up.sql
new file mode 100644
index 000000000..9155e4826
--- /dev/null
+++ b/backend/resources/migrations/sqlite/048_add_compose_project_name.up.sql
@@ -0,0 +1 @@
+ALTER TABLE projects ADD COLUMN compose_project_name TEXT;