Message ID | 20211225144014.3196-2-pierre.langlois@gmx.com |
---|---|
State | Accepted |
Headers | show |
Series | Update docker to 20.10.11. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 47e4fcd2dc..062229b3b4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -173,7 +173,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.5.8") (source (origin (method git-fetch) @@ -182,7 +182,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) + (base32 "18lzmpbhbk1kq1nwdp6zcxb577kp425l2ikcmb45jcwgqdwzla6l")))) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=" version) @@ -202,6 +202,11 @@ (define-public containerd (string-append "defaultShim = \"" (assoc-ref outputs "out") "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (assoc-ref inputs "runc") + "/sbin/runc\""))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand[ \t]*=.*") (string-append "DefaultCommand = \""