From 4b8490a8fe9b912b2ffe85df406ca318088da11c Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 16 Aug 2018 00:10:04 +0000 Subject: [PATCH] Improve containerd detection, don't rely on root Signed-off-by: Eli Uriegas Upstream-commit: 2134ee524ecf6a96c99a518652b4ec65680abc34 Component: packaging --- components/packaging/containerd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/packaging/containerd.mk b/components/packaging/containerd.mk index be11a9f392..12bad420f7 100644 --- a/components/packaging/containerd.mk +++ b/components/packaging/containerd.mk @@ -3,11 +3,11 @@ CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2 CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47 -# If the docker-containerd.sock is available use that, else use the default containerd.sock -ifeq (,$(wildcard /var/run/docker/containerd/docker-containerd.sock)) -CONTAINERD_SOCK:=/var/run/docker/containerd/docker-containerd.sock -else +# If containerd is running use that socket instead +ifeq ($(shell systemctl status containerd 2>/dev/null >/dev/null && echo -n "yes"), "yes") CONTAINERD_SOCK:=/var/run/containerd/containerd.sock +else +CONTAINERD_SOCK:=/var/run/docker/containerd/docker-containerd.sock endif CTR=docker run \ --rm -i \