Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #29418 from aboch/p66
Browse files Browse the repository at this point in the history
[1.13.x] Fix buildIpamResources()
(cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 27498a3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
  • Loading branch information
vieux authored and seemethere committed Jun 10, 2017
1 parent a9a1a9c commit 091732e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions components/engine/api/server/router/network/network_routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)

if !hasIpv6Conf {
for _, ip6Info := range ipv6Info {
if ip6Info.IPAMData.Pool == nil {
continue
}
iData := network.IPAMConfig{}
iData.Subnet = ip6Info.IPAMData.Pool.String()
iData.Gateway = ip6Info.IPAMData.Gateway.String()
Expand Down

0 comments on commit 091732e

Please sign in to comment.