Includes fixes related to upgrade cycles Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit 83a20d53f14adcd2bcc9e932435aa66b6e056afa) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> Upstream-commit: befa3c61954d12f2413df56a384989d7ae2cb9b3 Component: packaging
18 lines
613 B
Makefile
18 lines
613 B
Makefile
# Common things for containerd functionality
|
|
|
|
CONTAINERD_PROXY_COMMIT=35c543bd887878714213cf61ee14038499fd25b7
|
|
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
|