diff --git a/common/dockerd.json b/common/dockerd.json deleted file mode 100644 index 4e71a308a6..0000000000 --- a/common/dockerd.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "image": "docker.io/${ENGINE_IMAGE}", - "imagePath": "/var/lib/docker-engine/engine.tar", - "namespace":"docker", - "args": [ - "--containerd", "/run/containerd/containerd.sock", - "--default-runtime", "containerd", - "--add-runtime", "containerd=runc" - ], - "scope": "${ENGINE_SCOPE}" -} diff --git a/containerd.mk b/containerd.mk deleted file mode 100644 index 2620772844..0000000000 --- a/containerd.mk +++ /dev/null @@ -1,17 +0,0 @@ -# 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 diff --git a/deb/Makefile b/deb/Makefile index 2b99067ad8..25ce49305e 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -1,5 +1,3 @@ -include ../containerd.mk - SHELL:=/bin/bash ARCH:=$(shell uname -m) CLI_DIR:=$(CURDIR)/../../cli diff --git a/rpm/Makefile b/rpm/Makefile index 00f5919a22..77dc387b46 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -1,5 +1,3 @@ -include ../containerd.mk - ARCH=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli