-
Notifications
You must be signed in to change notification settings - Fork 28
docker-engine: add nftables dependencies #284
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
4c733c7 to
e7e1f0e
Compare
e7e1f0e to
9842f13
Compare
thaJeztah
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some quick comments (looks like I didn't look closely at the ce-packaging PR w.r.t. the conditional nftables)
Not a real show-stopper, so I'd be fine to merge as-is (as it looks to match the other PR)
so "LGTM", but happy to hear your thoughts
| rhel*) | ||
| no_libnftables=1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should add a comment why we're skipping it on RHEL (was thinking that later), because RHEL supports it, but it currently requires a subscription to install the required dependencies.
(And, as a further follow-up, we could even consider adding a way to override this, so that it can be built if a subscription is in place)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pkg/docker-engine/verify.Dockerfile
Outdated
| case "$DISTRO_NAME" in | ||
| rhel*) | ||
| ;; | ||
| *) | ||
| dnf install -y nftables |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm.. I now see that we made it optional as well in this case; docker/docker-ce-packaging#1256
Wouldn't shelling out still expect nftables to be present? (Wondering if the conditional Requires was the right choice, or if we just should keep it as Requires unconditionally; in most cases it would already be installed.
We can discuss that with @robmry
Also curious; would these dependencies follow from the RPM spec / package? (as it's listed as Requires in other distros); i.e., could we make use of that, instead of having to manually handle these conditions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should just make it a dependency on RHEL too - was going to update the other PR (docker/docker-ce-packaging#1256 (comment)), but can do it as a follow up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Yeah, it was late, so I probably didn't notice it, but looking again, I was thinking the same ❤️
For the "compile time options"; that's definitely more of a "nice to have" follow-up; i.e., have a way to do compile it with the better option (but require a subscription for that). Good for a follow-up, but possibly something we should make a note of somewhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if there's an easy way to detect if an active subscription is present (because in that case, we could make it detect it, and base the compile-time options on that 🤔)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should just make it a dependency on RHEL too - was going to update the other PR (docker/docker-ce-packaging#1256 (comment)), but can do it as a follow up.
That's done now - docker/docker-ce-packaging#1262
9842f13 to
3b8b36e
Compare
Signed-off-by: CrazyMax <[email protected]>
3b8b36e to
41015c7
Compare
ported from:
relates to https://github.com/docker/packaging/actions/runs/18242560031/job/51946390624#step:7:2360