amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: containerd: Update to 1.6.22.

Browse source 
* gnu/packages/docker.scm (containerd): Update to 1.6.22.
[#:phases]<patch-paths>: Patch Runtime name.
This commit is contained in:
Hilton Chain 2023-08-11 18:46:28 +08:00
parent 9937194542
commit 48727c74ac
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/docker.scm
View file

@ -177,7 +177,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd (define-public containerd
(package (package
(name "containerd") (name "containerd")
(version "1.6.6") (version "1.6.22")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -186,7 +186,7 @@ Python without keeping their credentials in a Docker configuration file.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr")) (base32 "1m31y00sq2m76m1jiq4znws8gxbgkh5adklvqibxiz1b96vvwjk8"))
(patches (patches
(search-patches "containerd-create-pid-file.patch")))) (search-patches "containerd-create-pid-file.patch"))))
(build-system go-build-system) (build-system go-build-system)
@ -215,7 +215,12 @@ Python without keeping their credentials in a Docker configuration file.")
(("DefaultRuntimeName: \"runc\"") (("DefaultRuntimeName: \"runc\"")
(string-append "DefaultRuntimeName: \"" (string-append "DefaultRuntimeName: \""
(search-input-file inputs "/sbin/runc") (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" (substitute* "vendor/github.com/containerd/go-runc/runc.go"
(("DefaultCommand[ \t]*=.*") (("DefaultCommand[ \t]*=.*")
(string-append "DefaultCommand = \"" (string-append "DefaultCommand = \""