diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2023-04-25 11:07:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 11:07:57 -0700 |
| commit | 0970cb054c9606c727dda5240750482d0f40f729 (patch) | |
| tree | cc5632179c73ba70b346181eb9b13ff1a708aabf /daemon | |
| parent | 801202349ab04a329c32da5612f230689c54eb91 (diff) | |
| parent | 2d31697d82df61ab78b583818f4106c36cf20cec (diff) | |
| download | docker-0970cb054c9606c727dda5240750482d0f40f729.tar.gz | |
Merge pull request #45366 from akerouanton/fix-docker0-PreferredPool
daemon: set docker0 subpool as the IPAM pool
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/daemon_unix.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 2d32d19a8e..3a1e46add7 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -997,6 +997,9 @@ func initBridgeDriver(controller *libnetwork.Controller, config *config.Config) } ipamV4Conf.SubPool = fCIDR.String() + if ipamV4Conf.PreferredPool == "" { + ipamV4Conf.PreferredPool = fCIDR.String() + } } if config.BridgeConfig.DefaultGatewayIPv4 != nil { |