From 546163ada0986fc83cecbb3b4b54291c17b8bdf9 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 24 Aug 2018 22:14:20 +0000 Subject: [PATCH 1/2] update containerd proxy commit to afca176 Signed-off-by: Andrew Hsu Upstream-commit: eea6967f5de4835800349b1bcf2b81de8fd92207 Component: packaging --- components/packaging/containerd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/containerd.mk b/components/packaging/containerd.mk index 2e67b7ba98..4b2633a6f0 100644 --- a/components/packaging/containerd.mk +++ b/components/packaging/containerd.mk @@ -1,6 +1,6 @@ # Common things for containerd functionality -CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2 +CONTAINERD_PROXY_COMMIT=afca176732d9416fac1e79fd76ce45afe4cbc41f CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47 # If containerd is running use that socket instead From 3e2da1ea70daf06598a2091fc391c3d32af77dbd Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 24 Aug 2018 22:40:02 +0000 Subject: [PATCH 2/2] added RestartSec Signed-off-by: Andrew Hsu Upstream-commit: 3614f5dc4eb20e0d028ee1b2fd4bc23d34815f39 Component: packaging --- components/packaging/systemd/docker.service | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index 4322dce30e..7d7c2624b2 100644 --- a/components/packaging/systemd/docker.service +++ b/components/packaging/systemd/docker.service @@ -10,6 +10,7 @@ Wants=network-online.target 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=0 +RestartSec=2 Restart=always # 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