Merge pull request docker#10591 from ndeloof/fix_detect_swarm_enabled

glours · web-flow · commit 70953b18c091 · 2023-05-22T09:25:56.000+02:00
fix detection of swarm mode
diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go
@@ -277,8 +277,11 @@ func (s *composeService) isSWarmEnabled(ctx context.Context) (bool, error) {
 		if err != nil {
 			swarmEnabled.err = err
 		}
-		if info.Swarm.LocalNodeState == swarm.LocalNodeStateInactive {
-			swarmEnabled.val = info.Swarm.LocalNodeState == swarm.LocalNodeStateInactive
+		switch info.Swarm.LocalNodeState {
+		case swarm.LocalNodeStateInactive, swarm.LocalNodeStateLocked:
+			swarmEnabled.val = false
+		default:
+			swarmEnabled.val = true
 		}
 	})
 	return swarmEnabled.val, swarmEnabled.err

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,11 @@ func (s *composeService) isSWarmEnabled(ctx context.Context) (bool, error) {`
`277`	`277`	`if err != nil {`
`278`	`278`	`swarmEnabled.err = err`
`279`	`279`	`}`
`280`		`- if info.Swarm.LocalNodeState == swarm.LocalNodeStateInactive {`
`281`		`- swarmEnabled.val = info.Swarm.LocalNodeState == swarm.LocalNodeStateInactive`
	`280`	`+ switch info.Swarm.LocalNodeState {`
	`281`	`+ case swarm.LocalNodeStateInactive, swarm.LocalNodeStateLocked:`
	`282`	`+ swarmEnabled.val = false`
	`283`	`+ default:`
	`284`	`+ swarmEnabled.val = true`
`282`	`285`	`}`
`283`	`286`	`})`
`284`	`287`	`return swarmEnabled.val, swarmEnabled.err`