mirror of
https://abf.rosa.ru/djam/docker-containerd.git
synced 2025-02-23 14:22:50 +00:00
62 lines
3 KiB
Diff
62 lines
3 KiB
Diff
Index: containerd-1.2.6/client_unix_test.go
|
|
===================================================================
|
|
--- containerd-1.2.6/client_unix_test.go
|
|
+++ containerd-1.2.6/client_unix_test.go 2019-05-05 19:07:43.625687652 +0200
|
|
@@ -24,8 +24,8 @@
|
|
|
|
const (
|
|
defaultRoot = "/var/lib/containerd-test"
|
|
- defaultState = "/run/containerd-test"
|
|
- defaultAddress = "/run/containerd-test/containerd.sock"
|
|
+ defaultState = "/run/docker/containerd-test"
|
|
+ defaultAddress = "/run/docker/containerd-test/containerd.sock"
|
|
)
|
|
|
|
var (
|
|
Index: containerd-1.2.6/releases/v1.0.0-rc.0.toml
|
|
===================================================================
|
|
--- containerd-1.2.6/releases/v1.0.0-rc.0.toml
|
|
+++ containerd-1.2.6/releases/v1.0.0-rc.0.toml 2019-05-05 19:09:22.725066455 +0200
|
|
@@ -45,7 +45,7 @@
|
|
Memory improvements over beta 2...
|
|
```
|
|
RSS CMD
|
|
- 3644 containerd-shim -namespace default -workdir /var/lib/containerd/io.containerd.runtime.v1.linux/default/test10 -address /run/containerd/containerd.sock -containerd-binary /usr/local/bin/containerd -debug
|
|
+ 3644 containerd-shim -namespace default -workdir /var/lib/containerd/io.containerd.runtime.v1.linux/default/test10 -address /run/docker/containerd/containerd.sock -containerd-binary /usr/local/bin/containerd -debug
|
|
15320 docker-containerd-shim --namespace moby --workdir /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/ffa219303c1419b179393a1123f176bb4268337432b0ca7945bc7ac66db73cad --address /var/run/docker/containerd/docker-containerd.sock --runtime-root /var/run/docker/
|
|
```
|
|
|
|
Index: containerd-1.2.6/defaults/defaults_unix.go
|
|
===================================================================
|
|
--- containerd-1.2.6/defaults/defaults_unix.go
|
|
+++ containerd-1.2.6/defaults/defaults_unix.go 2019-05-05 19:06:51.858012156 +0200
|
|
@@ -24,12 +24,12 @@
|
|
DefaultRootDir = "/var/lib/containerd"
|
|
// DefaultStateDir is the default location used by containerd to store
|
|
// transient data
|
|
- DefaultStateDir = "/run/containerd"
|
|
+ DefaultStateDir = "/run/docker/containerd"
|
|
// DefaultAddress is the default unix socket address
|
|
- DefaultAddress = "/run/containerd/containerd.sock"
|
|
+ DefaultAddress = "/run/docker/containerd/containerd.sock"
|
|
// DefaultDebugAddress is the default unix socket address for pprof data
|
|
- DefaultDebugAddress = "/run/containerd/debug.sock"
|
|
+ DefaultDebugAddress = "/run/docker/containerd/debug.sock"
|
|
// DefaultFIFODir is the default location used by client-side cio library
|
|
// to store FIFOs.
|
|
- DefaultFIFODir = "/run/containerd/fifo"
|
|
+ DefaultFIFODir = "/run/docker/containerd/fifo"
|
|
)
|
|
Index: containerd-1.2.6/runtime/v1/linux/proc/process.go
|
|
===================================================================
|
|
--- containerd-1.2.6/runtime/v1/linux/proc/process.go
|
|
+++ containerd-1.2.6/runtime/v1/linux/proc/process.go 2019-05-05 19:08:28.213408157 +0200
|
|
@@ -23,7 +23,7 @@
|
|
)
|
|
|
|
// RuncRoot is the path to the root runc state directory
|
|
-const RuncRoot = "/run/containerd/runc"
|
|
+const RuncRoot = "/run/docker/containerd/runc"
|
|
|
|
func stateName(v interface{}) string {
|
|
switch v.(type) {
|