toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #298 from thaJeztah/18.09_backport_fix_containerd_race_condition

Browse Source 
[18.09 backport] systemd: set --containerd socket patch to prevent race-condition
Upstream-commit: 8a4654e98e76d845e59b373ddee57fa4c1db8954
Component: packaging
This commit is contained in:
Eli Uriegas
2019-02-12 18:25:59 -08:00
committed by GitHub
parent 93dc56c138 24e4136d6c
commit 6a2cf28a77
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/systemd/docker.service
+1 -1
View File
@@ -11,7 +11,7 @@ Type=notify
# the default is not to use systemd for cgroups because the delegate issues still
# exists and systemd currently does not support the cgroup feature set required
# for containers run by docker
ExecStart=/usr/bin/dockerd -H fd://
ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock
ExecReload=/bin/kill -s HUP $MAINPID
TimeoutSec=0
RestartSec=2