From patchwork Sat Dec 25 14:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 35651 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 8332427BBEA; Sat, 25 Dec 2021 14:41:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable 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 4AC1D27BBE9 for ; Sat, 25 Dec 2021 14:41:19 +0000 (GMT) Received: from localhost ([::1]:52912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n18EY-0004tR-GV for patchwork@mira.cbaines.net; Sat, 25 Dec 2021 09:41:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n18EJ-0004RI-9D for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n18EJ-00080w-0C for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n18EI-0002bu-VJ for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH 2/4] gnu: containerd: Update to 1.5.8. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Dec 2021 14:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.16404432259918 (code B ref 52790); Sat, 25 Dec 2021 14:41:02 +0000 Received: (at 52790) by debbugs.gnu.org; 25 Dec 2021 14:40:25 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dh-0002Zn-66 for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:25 -0500 Received: from mout.gmx.net ([212.227.17.22]:33829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dg-0002ZQ-AM for 52790@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640443218; bh=4Kzgkgfun4fx74T33bLED9xYfXUGMQ/u42c7mGZiFco=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ewb9ryQUpnRaUL8vdaauemkXccKSW+E0LwI2ynz6uIwB4S/tXG9XMXuS7J+wn++tU lbZWR6ODSwisPSqZYeRTAa1pqR8/f4sG1guOr6NmKI6qRDPjHT46v+NXn4KLvKtGau WWQJwOengCmDLW2l7wK1qdr0ARogZNGrojsjWb4w= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MpUYu-1mgLCY0SHk-00pxrZ; Sat, 25 Dec 2021 15:40:18 +0100 From: Pierre Langlois Date: Sat, 25 Dec 2021 14:40:12 +0000 Message-Id: <20211225144014.3196-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211225144014.3196-1-pierre.langlois@gmx.com> References: <877dbsu57g.fsf@gmx.com> <20211225144014.3196-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:GpnQwq2qinlDSUjCZj89HgwH+M6R7O8tYxGl4GqcDbTKfqTpfUv 5v7FZmkI33QQesDJf8u/5+zhW9POyDAq3cV3YKbe4rlT0lL4A7fYbC3tPSUEZY+5XcuXt6u CPeMzBYl6matf/bxGXtOMPELcqotPiU4vujzH1t+5EVAqj8Q7fgoxyvrMHg+SNNldKJx7Ml SvQ9KMMUqwF4Sa9dWQHkg== X-UI-Out-Filterresults: notjunk:1;V03:K0:xZv01rkQhys=:K/MofepjNAyt6t4Q2OgPu+ Pu7IV+35al+L0GQaG04CLQQiFMLhcZrohpRoLTOu62HMt0VSk7i/8fv4cbs1WOc/8tOrsGB2T sKZIQrkPSxYZJLdjiM87aa4STyz9w/KMB5X5b1lxcLM/j2PaPodqsoWztgo9ijwKeGtAC3Ee/ 0Bp5FW0RPWmWS7fp3kXrQTlhFLu9D5ETCAFpzBPWzVD8T6Ts6yuCiW1mwJV+7fE16wpbEoFFL NGQLLWa7b62NH/rZqa/JXDeCUelQ3ZG4XafPXa2uwRBVhw+NSnMJr4qX8W91vZAeMkGNbdbbk 5o2FuKvYQUMu7VJDjbrMxbWaD1oMXbUN6Gl/mLWXyy7iY89e5Cf8FuM/sH18DctU6rg7AtOyd XLH7NZIjvvSnaH7KIbbjfn+0Dp8dW0zJj4VW2gZqSU1+BOzV/xp+uLT/jIskGmx2D+rsCBJVS noFK5XxmdN3QAA0sNdHW7ftEa2LFCTn3Pf6C4YLJfbB4dJaxZdnFA7DPT6+GAwGgeLZWTL9qV sHXBavA/xOp4+Kj6sPsw9boWA0UmQ0VZr4YBepAxohfZuwEF9z06eLhCBnVj3Jiw0OUBLqdNT uPpKrYrwlGf7BZlns3IgQdLvhDgbRM2fYKX12SHb5PQG9NAbLIw8J0X8hjduilVV4I+m1rtmh d/FHqHtEMYdLa7whIIuuE8ES6+oX2olyLGJUr9rKFqTMtadsGWncY34gYtyeYB4xnNirCV5iP gvKhxmnL/ekZqDBL77QWtHhVd2eo5VA8gbyZU/3AUxFgacBxTV7z+Ms89JH64vVEvM2aHuNMh U/8rqX1Wc+cJRxzK8MhR+MtpJPA+KzriUjWkrs10+hkzjYqC1DnmP5X+JyJFORb8TqJkMSNV7 jrfJRLlCzoMWF3nYsLe5VpS7aUlIwnap48XEvHUJUzjKGXscy4ER7mEtaU+mJBkyTQ9cny4Eu 0/Yha/gWfa7Z77crVzpgHtjhgHns2HsO66cm+2bdWRP8Q2Z5ZoRri/G+osKzPDfE2DBp2rQTG MYsqYUlCwYMMa22snJtQjPqWwob3Z2bpjmn5wrELG5nEEIk41AWuFcILZVQw6vMUQshIv4vii UdK6RpUv1jvoyQ= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd): Update to 1.5.8. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". --- gnu/packages/docker.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 47e4fcd2dc..062229b3b4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -173,7 +173,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.5.8") (source (origin (method git-fetch) @@ -182,7 +182,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) + (base32 "18lzmpbhbk1kq1nwdp6zcxb577kp425l2ikcmb45jcwgqdwzla6l")))) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=" version) @@ -202,6 +202,11 @@ (define-public containerd (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 = \""