tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from ndeloof/swarm_overlay_network 

don't check external network existence when swarm is enabled
This commit is contained in:
Guillaume Lours 2024-01-29 20:11:13 +01:00 committed by GitHub
parent cdb6eb55d5 da1a34a8f2
commit ac8ea082a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
pkg/compose
create.go

11
pkg/compose/create.go
View File

@ -1246,20 +1246,17 @@ func (s *composeService) resolveExternalNetwork(ctx context.Context, n *types.Ne
n.Name = networks[0].ID n.Name = networks[0].ID
return nil return nil
case 0: case 0:
if n.Driver == "overlay" {
// Swarm nodes do not register overlay networks that were
// created on a different node unless they're in use.
// Here we assume `driver` is relevant for a network we don't manage
// which is a non-sense, but this is our legacy ¯\(ツ)/¯
// networkAttach will later fail anyway if network actually doesn't exists
enabled, err := s.isSWarmEnabled(ctx) enabled, err := s.isSWarmEnabled(ctx)
if err != nil { if err != nil {
return err return err
} }
if enabled { if enabled {
// Swarm nodes do not register overlay networks that were
// created on a different node unless they're in use.
// So we can't preemptively check network exists, but
// networkAttach will later fail anyway if network actually doesn't exists
return nil return nil
} }
}
return fmt.Errorf("network %s declared as external, but could not be found", n.Name) return fmt.Errorf("network %s declared as external, but could not be found", n.Name)
default: default:
return fmt.Errorf("multiple networks with name %q were found. Use network ID as `name` to avoid ambiguity", n.Name) return fmt.Errorf("multiple networks with name %q were found. Use network ID as `name` to avoid ambiguity", n.Name)