Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: gate project archiving on live Docker state instead of stale persisted status
Kyle Mendellc487936819c6
diff --git a/backend/internal/project/project_lifecycle.go b/backend/internal/project/project_lifecycle.goindex a1cc25ad0..0e441901d 100644--- a/backend/internal/project/project_lifecycle.go+++ b/backend/internal/project/project_lifecycle.go@@ -177,23 +177,6 @@ func ensureProjectMutableInternal(proj *models.Project) error {return nil}-func isProjectArchiveBlockedInternal(proj *models.Project) bool {- if proj == nil {- return false- }- if proj.RunningCount > 0 {- return true- }- switch proj.Status {- case models.ProjectStatusRunning, models.ProjectStatusPartiallyRunning, models.ProjectStatusDeploying, models.ProjectStatusRestarting:- return true- case models.ProjectStatusStopped, models.ProjectStatusUnknown, models.ProjectStatusStopping:- return false- default:- return false- }-}-func (s *ProjectService) ArchiveProject(ctx context.Context, projectID string, user models.User) error {proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)if err != nil {@@ -202,8 +185,19 @@ func (s *ProjectService) ArchiveProject(ctx context.Context, projectID string, uif proj.IsArchived {return nil}- if isProjectArchiveBlockedInternal(proj) {- return common.Classify(common.ErrProjectMustBeStopped, errors.New("project must be stopped before archiving"))++ // Gate on live Docker state, not the persisted status row, which can go+ // stale when containers are stopped outside an Arcane project action.+ // A project without a compose file cannot have managed containers running+ // and is a prime archive candidate, so it is allowed through.+ services, servicesErr := s.GetProjectServices(ctx, projectID)+ switch {+ case servicesErr != nil && !errors.Is(servicesErr, common.ErrProjectComposeFileNotFound):+ return errors.WrapIf(servicesErr, "cannot verify project is stopped before archiving")+ case servicesErr == nil:+ if _, running := getServiceCounts(services); running > 0 {+ return common.Classify(common.ErrProjectMustBeStopped, errors.New("project must be stopped before archiving"))+ }}now := time.Now()diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.goindex 993aa5f2b..9440704b7 100644--- a/backend/internal/project/service_test.go+++ b/backend/internal/project/service_test.go@@ -3813,15 +3813,31 @@ func TestProjectService_ArchiveProject_RequiresStoppedProject(t *testing.T) {require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))projectPath := createComposeProjectDir(t, projectsRoot, "running-demo")+ // DB row says stopped; the live Docker state below is what must block the archive.require.NoError(t, db.Create(&models.Project{- BaseModel: models.BaseModel{ID: "project-running"},- Name: "running-demo",- DirName: ptr("running-demo"),- Path: projectPath,- Status: models.ProjectStatusRunning,- RunningCount: 1,+ BaseModel: models.BaseModel{ID: "project-running"},+ Name: "running-demo",+ DirName: ptr("running-demo"),+ Path: projectPath,+ Status: models.ProjectStatusStopped,}).Error)+ configureProjectRuntimeDockerInternal(t, []container.Summary{+ {+ ID: "app-container",+ Names: []string{"/running-demo-app-1"},+ Image: "nginx:alpine",+ State: container.StateRunning,+ Status: "Up 30 seconds",+ Labels: map[string]string{+ composeapi.ProjectLabel: "running-demo",+ composeapi.ServiceLabel: "app",+ composeapi.ConfigHashLabel: "app-hash",+ composeapi.WorkingDirLabel: "/host/path/projects/running-demo",+ },+ },+ })+svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load())err = svc.ArchiveProject(ctx, "project-running", models.User{BaseModel: models.BaseModel{ID: "user-1"}, Username: "tester"})require.Error(t, err)@@ -3851,6 +3867,8 @@ func TestProjectService_ArchiveProject_TogglesArchiveFlag(t *testing.T) {Status: models.ProjectStatusStopped,}).Error)+ configureProjectRuntimeDockerInternal(t, nil)+svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load())user := models.User{BaseModel: models.BaseModel{ID: "user-1"}, Username: "tester"}@@ -3867,6 +3885,51 @@ func TestProjectService_ArchiveProject_TogglesArchiveFlag(t *testing.T) {assert.Nil(t, unarchived.ArchivedAt)}+func TestProjectService_ArchiveProject_LiveVerificationErrorPolicy(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ projectsRoot := t.TempDir()+ settingsService, err := newSettingsServiceForTestInternal(t, ctx, db)+ require.NoError(t, err)+ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))++ unreachablePath := createComposeProjectDir(t, projectsRoot, "unreachable-demo")+ require.NoError(t, db.Create(&models.Project{+ BaseModel: models.BaseModel{ID: "project-unreachable"},+ Name: "unreachable-demo",+ DirName: ptr("unreachable-demo"),+ Path: unreachablePath,+ Status: models.ProjectStatusStopped,+ }).Error)++ noComposePath := filepath.Join(projectsRoot, "no-compose-demo")+ require.NoError(t, os.MkdirAll(noComposePath, 0o755))+ require.NoError(t, db.Create(&models.Project{+ BaseModel: models.BaseModel{ID: "project-no-compose"},+ Name: "no-compose-demo",+ DirName: ptr("no-compose-demo"),+ Path: noComposePath,+ Status: models.ProjectStatusStopped,+ }).Error)++ t.Setenv("DOCKER_HOST", "tcp://127.0.0.1:1")++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil, nil, nil, config.Load())+ user := models.User{BaseModel: models.BaseModel{ID: "user-1"}, Username: "tester"}++ err = svc.ArchiveProject(ctx, "project-unreachable", user)+ require.Error(t, err)+ var stored models.Project+ require.NoError(t, db.First(&stored, "id = ?", "project-unreachable").Error)+ assert.False(t, stored.IsArchived)++ require.NoError(t, svc.ArchiveProject(ctx, "project-no-compose", user))+ var archived models.Project+ require.NoError(t, db.First(&archived, "id = ?", "project-no-compose").Error)+ assert.True(t, archived.IsArchived)+}+func TestProjectService_MapProjectToDto_SetsRedeployDisabledFromRuntimeServices(t *testing.T) {projectPath := filepath.Join(t.TempDir(), "arcane")now := time.Now()