51edf81efb
The other way was not working. Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d) Signed-off-by: Andrew Hsu <andrewhsu@docker.com> Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9 Component: packaging
18 lines
613 B
Makefile
18 lines
613 B
Makefile
# Common things for containerd functionality
|
|
|
|
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 is-active containerd)", "active")
|
|
CONTAINERD_SOCK:=/var/run/containerd/containerd.sock
|
|
else
|
|
CONTAINERD_SOCK:=/var/run/docker/containerd/docker-containerd.sock
|
|
endif
|
|
CTR=docker run \
|
|
--rm -i \
|
|
-v $(CONTAINERD_SOCK):/ours/containerd.sock \
|
|
-v $(CURDIR)/artifacts:/artifacts \
|
|
docker:18.06.0-ce \
|
|
docker-containerd-ctr -a /ours/containerd.sock
|