summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTianon Gravi <admwiggin@gmail.com>2020-12-04 16:45:40 -0800
committerAnca Iordache <anca.iordache@docker.com>2021-07-12 10:06:35 +0000
commita985655ac4eb6c5b60b5eab8d8d09a487e353e1d (patch)
treeade84f08211bc9aade530fab12d440510e7eef3b /contrib
parentc81abefdb1f907bbc5f5b8b1b1fba942821ae5b3 (diff)
downloaddocker-a985655ac4eb6c5b60b5eab8d8d09a487e353e1d.tar.gz
Move containerd.service from Requires= to Wants=
Per the systemd.unit documentation: > If this unit gets activated, the units listed will be activated as well. If one of the other units fails to activate, and an ordering dependency After= on the failing unit is set, this unit will not be started. Besides, with or without specifying After=, this unit will be stopped if one of the other units is explicitly stopped. > > Often, it is a better choice to use Wants= instead of Requires= in order to achieve a system that is more robust when dealing with failing services. This should also be generally "safe" given we added `--containerd=/run/containerd/containerd.sock` to the flags we pass to `dockerd`. Signed-off-by: Tianon Gravi <admwiggin@gmail.com> Signed-off-by: Anca Iordache <anca.iordache@docker.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/init/systemd/docker.service4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index c40735a2b5..fab73b8632 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -2,8 +2,8 @@
Description=Docker Application Container Engine
Documentation=https://docs.docker.com
After=network-online.target docker.socket firewalld.service containerd.service
-Wants=network-online.target
-Requires=docker.socket containerd.service
+Wants=network-online.target containerd.service
+Requires=docker.socket
[Service]
Type=notify