debian-containerd-name

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 ca0a90ad03fb2bd6173ca53e7ba4e518d7c89abc..e05dad611d9244a1af43eb501714fdd3badf06c1 100644 (file)
--- 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 d19b8e51680982eacef1c91f0b04bbe616ba1041..9d642578c0d871d950c4f9e195da7da7c5141bcd 100644 (file)
--- 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 b7034ce50b550adf2add55ec2b40ee1408c6fced..b9c7524a61fd42938953eccd333af1eed49468cb 100644 (file)
--- 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 a4d37091395b5943725a9396381dcd0880d1cc1b..f14db3bdc7257858ae639a311624f32ffee3afd4 100644 (file)
--- a/engine/daemon/daemon.go
+++ b/engine/daemon/daemon.go
@@ -983,7 +983,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 8b59b5278a018c11690f1d92df6afd35f79ca6c4..e31e929e3b176858814ea8b0394e9c1d0116e499 100644 (file)
--- 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 69bb39b364c6e2af8ae33da7641e6d0e49918a76..1e3969256ee8ec89ec9e9f5baaf98ec8158c5867 100644 (file)
--- 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 eb9a2bdd81982c7ac62819f5df236cad44f69b57..3f47afb25e3148898c553c37b8c845688a940a4d 100644 (file)
--- 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"
 )