Skip to content

[master] use systemctl is-active to check for containerd - #156

Merged
seemethere merged 1 commit into
docker:masterfrom
andrewhsu:act
Aug 23, 2018
Merged

seemethere merged 1 commit into
docker:masterfrom
andrewhsu:act

Conversation

@andrewhsu

Copy link
Copy Markdown
Contributor

Without this PR, unable to detect an active containerd.io package:

$ systemctl status containerd | head -3
● containerd.service - containerd container runtime
   Loaded: loaded (/lib/systemd/system/containerd.service; enabled; vendor preset: enabled)
   Active: active (running) since Wed 2018-08-22 23:44:45 UTC; 6h ago
$ make -pn -f containerd.mk | grep -e ^CONTAINERD_SOCK
make: *** No targets.  Stop.
CONTAINERD_SOCK := /var/run/docker/containerd/docker-containerd.sock

With this PR, allows proper detection:

$ make -pn -f containerd.mk | grep -e ^CONTAINERD_SOCK
make: *** No targets.  Stop.
CONTAINERD_SOCK := /var/run/containerd/containerd.sock

The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
andrewhsu requested a review from a team August 23, 2018 06:16

@seemethere seemethere left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@seemethere
seemethere merged commit 122405b into docker:master Aug 23, 2018
@seemethere

Copy link
Copy Markdown
Contributor

This will also need to be made to the 18.09 branch

@andrewhsu
andrewhsu deleted the act branch August 23, 2018 16:56
@andrewhsu

Copy link
Copy Markdown
Contributor Author

@seemethere ok, i'll take care of it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants