From patchwork Fri Aug 11 10:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52740 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 13A5927BBEA; Fri, 11 Aug 2023 11:48:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 869B727BBE2 for ; Fri, 11 Aug 2023 11:48:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUPgh-0002S3-Ep; Fri, 11 Aug 2023 06:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUPgZ-0002OH-1D for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUPgY-00038k-P7 for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUPgY-0000Qp-8J for guix-patches@gnu.org; Fri, 11 Aug 2023 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64910] [PATCH v2 2/3] gnu: containerd: Update to 1.6.22. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 10:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64910 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64910@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64910-submit@debbugs.gnu.org id=B64910.16917508291436 (code B ref 64910); Fri, 11 Aug 2023 10:48:02 +0000 Received: (at 64910) by debbugs.gnu.org; 11 Aug 2023 10:47:09 +0000 Received: from localhost ([127.0.0.1]:45009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPfh-0000N6-0n for submit@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:09 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUPff-0000My-0L for 64910@debbugs.gnu.org; Fri, 11 Aug 2023 06:47:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691750820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GEWbImCaJMcGxEymmY0LJ7OikTQuZ8TcU6PVruqf9Wg=; b=qFM0j/RiTIS0AP8jzAc2YNKwqNmeAtTGyptjb/t5jzpo5OP+pTFG2hZ+3o4rgCsqb0v0vK UKCc1FfNjYIf+ssCeMMBjpgt/2F9mwvPUdEv+PMyc4yQqLetyY6zTXlvvnC+a67AzL4CFq NqWG/vQuZjiV8pHdWwCh7/nLq/hD8HlokyhAD2BXazRZWAtcCqo4GtSInPgu3d1U0OUSgl OgBblky+GXFSc35+2s/tQX0gSM/4wm+uc1saWoPk8OI++O9UPH6rPfJ6wl2Hy4qovyd7Yf eNtKRgQI9hvqNQhCZK+JWNccjmHl1oerQGsZW8DqYtZUD3N8oy0egpNMvi9mJg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 11 Aug 2023 18:46:28 +0800 Message-ID: <69b56dbf3a55f19e0ac9232eab0e3003a5c380d2.1691750473.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd): Update to 1.6.22. [#:phases]: 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 = \""