[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: gnu: containerd: Update to 1.6.6.
From: |
guix-commits |
Subject: |
03/09: gnu: containerd: Update to 1.6.6. |
Date: |
Fri, 24 Jun 2022 01:00:48 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit f3a16cab5a9927f7851de937b20b6f2ebf1936c2
Author: Pierre Langlois <pierre.langlois@gmx.com>
AuthorDate: Tue May 10 00:35:15 2022 +0100
gnu: containerd: Update to 1.6.6.
* 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>
---
gnu/packages/docker.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 5c0f4d496d..aae4fc01d0 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -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
- branch master updated (39b118776b -> 14518fcc54), guix-commits, 2022/06/24
- 01/09: gnu: runc: Update to 1.1.1., guix-commits, 2022/06/24
- 02/09: gnu: containerd: Fix patch-paths build phase., guix-commits, 2022/06/24
- 08/09: gnu: docker: Honor TESTS? and please guix lint., guix-commits, 2022/06/24
- 03/09: gnu: containerd: Update to 1.6.6.,
guix-commits <=
- 09/09: tests: docker: Relax marionette timeout., guix-commits, 2022/06/24
- 05/09: gnu: docker: Fix mkfs.xfs reference., guix-commits, 2022/06/24
- 04/09: gnu: containerd: Switch to gexp arguments., guix-commits, 2022/06/24
- 07/09: gnu: docker: Switch to gexp and new input style., guix-commits, 2022/06/24
- 06/09: gnu: docker: Update to 20.10.17., guix-commits, 2022/06/24