ff604e37bb
Docker v19.03.0-ce. OBS-URL: https://build.opensuse.org/request/show/717716 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=315
127 lines
5.1 KiB
Diff
127 lines
5.1 KiB
Diff
From 33d18d20a806e2541292acb55338dea2065d2501 Mon Sep 17 00:00:00 2001
|
|
From: Aleksa Sarai <asarai@suse.de>
|
|
Date: Thu, 29 Nov 2018 20:53:16 +1100
|
|
Subject: [PATCH] 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 <asarai@suse.de>
|
|
---
|
|
components/engine/api/swagger.yaml | 4 ++--
|
|
components/engine/builder/builder-next/executor_unix.go | 2 +-
|
|
components/engine/daemon/daemon_unix.go | 6 +++---
|
|
components/engine/libcontainerd/supervisor/remote_daemon.go | 4 ++--
|
|
.../engine/libcontainerd/supervisor/remote_daemon_linux.go | 4 ++--
|
|
.../libcontainerd/supervisor/remote_daemon_windows.go | 4 ++--
|
|
6 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml
|
|
index 6e0bc25b52d6..58f860d22a49 100644
|
|
--- a/components/engine/api/swagger.yaml
|
|
+++ b/components/engine/api/swagger.yaml
|
|
@@ -3980,10 +3980,10 @@ definitions:
|
|
$ref: "#/definitions/Runtime"
|
|
default:
|
|
runc:
|
|
- path: "runc"
|
|
+ path: "docker-runc"
|
|
example:
|
|
runc:
|
|
- path: "runc"
|
|
+ path: "docker-runc"
|
|
runc-master:
|
|
path: "/go/bin/runc"
|
|
custom:
|
|
diff --git a/components/engine/builder/builder-next/executor_unix.go b/components/engine/builder/builder-next/executor_unix.go
|
|
index 620ffb401de7..dd63779a27d2 100644
|
|
--- a/components/engine/builder/builder-next/executor_unix.go
|
|
+++ b/components/engine/builder/builder-next/executor_unix.go
|
|
@@ -28,7 +28,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController, ro
|
|
}
|
|
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/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go
|
|
index df64de6edf13..fa9bfb528414 100644
|
|
--- a/components/engine/daemon/daemon_unix.go
|
|
+++ b/components/engine/daemon/daemon_unix.go
|
|
@@ -54,11 +54,11 @@ 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
|
|
- 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
|
|
@@ -77,7 +77,7 @@ const (
|
|
|
|
// DefaultRuntimeName is the default runtime to be used by
|
|
// containerd if none is specified
|
|
- DefaultRuntimeName = "runc"
|
|
+ DefaultRuntimeName = "docker-runc"
|
|
)
|
|
|
|
type containerGetter interface {
|
|
diff --git a/components/engine/libcontainerd/supervisor/remote_daemon.go b/components/engine/libcontainerd/supervisor/remote_daemon.go
|
|
index 31b93f11f0b1..5fba7f29eff9 100644
|
|
--- a/components/engine/libcontainerd/supervisor/remote_daemon.go
|
|
+++ b/components/engine/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/components/engine/libcontainerd/supervisor/remote_daemon_linux.go b/components/engine/libcontainerd/supervisor/remote_daemon_linux.go
|
|
index 799399c07bc5..1ea91d2b5d0b 100644
|
|
--- a/components/engine/libcontainerd/supervisor/remote_daemon_linux.go
|
|
+++ b/components/engine/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/components/engine/libcontainerd/supervisor/remote_daemon_windows.go b/components/engine/libcontainerd/supervisor/remote_daemon_windows.go
|
|
index 9b254ef58a0a..bcdc9529e0f7 100644
|
|
--- a/components/engine/libcontainerd/supervisor/remote_daemon_windows.go
|
|
+++ b/components/engine/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.22.0
|
|
|