fix exec start in systemd. In the previous commit we removed the containerd option by mistake

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=160
This commit is contained in:
Jordi Massaguer 2016-12-21 10:40:12 +00:00 committed by Git OBS Bridge
parent e7c95c3802
commit be6bb16dbb

View File

@ -10,7 +10,7 @@ EnvironmentFile=/etc/sysconfig/docker
# While Docker has support for socket activation (-H fd://), this is not # While Docker has support for socket activation (-H fd://), this is not
# enabled by default because enabling socket activation means that on boot your # enabled by default because enabling socket activation means that on boot your
# containers won't start until someone tries to administer the Docker daemon. # containers won't start until someone tries to administer the Docker daemon.
ExecStart=/usr/bin/dockerd $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting overhead # Having non-zero Limit*s causes performance problems due to accounting overhead