-
Notifications
You must be signed in to change notification settings - Fork 18.9k
Remove Upstart and cgroups bits from Debian sysvinit script #45548
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
Upstart has been EOL for 8 years and isn't used by any distributions we support any more. Additionally, this removes the "cgroups v1" setup code because it's more reasonable now for us to expect something _else_ to have set up cgroups appropriately (especially cgroups v2). Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
ctalledo
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.
LGTM ... thanks!
|
@tianon: is this the same script that gets installed under |
|
Yep, the very same! |
|
Oh, I guess we make a copy at https://github.com/docker/docker-ce-packaging/blob/dcebf9d2dcfd61e22b7a83b442697221084c91d4/deb/common/docker-ce.docker.init that we'll need to update also... |
|
Ah, yeah; can we do the same as for the systemd unit, and make the packaging repo scripts take the file from this repo? |
No, the systemd unit doesn't include this function because with systemd we get to assume cgroups are set up appropriately (as systemd itself does that).
Yes* * the way that's normally done in "proper" Debian packaging is making the file I linked into a dangling symlink such that when the package is built, it links to the appropriate place from the "orig" source, but I don't remember enough about the build process in that repository to know whether that would work as-is or if we have to do something more complex like bringing the file into the right place during the build. (See https://github.com/tianon/debian-moby/blob/cc1c7d4d1c1b77b220b55cd93213d3682e778f87/moby-engine/debian/moby-engine.udev for an example of what I mean by "dangling" symlink - it's a symlink that points to a file that doesn't exist in the Git repository, but it does exist in the appropriate place during the actual package build.) |
|
We technically have moby/contrib/init/upstart/docker.conf Lines 16 to 37 in 405f458
Edit: done in #45551 |
Ah, sorry, I mostly meant the "second part" (make sure Dangling symlink could work (or perhaps a "copy the file" as part of packaging if we don't like the dangling symlink?) |
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.
LGTM
|
@thaJeztah: would this fix be present in the next Docker Engine release (and when would that be)? |
|
I think we'll have a 24.0.2 relatively soon with some correctness fixes for issues we already identified; I'm not sure that getting this into the packaging side (which is still unsolved/todo as you can see from the above conversation) will be a blocker. That being said we can likely get this out in a couple of weeks worst-case, but this is a pretty rough band-aid (I will try and discuss more of my concerns in the email thread with the WSL team)/probably not the right way to solve the WSL 'problem.' |
Upstart has been EOL for 8 years and isn't used by any distributions we support any more.
Additionally, this removes the "cgroups v1" setup code because it's more reasonable now for us to expect something else to have set up cgroups appropriately (especially cgroups v2).
Honestly, I think we should probably go further and deprecate our sysvinit scripts entirely, but this is a hopefully less controversial change.