Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 18, 2023

@thaJeztah
Copy link
Member Author

OH! I guess for the 23.0 branch we need to cherry-pick the original PR instead;

#21 0.266 ---> Making bundle: binary (in /tmp/bundles/binary)
#21 0.284 Building static /tmp/bundles/binary-daemon/dockerd (linux/amd64)...
#21 56.70 # github.com/docker/docker/libnetwork
#21 56.70 libnetwork/controller.go:1306:10: undefined: Controller
#21 56.70 libnetwork/firewall_linux.go:33:37: ctrl.ip6tablesEnabled undefined (type *controller has no field or method ip6tablesEnabled)

@neersighted would you have time to look at that, or want me to dig into this?

@neersighted
Copy link
Member

Yeah, since @corhere's refactoring is not being backported, we need to take the original. I can fix up this PR in a bit.

@neersighted neersighted force-pushed the 23.0_backport_reimplement_44706 branch from 5a27810 to 431f7ba Compare January 18, 2023 19:23
@neersighted neersighted changed the title [23.0 backport] libnetwork: Support IPv6 in arrangeUserFilterRule() (redux) [23.0 backport] libnetwork: Support IPv6 in arrangeUserFilterRule() Jan 18, 2023
@thaJeztah
Copy link
Member Author

Thanks! Looks like there's still one failure;

#21 55.13 libnetwork/controller.go:1314:25: c.cfg.DriverCfg undefined (type *config.Config has no field or method DriverCfg)

@neersighted
Copy link
Member

That's a result of the changes backported in #44728 -- we should probably look at that one first.

@tungmeoo

This comment was marked as off-topic.

Fixes moby#44451.

Signed-off-by: Albin Kerouanton <[email protected]>
(cherry picked from commit 2d397be)
Signed-off-by: Bjorn Neergaard <[email protected]>
@neersighted neersighted force-pushed the 23.0_backport_reimplement_44706 branch from 431f7ba to 2616ebc Compare January 19, 2023 15:19
@corhere corhere merged commit cd5e05e into moby:23.0 Jan 19, 2023
@thaJeztah thaJeztah deleted the 23.0_backport_reimplement_44706 branch January 19, 2023 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants