From 9961826453fee3b52244ba920359b9e2f9ad137c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 29 Nov 2018 20:53:16 +1100 Subject: [PATCH 1/5] PACKAGING: revert "Remove 'docker-' prefix for containerd and runc binaries" This reverts commit 34eede0296bce6a9c335cb429f10728ae3f4252d, as it would significantly break openSUSE's packaging (as well as causing conflicts between the very-outdated runc that Docker uses and the more up-to-date one available for Podman). Signed-off-by: Aleksa Sarai --- builder/builder-next/executor_unix.go | 2 +- daemon/daemon_unix.go | 8 ++++++-- libcontainerd/supervisor/remote_daemon.go | 4 ++-- libcontainerd/supervisor/remote_daemon_linux.go | 4 ++-- libcontainerd/supervisor/remote_daemon_windows.go | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go index c052ec707fec..d1caf53f5023 100644 --- a/builder/builder-next/executor_unix.go +++ b/builder/builder-next/executor_unix.go @@ -32,7 +32,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController, dn } return runcexecutor.New(runcexecutor.Opt{ Root: filepath.Join(root, "executor"), - CommandCandidates: []string{"runc"}, + CommandCandidates: []string{"docker-runc", "runc"}, DefaultCgroupParent: cgroupParent, Rootless: rootless, NoPivot: os.Getenv("DOCKER_RAMDISK") != "", diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 5fa688dff4c7..f610fdb01d27 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -58,11 +58,11 @@ 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 - DefaultRuntimeBinary = "runc" + DefaultRuntimeBinary = "docker-runc" // See https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269 linuxMinCPUShares = 2 @@ -78,6 +78,10 @@ const ( cgroupFsDriver = "cgroupfs" cgroupSystemdDriver = "systemd" cgroupNoneDriver = "none" + + // DefaultRuntimeName is the default runtime to be used by + // containerd if none is specified + DefaultRuntimeName = "docker-runc" ) type containerGetter interface { diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go index 3538612246f4..f17868a7e1f8 100644 --- a/libcontainerd/supervisor/remote_daemon.go +++ b/libcontainerd/supervisor/remote_daemon.go @@ -27,8 +27,8 @@ const ( shutdownTimeout = 15 * time.Second startupTimeout = 15 * time.Second configFile = "containerd.toml" - binaryName = "containerd" - pidFile = "containerd.pid" + binaryName = "docker-containerd" + pidFile = "docker-containerd.pid" ) type pluginConfigs struct { diff --git a/libcontainerd/supervisor/remote_daemon_linux.go b/libcontainerd/supervisor/remote_daemon_linux.go index d229881a62b3..da93fc45371d 100644 --- a/libcontainerd/supervisor/remote_daemon_linux.go +++ b/libcontainerd/supervisor/remote_daemon_linux.go @@ -11,8 +11,8 @@ import ( ) const ( - sockFile = "containerd.sock" - debugSockFile = "containerd-debug.sock" + sockFile = "docker-containerd.sock" + debugSockFile = "docker-containerd-debug.sock" ) func (r *remote) setDefaults() { diff --git a/libcontainerd/supervisor/remote_daemon_windows.go b/libcontainerd/supervisor/remote_daemon_windows.go index 9b254ef58a0a..bcdc9529e0f7 100644 --- a/libcontainerd/supervisor/remote_daemon_windows.go +++ b/libcontainerd/supervisor/remote_daemon_windows.go @@ -7,8 +7,8 @@ import ( ) const ( - grpcPipeName = `\\.\pipe\containerd-containerd` - debugPipeName = `\\.\pipe\containerd-debug` + grpcPipeName = `\\.\pipe\docker-containerd-containerd` + debugPipeName = `\\.\pipe\docker-containerd-debug` ) func (r *remote) setDefaults() { -- 2.30.0