From cbac77a8f2c51684897bf167696affecdd52cc1b Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 16 Aug 2018 04:03:40 +0000 Subject: [PATCH] Some changes to get this working on CentOS 7 Old versions of things on CentOS 7 strike again! infinity is not a thing for TimeoutSec on systemd < 229 Signed-off-by: Eli Uriegas Upstream-commit: 86dafe5391e2ef298248536cd038e27230a4df63 Component: packaging --- components/packaging/systemd/docker.service | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index b03133fe1f..13b2a04750 100644 --- a/components/packaging/systemd/docker.service +++ b/components/packaging/systemd/docker.service @@ -8,10 +8,8 @@ Wants=network-online.target containerd.service # Install containerd-shim-process if it's not already installed ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process ExecStart=/usr/bin/dockerd -TimeoutSec=infinity -KillMode=process +TimeoutSec=0 Restart=always -Delegate=yes # On RPM Based distributions PATH isn't defined so we define it here # /opt/containerd/bin is in front so dockerd grabs the correct runc binary Environment="PATH=/opt/containerd/bin:/sbin:/usr/bin:/usr/local/bin:$PATH"