Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(swarm): unlock locked managers, accept spec durations, fix stack source and delete (#4505)
José M. Requena Plens78a02e10082a
diff --git a/backend/internal/swarm/children/services/service.go b/backend/internal/swarm/children/services/service.goindex 862cc88ec..e96401f47 100644--- a/backend/internal/swarm/children/services/service.go+++ b/backend/internal/swarm/children/services/service.go@@ -3,6 +3,7 @@ package servicesimport ("cmp""context"+ stdjson "encoding/json""encoding/json/v2""fmt""maps"@@ -263,7 +264,8 @@ func (s *Service) CreateService(ctx context.Context, req swarmtypes.ServiceCreat// Unmarshal spec from JSONvar spec swarm.ServiceSpec- if unmarshalErr := json.Unmarshal(req.Spec, &spec); unmarshalErr != nil {+ // Docker encodes durations as integer nanoseconds.+ if unmarshalErr := json.Unmarshal(req.Spec, &spec, stdjson.FormatDurationAsNano(true)); unmarshalErr != nil {return nil, fmt.Errorf("failed to parse service spec: %w", unmarshalErr)}diff --git a/backend/internal/swarm/children/stacks/service.go b/backend/internal/swarm/children/stacks/service.goindex 3dd1fdcb9..9e0b11bcb 100644--- a/backend/internal/swarm/children/stacks/service.go+++ b/backend/internal/swarm/children/stacks/service.go@@ -7,6 +7,7 @@ import ("fmt""io/fs""log/slog"+ "os""path""path/filepath""slices"@@ -471,7 +472,7 @@ func (s *Service) RemoveStack(ctx context.Context, environmentID, stackName strireturn persistedErr}} else {- if removeStackServicesErr := s.removeStackServices(ctx, services); removeStackServicesErr != nil {+ if removeStackServicesErr := s.removeStackServices(ctx, stackName, services); removeStackServicesErr != nil {return removeStackServicesErr}}@@ -492,7 +493,7 @@ func (s *Service) RemoveStack(ctx context.Context, environmentID, stackName strireturn nil}-func (s *Service) removeStackServices(ctx context.Context, services []swarm.Service) error {+func (s *Service) removeStackServices(ctx context.Context, stackName string, services []swarm.Service) error {serviceIDs := make(map[string]struct{}, len(services))for _, service := range services {serviceIDs[service.ID] = struct{}{}@@ -503,7 +504,7 @@ func (s *Service) removeStackServices(ctx context.Context, services []swarm.Serv}}- if err := s.waitForRemovedServiceTasks(ctx, serviceIDs, 30*time.Second); err != nil {+ if err := s.waitForRemovedServiceTasks(ctx, stackName, serviceIDs, 30*time.Second); err != nil {return err}@@ -610,7 +611,7 @@ func (s *Service) listStackServicesRaw(ctx context.Context, stackName string) ([return servicesResult.Items, nil}-func (s *Service) waitForRemovedServiceTasks(ctx context.Context, serviceIDs map[string]struct{}, timeout time.Duration) error {+func (s *Service) waitForRemovedServiceTasks(ctx context.Context, stackName string, serviceIDs map[string]struct{}, timeout time.Duration) error {if len(serviceIDs) == 0 {return nil}@@ -621,10 +622,8 @@ func (s *Service) waitForRemovedServiceTasks(ctx context.Context, serviceIDs mapticker := time.NewTicker(time.Second)defer ticker.Stop()- taskFilters := make(client.Filters)- for serviceID := range serviceIDs {- taskFilters.Add("service", serviceID)- }+ // Docker rejects a service filter naming a removed service, so filter by stack label.+ taskFilters := make(client.Filters).Add("label", fmt.Sprintf("%s=%s", swarmtypes.StackNamespaceLabel, stackName))for {tasksResult, err := s.docker.Call(waitCtx, func(ctx context.Context, dockerClient *client.Client) (client.TaskListResult, error) {@@ -635,6 +634,9 @@ func (s *Service) waitForRemovedServiceTasks(ctx context.Context, serviceIDs map}hasActiveTasks := slices.ContainsFunc(tasksResult.Items, func(task swarm.Task) bool {+ if _, removed := serviceIDs[task.ServiceID]; !removed {+ return false+ }return !slices.Contains([]swarm.TaskState{swarm.TaskStateComplete,swarm.TaskStateShutdown,@@ -671,6 +673,10 @@ func (s *Service) upsertStackSource(ctx context.Context, environmentID, stackNamif err != nil {return fmt.Errorf("swarm stack source directory is outside its root: %w", err)}+ // os rather than acfs: acfs can only open a root that already exists.+ if mkdirAllErr := os.MkdirAll(rootDir, utils.DirPerm); mkdirAllErr != nil {+ return fmt.Errorf("failed to create swarm stack source root: %w", mkdirAllErr)+ }if mkdirAllErr := acfs.MkdirAll(ctx, rootDir, stackLogical, utils.DirPerm); mkdirAllErr != nil {return fmt.Errorf("failed to create swarm stack source directory: %w", mkdirAllErr)}diff --git a/backend/internal/swarm/service.go b/backend/internal/swarm/service.goindex 6c3b5346f..da15018f7 100644--- a/backend/internal/swarm/service.go+++ b/backend/internal/swarm/service.go@@ -191,10 +191,15 @@ func (s *SwarmService) LeaveSwarm(ctx context.Context, req swarmtypes.SwarmLeave}func (s *SwarmService) UnlockSwarm(ctx context.Context, req swarmtypes.SwarmUnlockRequest) error {- if _, err := s.ensureSwarmActive(ctx); err != nil {+ info, err := s.getDockerInfo(ctx)+ if err != nil {return err}+ if info.Swarm.LocalNodeState != swarm.LocalNodeStateLocked && info.Swarm.LocalNodeState != swarm.LocalNodeStateActive {+ return common.Classify(common.ErrSwarmNotEnabled, errors.New("Swarm mode is not enabled")) //nolint:staticcheck // Preserve the existing error message.+ }+if _, swarmUnlockErr := s.dockerService.Call(ctx, func(ctx context.Context, dockerClient *client.Client) (client.SwarmUnlockResult, error) {return dockerClient.SwarmUnlock(ctx, client.SwarmUnlockOptions{Key: req.Key})}); swarmUnlockErr != nil {@@ -374,7 +379,8 @@ func decodeSwarmSpec(raw stdjson.RawMessage) (swarm.Spec, error) {}var spec swarm.Spec- if err := json.Unmarshal(trimmed, &spec); err != nil {+ // Docker encodes durations as integer nanoseconds.+ if err := json.Unmarshal(trimmed, &spec, stdjson.FormatDurationAsNano(true)); err != nil {return swarm.Spec{}, fmt.Errorf("failed to parse swarm spec: %w", err)}