guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: containerd: Update to 1.6.6.

Browse source 
* gnu/packages/docker.scm (containerd): Update to 1.6.6.
[arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go".  Set
PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX.

Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Pierre Langlois 2022-05-10 00:35:15 +01:00 committed by Maxim Cournoyer
parent 575dffef01
commit f3a16cab5a
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/docker.scm
View file

@ -174,7 +174,7 @@ Python without keeping their credentials in a Docker configuration file.")
(define-public containerd
(package
(name "containerd")
(version "1.4.4")
(version "1.6.6")
(source
(origin
(method git-fetch)
@ -183,7 +183,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 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb"))))
(base32 "1vsl747i3wyy68j4lp4nprwxadbyga8qxlrk892afcd2990zp5mr"))))
(build-system go-build-system)
(arguments
(let ((make-flags (list (string-append "VERSION=" version)
@ -203,6 +203,11 @@ Python without keeping their credentials in a Docker configuration file.")
(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 = \""
@ -226,8 +231,8 @@ Python without keeping their credentials in a Docker configuration file.")
(lambda* (#:key import-path outputs #:allow-other-keys)
(with-directory-excursion (string-append "src/" import-path)
(let* ((out (assoc-ref outputs "out")))
(apply invoke "make" (string-append "DESTDIR=" out) "install"
',make-flags)))))))))
(apply invoke "make" (string-append "DESTDIR=" out)
"PREFIX=" "install" ',make-flags)))))))))
(inputs
(list btrfs-progs libseccomp pigz runc util-linux))
(native-inputs