Skip to content

Modern Docker Management, Designed for Everyone

fix: refresh project detail runtime status (#2602)

Kyle Mendellf9021235291c
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 7bac68449..165f85d5c 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -976,34 +976,24 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string
}
s.enrichWithGitOpsInfo(ctx, proj, &resp)
- // Get runtime services and update status/counts
- if opts.IncludeRuntimeServices {
- services, serr := s.GetProjectServices(ctx, projectID)
- if serr == nil && services != nil {
- resp.ServiceCount = len(services)
- _, runningCount := s.getServiceCounts(services)
- resp.RunningCount = runningCount
- resp.Status = string(s.calculateProjectStatus(services))
-
- runtimeServices := make([]project.RuntimeService, len(services))
- for i, svc := range services {
- runtimeServices[i] = project.RuntimeService{
- Name: svc.Name,
- Image: svc.Image,
- Status: svc.Status,
- ContainerID: svc.ContainerID,
- ContainerName: svc.ContainerName,
- Ports: svc.Ports,
- Health: svc.Health,
- IconURL: svc.IconURL,
- ServiceConfig: svc.ServiceConfig,
- RedeployDisabled: svc.RedeployDisabled,
- }
+ // Refresh runtime status/counts even when callers do not request the full
+ // runtime service array. DB values are only a fallback when Docker lookup
+ // or compose loading fails.
+ services, serr := s.GetProjectServices(ctx, projectID)
+ if serr == nil && services != nil {
+ resp.ServiceCount = len(services)
+ _, runningCount := s.getServiceCounts(services)
+ resp.RunningCount = runningCount
+ resp.Status = string(s.calculateProjectStatus(services))
+
+ if opts.IncludeRuntimeServices {
+ resp.RuntimeServices = buildProjectRuntimeServicesInternal(services)
+ for _, svc := range services {
if svc.RedeployDisabled {
resp.RedeployDisabled = true
+ break
}
}
- resp.RuntimeServices = runtimeServices
}
}
@@ -1014,6 +1004,25 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string
return resp, nil
}
+func buildProjectRuntimeServicesInternal(services []ProjectServiceInfo) []project.RuntimeService {
+ runtimeServices := make([]project.RuntimeService, len(services))
+ for i, svc := range services {
+ runtimeServices[i] = project.RuntimeService{
+ Name: svc.Name,
+ Image: svc.Image,
+ Status: svc.Status,
+ ContainerID: svc.ContainerID,
+ ContainerName: svc.ContainerName,
+ Ports: svc.Ports,
+ Health: svc.Health,
+ IconURL: svc.IconURL,
+ ServiceConfig: svc.ServiceConfig,
+ RedeployDisabled: svc.RedeployDisabled,
+ }
+ }
+ return runtimeServices
+}
+
func (s *ProjectService) GetProjectFileContent(ctx context.Context, projectID, relativePath string) (project.IncludeFile, error) {
proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)
if err != nil {
diff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.go
index 3e74db53e..584f4db26 100644
--- a/backend/internal/services/project_service_test.go
+++ b/backend/internal/services/project_service_test.go
@@ -8,6 +8,7 @@ import (
"io"
"net/http"
"net/http/httptest"
+ "net/netip"
"net/url"
"os"
"path/filepath"
@@ -16,6 +17,7 @@ import (
"time"
composetypes "github.com/compose-spec/compose-go/v2/types"
+ composeapi "github.com/docker/compose/v5/pkg/api"
"github.com/getarcaneapp/arcane/backend/internal/common"
"github.com/getarcaneapp/arcane/backend/internal/config"
libupdater "github.com/getarcaneapp/arcane/backend/pkg/libarcane/updater"
@@ -1984,6 +1986,133 @@ func TestProjectService_GetProjectDetails_IncludesUpdateInfo(t *testing.T) {
assert.Equal(t, []string{"nginx:latest"}, details.UpdateInfo.UpdatedImageRefs)
}
+func TestProjectService_GetProjectDetails_RefreshesRuntimeStatusWithoutRuntimeServices(t *testing.T) {
+ db := setupProjectTestDB(t)
+ ctx := context.Background()
+
+ projectsDir := t.TempDir()
+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)
+
+ settingsService, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
+
+ projectPath := createComposeProjectDir(t, projectsDir, "projectA")
+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n server:\n image: nginx:alpine\n worker:\n image: busybox:latest\n"), 0o644))
+
+ server := newProjectRuntimeDockerServerInternal(t, []container.Summary{
+ {
+ ID: "server-container",
+ Names: []string{"/projecta-server-1"},
+ Image: "nginx:alpine",
+ State: container.StateRunning,
+ Status: "Up 30 seconds (healthy)",
+ Ports: []container.PortSummary{
+ {
+ IP: netip.MustParseAddr("0.0.0.0"),
+ PrivatePort: 80,
+ PublicPort: 8080,
+ Type: "tcp",
+ },
+ },
+ Labels: map[string]string{
+ composeapi.ProjectLabel: "projecta",
+ composeapi.ServiceLabel: "server",
+ composeapi.ConfigHashLabel: "server-hash",
+ composeapi.WorkingDirLabel: "/host/path/projects/projectA",
+ },
+ },
+ {
+ ID: "worker-container",
+ Names: []string{"/projecta-worker-1"},
+ Image: "busybox:latest",
+ State: container.StateRunning,
+ Status: "Up 30 seconds",
+ Labels: map[string]string{
+ composeapi.ProjectLabel: "projecta",
+ composeapi.ServiceLabel: "worker",
+ composeapi.ConfigHashLabel: "worker-hash",
+ composeapi.WorkingDirLabel: "/host/path/projects/projectA",
+ },
+ },
+ })
+ t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURLInternal(t, server.URL))
+
+ projectRecord := &models.Project{
+ BaseModel: models.BaseModel{ID: "proj-runtime-refresh"},
+ Name: "projectA",
+ DirName: ptr("projectA"),
+ Path: projectPath,
+ Status: models.ProjectStatusStopped,
+ ServiceCount: 2,
+ RunningCount: 0,
+ }
+ require.NoError(t, db.Create(projectRecord).Error)
+
+ svc := NewProjectService(db, settingsService, nil, nil, nil, nil, config.Load())
+
+ details, err := svc.GetProjectDetails(ctx, projectRecord.ID, projecttypes.DetailsOptions{})
+ require.NoError(t, err)
+ assert.Equal(t, string(models.ProjectStatusRunning), details.Status)
+ assert.Equal(t, 2, details.ServiceCount)
+ assert.Equal(t, 2, details.RunningCount)
+ assert.Empty(t, details.RuntimeServices)
+}
+
+func TestProjectService_GetProjectDetails_PopulatesRuntimeServicesFromComposePs(t *testing.T) {
+ db := setupProjectTestDB(t)
+ ctx := context.Background()
+
+ projectsDir := t.TempDir()
+ t.Setenv("PROJECTS_DIRECTORY", projectsDir)
+
+ settingsService, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsDir))
+
+ projectPath := createComposeProjectDir(t, projectsDir, "projectA")
+ require.NoError(t, os.WriteFile(filepath.Join(projectPath, "compose.yaml"), []byte("services:\n server:\n image: nginx:alpine\n"), 0o644))
+
+ server := newProjectRuntimeDockerServerInternal(t, []container.Summary{
+ {
+ ID: "server-container",
+ Names: []string{"/projecta-server-1"},
+ Image: "nginx:alpine",
+ State: container.StateRunning,
+ Status: "Up 30 seconds",
+ Labels: map[string]string{
+ composeapi.ProjectLabel: "projecta",
+ composeapi.ServiceLabel: "server",
+ composeapi.ConfigHashLabel: "server-hash",
+ composeapi.WorkingDirLabel: "/host/path/projects/projectA",
+ },
+ },
+ })
+ t.Setenv("DOCKER_HOST", dockerHostFromProjectRuntimeServerURLInternal(t, server.URL))
+
+ projectRecord := &models.Project{
+ BaseModel: models.BaseModel{ID: "proj-runtime-services"},
+ Name: "projectA",
+ DirName: ptr("projectA"),
+ Path: projectPath,
+ Status: models.ProjectStatusStopped,
+ ServiceCount: 1,
+ RunningCount: 0,
+ }
+ require.NoError(t, db.Create(projectRecord).Error)
+
+ svc := NewProjectService(db, settingsService, nil, nil, nil, nil, config.Load())
+
+ details, err := svc.GetProjectDetails(ctx, projectRecord.ID, projecttypes.DetailsOptions{IncludeRuntimeServices: true})
+ require.NoError(t, err)
+ require.Len(t, details.RuntimeServices, 1)
+ assert.Equal(t, string(models.ProjectStatusRunning), details.Status)
+ assert.Equal(t, "server", details.RuntimeServices[0].Name)
+ assert.Equal(t, "running", details.RuntimeServices[0].Status)
+ assert.Equal(t, "server-container", details.RuntimeServices[0].ContainerID)
+ assert.Equal(t, "projecta-server-1", details.RuntimeServices[0].ContainerName)
+}
+
func TestProjectService_ListProjects_FiltersByUpdateStatus(t *testing.T) {
db := setupProjectTestDB(t)
ctx := context.Background()
@@ -3371,6 +3500,56 @@ func createComposeProjectDir(t *testing.T, root, name string) string {
return projectPath
}
+func newProjectRuntimeDockerServerInternal(t *testing.T, containers []container.Summary) *httptest.Server {
+ t.Helper()
+
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ switch {
+ case strings.HasSuffix(r.URL.Path, "/_ping"):
+ _, _ = io.WriteString(w, "OK")
+ case strings.HasSuffix(r.URL.Path, "/version"):
+ w.Header().Set("Content-Type", "application/json")
+ _ = json.NewEncoder(w).Encode(map[string]string{
+ "ApiVersion": "1.41",
+ "MinAPIVersion": "1.24",
+ "Version": "24.0.0",
+ })
+ case strings.HasSuffix(r.URL.Path, "/containers/json"):
+ w.Header().Set("Content-Type", "application/json")
+ _ = json.NewEncoder(w).Encode(containers)
+ case strings.Contains(r.URL.Path, "/containers/") && strings.HasSuffix(r.URL.Path, "/json"):
+ containerID := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path[strings.LastIndex(r.URL.Path, "/containers/"):], "/containers/"), "/json")
+ for _, c := range containers {
+ if c.ID != containerID {
+ continue
+ }
+ w.Header().Set("Content-Type", "application/json")
+ _ = json.NewEncoder(w).Encode(container.InspectResponse{
+ ID: c.ID,
+ State: &container.State{
+ Status: c.State,
+ Running: c.State == container.StateRunning,
+ },
+ })
+ return
+ }
+ http.NotFound(w, r)
+ default:
+ http.NotFound(w, r)
+ }
+ }))
+ t.Cleanup(server.Close)
+ return server
+}
+
+func dockerHostFromProjectRuntimeServerURLInternal(t *testing.T, serverURL string) string {
+ t.Helper()
+
+ parsed, err := url.Parse(serverURL)
+ require.NoError(t, err)
+ return "tcp://" + parsed.Host
+}
+
//go:fix inline
func ptr(v string) *string {
return new(v)
diff --git a/backend/pkg/projects/cmds.go b/backend/pkg/projects/cmds.go
index ad78309a5..be825ee11 100644
--- a/backend/pkg/projects/cmds.go
+++ b/backend/pkg/projects/cmds.go
@@ -252,7 +252,7 @@ func ComposePs(ctx context.Context, proj *types.Project, services []string, all
}
defer func() { _ = c.Close() }()
- return c.svc.Ps(ctx, proj.Name, api.PsOptions{All: all})
+ return c.svc.Ps(ctx, proj.Name, api.PsOptions{All: all, Services: services})
}
func ComposeDown(ctx context.Context, proj *types.Project, removeVolumes bool) error {