Skip to content

[20.10 backport] rootless: prevent the service hanging when stopping (set systemd KillMode to mixed) #41956

Merged
cpuguy83 merged 1 commit into
moby:20.10from
AkihiroSuda:cherrypick-41947-2010
Feb 2, 2021
Merged

[20.10 backport] rootless: prevent the service hanging when stopping (set systemd KillMode to mixed) #41956
cpuguy83 merged 1 commit into
moby:20.10from
AkihiroSuda:cherrypick-41947-2010

Conversation

@AkihiroSuda

Copy link
Copy Markdown
Member

Cherry-pick #41947

Now `systemctl --user stop docker` completes just with in 1 or 2 seconds.

Fix issue 41944 ("Docker rootless does not exit properly if containers are running")

See systemd.kill(5) https://www.freedesktop.org/software/systemd/man/systemd.kill.html

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 05566ad)
Signed-off-by: Akihiro Suda <[email protected]>

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83 cpuguy83 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83
cpuguy83 merged commit 54f561a into moby:20.10 Feb 2, 2021
konstruktoid added a commit to konstruktoid/ansible-role-docker-rootless that referenced this pull request Mar 1, 2021
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.

3 participants