Djam/docker-containerd
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/docker-containerd.git synced 2025-02-23 14:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 1.2.8

Browse source
This commit is contained in:
Алзим 2019-10-03 20:55:15 +03:00
parent 56ee8fab25
commit dc7793259e
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.abf.yml
View file

@ -1,3 +1,2 @@
sources:
containerd-1.2.8.tar.gz: bf6c043ed0ec6c5317eec7232cd690070e9aa87f

3
docker-containerd.spec
View file

@ -5,7 +5,7 @@
Summary: A daemon to control runC
Name: docker-containerd
Version: 1.2.8
Release: 1
Release: 2
License: ASL 2.0
Group: System/Kernel and hardware
Url: http://www.docker.com
@ -63,4 +63,3 @@ cd %{buildroot}%{_bindir}
for i in *; do
ln -sf $i docker-$i
done

16
fix-run-docker-containerd-path.patch
View file

@ -8,8 +8,8 @@ Index: containerd-1.2.6/client_unix_test.go
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"
+ defaultState = "/run/docker/libcontainerd-test"
+ defaultAddress = "/run/docker/libcontainerd-test/containerd.sock"
)
var (
@ -22,7 +22,7 @@ Index: containerd-1.2.6/releases/v1.0.0-rc.0.toml
```
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
+ 3644 containerd-shim -namespace default -workdir /var/lib/containerd/io.containerd.runtime.v1.linux/default/test10 -address /run/docker/libcontainerd/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/
```
@ -35,17 +35,17 @@ Index: containerd-1.2.6/defaults/defaults_unix.go
// DefaultStateDir is the default location used by containerd to store
// transient data
- DefaultStateDir = "/run/containerd"
+ DefaultStateDir = "/run/docker/containerd"
+ DefaultStateDir = "/run/docker/libcontainerd"
// DefaultAddress is the default unix socket address
- DefaultAddress = "/run/containerd/containerd.sock"
+ DefaultAddress = "/run/docker/containerd/containerd.sock"
+ DefaultAddress = "/run/docker/libcontainerd/containerd.sock"
// DefaultDebugAddress is the default unix socket address for pprof data
- DefaultDebugAddress = "/run/containerd/debug.sock"
+ DefaultDebugAddress = "/run/docker/containerd/debug.sock"
+ DefaultDebugAddress = "/run/docker/libcontainerd/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"
+ DefaultFIFODir = "/run/docker/libcontainerd/fifo"
)
Index: containerd-1.2.6/runtime/v1/linux/proc/process.go
===================================================================
@ -56,7 +56,7 @@ Index: containerd-1.2.6/runtime/v1/linux/proc/process.go
// RuncRoot is the path to the root runc state directory
-const RuncRoot = "/run/containerd/runc"
+const RuncRoot = "/run/docker/containerd/runc"
+const RuncRoot = "/run/docker/libcontainerd/runc"
func stateName(v interface{}) string {
switch v.(type) {