From patchwork Sat Dec 25 14:17:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 523 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 92CFF27BBEA; Sat, 25 Dec 2021 14:32:47 +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,URIBL_BLOCKED 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 3389627BBE9 for ; Sat, 25 Dec 2021 14:32:47 +0000 (GMT) Received: from localhost ([::1]:49488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n186I-00014Q-7O for patchwork@mira.cbaines.net; Sat, 25 Dec 2021 09:32:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n185a-0008WF-Hj for guix-patches@gnu.org; Sat, 25 Dec 2021 09:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n185a-0006vy-82 for guix-patches@gnu.org; Sat, 25 Dec 2021 09:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n185a-0002Kt-69 for guix-patches@gnu.org; Sat, 25 Dec 2021 09:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH 0/4] Update docker to 20.10.11. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Dec 2021 14:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16404426738875 (code B ref -1); Sat, 25 Dec 2021 14:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Dec 2021 14:31:13 +0000 Received: from localhost ([127.0.0.1]:38702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n184n-0002J5-E1 for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:31:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:48922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n184k-0002It-ED for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:31:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n184k-0007iV-7X for guix-patches@gnu.org; Sat, 25 Dec 2021 09:31:10 -0500 Received: from mout.gmx.net ([212.227.17.22]:49055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n184h-0006qL-J7 for guix-patches@gnu.org; Sat, 25 Dec 2021 09:31:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640442664; bh=f3yvs0fJgm8avwr7eeHtfyjF5FIyrve8cCvHICHNU/c=; h=X-UI-Sender-Class:From:To:Subject:Date; b=OMigKwIJX82/jdHY6UnV87CP8WhZKTLEHj/MOVUcsHwQ8z4SRArLSSsmfSW7d3NN/ p29vFSyVy+afDEjzP7Xr19RU7MdwUHXwvqzSXL2KE8ADLj7emGgnQ3xUI6gZh4qRDI PcSgzWJqTTfMsLGugRmgd61IoGwdGD6Z57k6H36M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MTzb8-1mroPy1KXS-00R0XH for ; Sat, 25 Dec 2021 15:31:04 +0100 User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois Date: Sat, 25 Dec 2021 14:17:50 +0000 Message-ID: <877dbsu57g.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:LNcWfnwAC5uAGv4+FUWdRm8sB+MybjhBpOvUIWpWxZRkL0dzUgQ VRG4/bVCL4p98cnhSekwpYlA44UXkPKv6adDi6R8ateU9wJ/1n6O7ScnEr2R1Na7lG9UnvC e5gHsZAmJLkU2djpYbntj6Iefln24ZjhwFA5Utkxc2j4CPlssGXMtxTEaMztyB3IrgNwUbn qcy4+ppbIgNjqC+smgxGA== X-UI-Out-Filterresults: notjunk:1;V03:K0:aW+0XdQJOSU=:cLrqFC/VHVBAXlKZCgqN0L hhj+HyAxnX9ClnNd70skaGtKFjhZGVkyzJncnt13gHA41omFh/XbaEy7kOPoB4IlU36r8DQMD pLEoIn/pzxr1tXxHSQ49QFsd/1KvQcnrT8CCkCg/2xDPFED9cDhREdgmG4kNpiqbPmVKV3i+m c25ASA6By5Xagu5xL2B4dDzZn58Aorrl4GgK1MGO0lVWc1IpVzQ5itdcwUnixkzjX8gL5dcIV e/tgr4zYZQR1+7ovdnoKRNgpS8Nf8POrKjhcuLT6cVTUBG7MrtkCMH8VG3Byy6D9Fh2GIsf7x dYSWQ0F7QdiT4eGoM9IlPdVwBckIyDch4niwnmY1KRn3h+Dma1Gli4wm8w4s1xIKYM92SUI0O 6fK+5GC/zaDu6DvVC+GuX7cJZpAEKdZdACVb1rZLJSWUYeyElfJpjcZrvppIJ7L0JJ+iXQpJR QDFni4B6C1fBn5u+ONFl/CVa6mGAyMGWJthjXmAA6y8NWJ91lHm33+OPqzk0zUzEFToZuj18y hrKxSw2oHgRrgR9mOfY4LYx3MQkk5uu0eGtHRYT33KpQ5btW+QN9N9f/L39P0Z7oWhy5ys+ve QME9wI/e08xABOCvImm/MgOeH/ROTX2w5V/e1Cumdtg/slIvSTWdY8UGJmlQW/bub3SM2513j izZErUh++7vrExsDH43nUtrHW/wYkXLmFIqj+dBkIE/xq9zO3ACpfsi+lB/w2W476qzBJEA14 b/Z3Eb/HG8BPsaPbwbJ3KrCYoRmHapYDVQGecG4ckHDt3DwGGNHPCuObxEw664I3p4kgi32mi 7hxZkXW3+MSd/kFcr9i+Le913VArG9opkfh9MN0v4HhnuQmeKnW5j3sH2+oLuJpAV8sXMyAvP rmLPxU1plb9MUAyBPeGppQUHdaf78cUnUxXkuPzgZk3oK1ysMhj3J4FrGhAq7t7qFS3Jyacpq rrylF5lOh+FKPMFYxntlJcBiNZCyFV26eELw6w72dPBgKxRXugKWdEHwCo4sdbDv2tkRQORIf QROKra2z/nIkOYSp51p8O5hkWoAee6wDCAv+PXk+ZYBZu1kPFupr1IW3uVIwnWfKoaQ9GLbha 63VYp8cPOvHEsU= Received-SPF: pass client-ip=212.227.17.22; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi Guix! Here's a series to update docker. My use of docker is quite limited so we might want more testing, I just have a basic Ubuntu container. Also, while looking into this I noticed containerd's patch-paths phase wasn't running at all so I fixed that. However I'm not sure how containerd worked before without it. Docker bundles its own version that we also patch, so we're probably not hitting the code that needed patching. Thanks, Pierre Pierre Langlois (4): gnu: containerd: Fix patch-paths build phase. gnu: containerd: Update to 1.5.8. gnu: runc: Update to 1.0.3. gnu: docker: Update to 20.10.11. gnu/local.mk | 1 - gnu/packages/docker.scm | 80 +++++++++------------ gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 -------- gnu/packages/virtualization.scm | 4 +- 5 files changed, 39 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch