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 971d84ebb664b808cf41e24a6cfe8134abd59d35..9dba58f0ec43d5c518fc030e22fbe2aebe4559fd 100644 (file)
--- a/containerd/cmd/containerd-shim/main_unix.go
+++ b/containerd/cmd/containerd-shim/main_unix.go
@@ -78,7 +78,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 c408126aee72096842d24c1b380416f5fa09aa6f..acd926849d851d9e01f15b9db8f82a075bacbdfa 100644 (file)
--- a/containerd/runtime/v1/linux/runtime.go
+++ b/containerd/runtime/v1/linux/runtime.go
@@ -62,7 +62,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_unix.go b/containerd/runtime/v2/shim/util_unix.go
index 6b9ae4eea4b8dbf10b162bede832e0ea1bad60ea..898aee62705f4ca63aa99aecce60cfbbcd262056 100644 (file)
--- a/containerd/runtime/v2/shim/util_unix.go
+++ b/containerd/runtime/v2/shim/util_unix.go
@@ -33,7 +33,7 @@ import (
        "github.com/pkg/errors"
 )
 
-const shimBinaryFormat = "containerd-shim-%s-%s"
+const shimBinaryFormat = "docker-containerd-shim-%s-%s"
 
 func getSysProcAttr() *syscall.SysProcAttr {
        return &syscall.SysProcAttr{

diff --git a/engine/daemon/daemon.go b/engine/daemon/daemon.go
index 014ec970a98a461106aa2ff3404b25fd8d4ae647..6823d7b26e2439f22d8dbde9d2700e61679b445b 100644 (file)
--- a/engine/daemon/daemon.go
+++ b/engine/daemon/daemon.go
@@ -1041,7 +1041,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"), config.ContainerdNamespace, d)
+       d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "docker-containerd"), config.ContainerdNamespace, d)
        if err != nil {
                return nil, err
        }

diff --git a/engine/daemon/daemon_unix.go b/engine/daemon/daemon_unix.go
index 066d52328faed84b0eabc6e49db6c9a3b708c864..4cc8878ea069e922a3b124bb3e7d4ba01d1d89aa 100644 (file)
--- a/engine/daemon/daemon_unix.go
+++ b/engine/daemon/daemon_unix.go
@@ -55,7 +55,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 7a4eb8bc1209512e88df7c180920f74db6d4057b..267871a7dee9afe24578f0b08d847388ece25c12 100644 (file)
--- a/engine/hack/make/.binary-setup
+++ b/engine/hack/make/.binary-setup
@@ -2,9 +2,9 @@
 
 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'
 DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit'

diff --git a/engine/libcontainerd/supervisor/remote_daemon.go b/engine/libcontainerd/supervisor/remote_daemon.go
index 31b93f11f0b1cda66deaf2c1f928979b10bc41a1..478059865c47f4c0b77c83c6b8b203868c02cab5 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"
 )