Skip to content

Commit

Permalink
use systemctl is-active to check for containerd
Browse files Browse the repository at this point in the history
The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
  • Loading branch information
andrewhsu committed Aug 23, 2018
1 parent 6e21a50 commit f00df1b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion containerd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2
CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47

# If containerd is running use that socket instead
ifeq ($(shell systemctl status containerd 2>/dev/null >/dev/null && echo -n "yes"), "yes")
ifeq ("$(shell systemctl is-active containerd)", "active")
CONTAINERD_SOCK:=/var/run/containerd/containerd.sock
else
CONTAINERD_SOCK:=/var/run/docker/containerd/docker-containerd.sock
Expand Down

0 comments on commit f00df1b

Please sign in to comment.