From: Dmitry Smirnov <onlyjob@debian.org>
Date: Sun, 21 Feb 2021 17:18:35 +0000 (+0000)
Subject: "fix" containerd executable name.
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7.1+rpi1+deb10u3^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a8f8489cb479efc85286e14bcf477971f493e7b;p=docker.io.git

"fix" containerd executable name.

Last-Update: 2019-01-27
Forwarded: not-needed
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=920597


Gbp-Pq: Name debian-containerd-name.patch
---

diff --git a/containerd/cmd/containerd-shim/main_unix.go b/containerd/cmd/containerd-shim/main_unix.go
index ca0a90ad..e05dad61 100644
--- a/containerd/cmd/containerd-shim/main_unix.go
+++ b/containerd/cmd/containerd-shim/main_unix.go
@@ -70,7 +70,7 @@ func init() {
 	flag.BoolVar(&systemdCgroupFlag, "systemd-cgroup", false, "set runtime to use systemd-cgroup")
 	// currently, the `containerd publish` utility is embedded in the daemon binary.
 	// The daemon invokes `containerd-shim -containerd-binary ...` with its own os.Executable() path.
-	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "containerd", "path to containerd binary (used for `containerd publish`)")
+	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "docker-containerd", "path to containerd binary (used for `containerd publish`)")
 	flag.Parse()
 }
 
diff --git a/containerd/runtime/v1/linux/runtime.go b/containerd/runtime/v1/linux/runtime.go
index d19b8e51..9d642578 100644
--- a/containerd/runtime/v1/linux/runtime.go
+++ b/containerd/runtime/v1/linux/runtime.go
@@ -60,7 +60,7 @@ var (
 const (
 	configFilename = "config.json"
 	defaultRuntime = "runc"
-	defaultShim    = "containerd-shim"
+	defaultShim    = "docker-containerd-shim"
 )
 
 func init() {
diff --git a/containerd/runtime/v2/shim/util.go b/containerd/runtime/v2/shim/util.go
index b7034ce5..b9c7524a 100644
--- a/containerd/runtime/v2/shim/util.go
+++ b/containerd/runtime/v2/shim/util.go
@@ -30,7 +30,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-const shimBinaryFormat = "containerd-shim-%s-%s"
+const shimBinaryFormat = "docker-containerd-shim-%s-%s"
 
 // Command returns the shim command with the provided args and configuration
 func Command(ctx context.Context, runtime, containerdAddress, path string, cmdArgs ...string) (*exec.Cmd, error) {
diff --git a/engine/daemon/daemon.go b/engine/daemon/daemon.go
index a3078630..c2887ce0 100644
--- a/engine/daemon/daemon.go
+++ b/engine/daemon/daemon.go
@@ -979,7 +979,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 
 	go d.execCommandGC()
 
-	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), ContainersNamespace, d)
+	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "docker-containerd"), ContainersNamespace, d)
 	if err != nil {
 		return nil, err
 	}
diff --git a/engine/daemon/daemon_unix.go b/engine/daemon/daemon_unix.go
index 5234201c..dab30a27 100644
--- a/engine/daemon/daemon_unix.go
+++ b/engine/daemon/daemon_unix.go
@@ -54,7 +54,7 @@ import (
 const (
 	// DefaultShimBinary is the default shim to be used by containerd if none
 	// is specified
-	DefaultShimBinary = "containerd-shim"
+	DefaultShimBinary = "docker-containerd-shim"
 
 	// DefaultRuntimeBinary is the default runtime to be used by
 	// containerd if none is specified
diff --git a/engine/hack/make/.binary-setup b/engine/hack/make/.binary-setup
index 69bb39b3..1e396925 100644
--- a/engine/hack/make/.binary-setup
+++ b/engine/hack/make/.binary-setup
@@ -2,8 +2,8 @@
 
 DOCKER_DAEMON_BINARY_NAME='dockerd'
 DOCKER_RUNC_BINARY_NAME='runc'
-DOCKER_CONTAINERD_BINARY_NAME='containerd'
+DOCKER_CONTAINERD_BINARY_NAME='docker-containerd'
 DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr'
-DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim'
+DOCKER_CONTAINERD_SHIM_BINARY_NAME='docker-containerd-shim'
 DOCKER_PROXY_BINARY_NAME='docker-proxy'
 DOCKER_INIT_BINARY_NAME='docker-init'
diff --git a/engine/libcontainerd/supervisor/remote_daemon.go b/engine/libcontainerd/supervisor/remote_daemon.go
index 439162de..9e69497d 100644
--- a/engine/libcontainerd/supervisor/remote_daemon.go
+++ b/engine/libcontainerd/supervisor/remote_daemon.go
@@ -27,7 +27,7 @@ const (
 	shutdownTimeout         = 15 * time.Second
 	startupTimeout          = 15 * time.Second
 	configFile              = "containerd.toml"
-	binaryName              = "containerd"
+	binaryName              = "docker-containerd"
 	pidFile                 = "containerd.pid"
 )