From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 64910@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>
Subject: [bug#64910] [PATCH v2 2/3] gnu: containerd: Update to 1.6.22.
Date: Fri, 11 Aug 2023 18:46:28 +0800 [thread overview]
Message-ID: <69b56dbf3a55f19e0ac9232eab0e3003a5c380d2.1691750473.git.hako@ultrarare.space> (raw)
In-Reply-To: <cover.1691750473.git.hako@ultrarare.space>
* gnu/packages/docker.scm (containerd): Update to 1.6.22.
[#:phases]<patch-paths>: Patch Runtime name.
---
gnu/packages/docker.scm | 11 ++++++++---
1 file 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 @@ (define-public python-docker-pycreds
(define-public containerd
(package
(name "containerd")
- (version "1.6.6")
+ (version "1.6.22")
(source
(origin
(method git-fetch)
@@ -186,7 +186,7 @@ (define-public containerd
(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 @@ (define-public containerd
(("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 = \""
--
2.41.0
next prev parent reply other threads:[~2023-08-11 10:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 3:11 [bug#64910] [PATCH 0/3] gnu: docker: Update to 20.10.25 Hilton Chain via Guix-patches via
2023-07-28 3:13 ` [bug#64910] [PATCH 1/3] gnu: runc: Update to 1.1.8 Hilton Chain via Guix-patches via
2023-07-28 3:13 ` [bug#64910] [PATCH 2/3] gnu: containerd: Update to 1.6.22 Hilton Chain via Guix-patches via
2023-07-28 3:13 ` [bug#64910] [PATCH 3/3] gnu: docker: Update to 20.10.25 Hilton Chain via Guix-patches via
2023-08-11 8:01 ` [bug#64910] [PATCH 0/3] " Hilton Chain via Guix-patches via
2023-08-11 10:45 ` [bug#64910] [PATCH v2 " Hilton Chain via Guix-patches via
2023-08-11 10:46 ` [bug#64910] [PATCH v2 1/3] gnu: runc: Update to 1.1.9 Hilton Chain via Guix-patches via
2023-08-11 10:46 ` Hilton Chain via Guix-patches via [this message]
2023-08-11 10:46 ` [bug#64910] [PATCH v2 3/3] gnu: docker: Update to 20.10.25 Hilton Chain via Guix-patches via
2023-08-27 17:57 ` [bug#64910] [PATCH v2 0/3] " Christopher Baines
2023-08-29 15:16 ` bug#64910: " Hilton Chain via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69b56dbf3a55f19e0ac9232eab0e3003a5c380d2.1691750473.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=64910@debbugs.gnu.org \
--cc=hako@ultrarare.space \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).