aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2023-08-11 18:46:28 +0800
committerHilton Chain <hako@ultrarare.space>2023-08-29 22:20:33 +0800
commit48727c74ac058da23f6cb131f1c8b43a6e640686 (patch)
tree7e41a8031c049bc0e887bb2aacc1636fe2e3842f
parent9937194542d5ada550a3ce6de9fe5aa017de5dfd (diff)
downloadguix-48727c74ac058da23f6cb131f1c8b43a6e640686.tar.gz
guix-48727c74ac058da23f6cb131f1c8b43a6e640686.zip
gnu: containerd: Update to 1.6.22.
* gnu/packages/docker.scm (containerd): Update to 1.6.22. [#:phases]<patch-paths>: Patch Runtime name.
-rw-r--r--gnu/packages/docker.scm11
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 0b2a18d661..3815824202 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -177,7 +177,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd
(package
(name "containerd")
- (version "1.6.6")
+ (version "1.6.22")
(source
(origin
(method git-fetch)
@@ -186,7 +186,7 @@ Python without keeping their credentials in a Docker configuration file.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr"))
+ (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8"))
(patches
(search-patches "containerd-create-pid-file.patch"))))
(build-system go-build-system)
@@ -215,7 +215,12 @@ Python without keeping their credentials in a Docker configuration file.")
(("DefaultRuntimeName: \"runc\"")
(string-append "DefaultRuntimeName: \""
(search-input-file inputs "/sbin/runc")
- "\"")))
+ "\""))
+ ;; ContainerdConfig.Runtimes
+ (("\"runc\":")
+ (string-append "\""
+ (search-input-file inputs "/sbin/runc")
+ "\":")))
(substitute* "vendor/github.com/containerd/go-runc/runc.go"
(("DefaultCommand[ \t]*=.*")
(string-append "DefaultCommand = \""