From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 09:31:13 2021 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 To: guix-patches@gnu.org Subject: [PATCH 0/4] Update docker to 20.10.11. Date: Sat, 25 Dec 2021 14:17:50 +0000 Message-ID: <877dbsu57g.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:LNcWfnwAC5uAGv4+FUWdRm8sB+MybjhBpOvUIWpWxZRkL0dzUgQ VRG4/bVCL4p98cnhSekwpYlA44UXkPKv6adDi6R8ateU9wJ/1n6O7ScnEr2R1Na7lG9UnvC e5gHsZAmJLkU2djpYbntj6Iefln24ZjhwFA5Utkxc2j4CPlssGXMtxTEaMztyB3IrgNwUbn qcy4+ppbIgNjqC+smgxGA== X-Spam-Flag: NO 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-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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 =2D-=20 2.34.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmHHKyMYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U6eEIAKJkYXOxC/k2CZcA83zeYZsN MjO7vFfyKdfqPcrdOhaTcgsSZPEqarv/HGyBBt6aC8qFYEoB96vxslX/4iYAvxPI JqFHJOqqzdGNfiUYxNekOr2NXPnDDK4oClUruGYeqA9NaB3VZ1KZq/kPH9z3W+QP k52KcPG+h6Vgl5Ri2LfUyxzKCwGdq6aF6X6iL/zVMPhQB4O4y+5++v5DOkhQaIJO uJw8xIdTLUMAH4F5rLBs6z9LqeBfSLhTSsXZar7iWvNnCTXyitgWPQvslF28LBKP HHWbeGnHd4vbAidl5IddY/qFFLchOg0X2tdnzzYN4oHXeFWcX1feHMsNI91oyKA= =vu6S -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 09:40:25 2021 Received: (at 52790) by debbugs.gnu.org; 25 Dec 2021 14:40:25 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dg-0002Zl-W3 for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:25 -0500 Received: from mout.gmx.net ([212.227.17.20]:33289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Df-0002ZM-Id for 52790@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640443217; bh=Zf60O/h4LX1v84FiatftpJsjqrFkEvkxmMbcIugkdBA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ZlxlVQquauSDX8N8lf1TfOx0XWg0ckSdtKTtYY0OFAs5ltWYeLi/4C6TJGTCD9u2n gcROQZdnUOP7+OdrllE1RfECxe2k9DE2l4PQG00p47PTbcISj0A3oKYQshxPOqqGNA eLkGNl1JQuSp2C9SONSCmzmGxNqJsuA9gyTqfJ4Y= 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 1MsYqp-1mBuPa0Eln-00tyKg; Sat, 25 Dec 2021 15:40:17 +0100 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH 1/4] gnu: containerd: Fix patch-paths build phase. Date: Sat, 25 Dec 2021 14:40:11 +0000 Message-Id: <20211225144014.3196-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <877dbsu57g.fsf@gmx.com> References: <877dbsu57g.fsf@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:XLcXUKriuz2mfUI4iiSIaI3KC2LyefBbOxNXpyMIMFXmOMjwDyO KuVpyrYVERvTENzrASOOmuWPlqey5TnZczgT1rakUP+98+FapHzcr+gzNSWNhrTXPkfMtRF juqbJUZuxW0UueVCxTJCFz5NsquFOguVdvCVgKXfdCy8+xoibL0oog3iTkYV78MbW7WFk7H vBaQ3puIo9T8ZnCQrghFg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:iNclDBaTYsw=:TQlTDzCGqq4CbZFE4XrJYJ uMNk5Xiybxogz1uiChqOD89lkiBB93Uesm25p35Mj+HsmDgFa23IpVueq6FbhxxDRGpPl+LmP k/H311WepoBGURGcnFbI1e0H5PSXgBIHpaVgCabBj59CN+Ll48u7ktKd7tlzlLNFczAlUhJsi RAWMfIfL0DRXFO+WIZYKt6/K6rboE1CKCXgQsx1ICX/sKNFvz2mAxQu9df4Ezyz7Y1YPVDKWq tdBFN2uCcEIV1YlHsE/Bw0RJPzzgPtjgWWNo9Rdf1653vD/a1oPVbrbZ/J331BqxOm9JkdIhF qfyA5x/YQRcIQgalvMZ96VSkeuNNqHq9YZ6McVaBmzA4qX52pz09mTEqSQx15qCpQrEk3zypz Zzq2F+fl9QW35xuxokf8cHMNdLGaTFd+/4i2KKNZob65Ll0FltLBqsVD68ULMss9f4ndJZ8xL qfXCvjUeihsBMkQLAw2tdceIG9ylYByZZ0+wYs0iqnLauFE+LCtLkbV27FPkU5l6Hr6d/MUiI ogpCLIAL2ogSjJzTZvRe4hdWumULAdh3wx6madrYbHxr0K7lT3jntwJuhafvxnPWCQ3fHlD8t KTCWJZ+EcCV5qhCTuBpIEXmydM3VV3KOX74TbZ8vngrOJihwhEwSIS4DcFfWwmbglR/aQY2Ed PateNN8h/OeLcNkYuo0oiKAUJT9qiZSMCzIr8ydW2cMP5R3ioGU28USHbUM1BqMys8g5zqdOp A6euBl3YslHWTOkztTOzAaveiHRp2bsrTTFptCSjcehvKC3EjIxJ6SXCyVtE8nYxTNuhMgUME 7zNOEHeIpor8k3HccaCglSGAAu/faTTdM8bx/A9vb9tphramGRyAbD7GlxYs2piidATqs1tex hYK3g8S3xknIA0GQPe3sLCU6tozy8iMqwlS70xXLQZwhnbx4AcK0GiqWc1HWgR9g/2qoo3I+Y Ii0Taq5Tlm1DEI0xJxig1DlelVVY2+NEptnEMZols5MwTMQbPnUpHsJ8Z6hKeGYyC0CbBBlhP PkSFIXQlKTxWk30vVpilaTMHGHOTNqigLagA3bTTXipPhrzDc+3HKOgW+YJxCpjDAby8krwDW BKlbLDSF+6OlTc= X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. Substitute runc binary for "pkg/cri/config/config_unix.go". =2D-- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index d012ed43c6..47e4fcd2dc 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -190,7 +190,7 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-after 'chdir 'patch-paths + (add-after 'unpack 'patch-paths (lambda* (#:key inputs import-path outputs #:allow-other-key= s) (with-directory-excursion (string-append "src/" import-pat= h) (substitute* "runtime/v1/linux/runtime.go" =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 09:40:25 2021 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 To: 52790@debbugs.gnu.org Subject: [PATCH 2/4] gnu: containerd: Update to 1.5.8. 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 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:GpnQwq2qinlDSUjCZj89HgwH+M6R7O8tYxGl4GqcDbTKfqTpfUv 5v7FZmkI33QQesDJf8u/5+zhW9POyDAq3cV3YKbe4rlT0lL4A7fYbC3tPSUEZY+5XcuXt6u CPeMzBYl6matf/bxGXtOMPELcqotPiU4vujzH1t+5EVAqj8Q7fgoxyvrMHg+SNNldKJx7Ml SvQ9KMMUqwF4Sa9dWQHkg== X-Spam-Flag: NO 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/docker.scm (containerd): Update to 1.5.8. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". =2D-- gnu/packages/docker.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 47e4fcd2dc..062229b3b4 100644 =2D-- 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=3D" version) @@ -202,6 +202,11 @@ (define-public containerd (string-append "defaultShim =3D \"" (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]*=3D.*") (string-append "DefaultCommand =3D \"" =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 09:40:32 2021 Received: (at 52790) by debbugs.gnu.org; 25 Dec 2021 14:40:32 +0000 Received: from localhost ([127.0.0.1]:38726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dn-0002aS-MT for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:31 -0500 Received: from mout.gmx.net ([212.227.17.20]:42989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dh-0002ZT-Kz for 52790@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640443220; bh=+UY8//NifI9gvnG4cY8ACO/Gmmmu3xajB5/soPEwx38=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=I+lsFBQ6UA+kYIJ4Mz5u4HEuMLZsO0ZFiP5er62Urh4j7Rdg1ZrPRHCJoVa0HmIVC zUF681yo7VU7q7odnq1MV112QrdoFZ1MKYKTOv4LpkTuwmqyeNIAIaCQsiqqKawTo0 5JkQ8eJ1WDgqhr/X8mLeFvtJf77Ytjg6iCe4o26M= 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 1MLQxX-1mimFk3QWp-00IQeg; Sat, 25 Dec 2021 15:40:19 +0100 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH 3/4] gnu: runc: Update to 1.0.3. Date: Sat, 25 Dec 2021 14:40:13 +0000 Message-Id: <20211225144014.3196-3-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 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:TPsfDC2Sh77qRJhuRMd8ywCkvuoUEfSEjoGZ97SAPDumeeQmII5 xwnkzyJQRvaDncqLATEP09DUpNuM2NyCup076/Ju0hCZ576ZcHSbOPQoRG7Y/EO5RPWBXwP RmG2yesggrzh5iB7rj1aeGgGRk7MgVB5wcfJxptkH6fc9b8yojZu//x22EafCu7NaRT/2/P k7nLVR9AeLUlohIaX7QnQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Eec13eUt7D8=:BI2mTkSVgsTzhpY2a74eG/ +59boqCHEcKPdZ+yWNW1i755R7kJBptaGQxRAF7mzo/zWDC7iMOs5lOLg5pHSmtHK5PVPLOK+ Dqn4I8zFGkZ3KtubMCS2gXOb2uXTScztefUCZP/7qXf1R/5tfFkAc/Jb+fhpRaVHxueeWYRtZ 5o05xUKDbFo5vwUkObuiX3J7qmTsQIwowqQgfiM+ub7u/SPltL76Az6fdo9W7V4qvXOM0Rx3I WPvFGVbV6da7KsipxsCg1Y6ZARb+fjxsIhPCIewxAgfedMCCmwlsXMFn+qFEgq2gP6z+Jbs6S aHHBsoIRc4X4kQCxFsfN6pOFgizuyErJmeFenVlwVh5SvGTdQWGEx2mqbHFwICwN0ce81QbnB v8XFcRRdCd1DQA99XXKArUgMTWtMUY7/8/8r8xjSwLH5OSqtlPfDGhLQ1KgsRhRztxD/qC/r+ 2KrErtsQQHeelK5ScDlJVZwzHIt2WKWaHu/tGeXNZzml0gXJItyrU7XyXTTiIlreRkUq6eaoo +KUWllUBmovCx7ALqDcHjkwdhpc0ujUu4DMgpv/z1rnpb807bgTMVvAhu4uojZ1ZYBAil/PMk mLbVtKsGJN2rQ75XAAvJcTBmrkHT1vHb2iPtNmAp7nhnhW1keXlEpjtaEz4zJJtbK0HiFwuf6 AFP+cEc+yxV9qLa75IwGJIJPygEbri6saEssjAQNUpZnvto8HFpu7tgI0jFzCFFdNPnY15mdH vHu678rTu5de3JZd6fggNBXM4P9eVhmjSudjoFIcZ74t2PTYTVnJkzEnmslMwtYLQIIduS9Ir gKI4AUqLz2iVL4Wh3LmW/xoqw02eBRNnhhWga23mrRXoHnlJif3y8Ji5JYJp/EicehoS6/t0t XJun06QqzbJ+MCUTr/L0s1IArvnqkUQIIdbRtnZZaBHFetudp5IWz3oNCKdBG+8cvK4OXqXPh Y7h7BzSUlFnKEg8tywOnhZgYqUqGoBCSC5HPImsQANvHwByP/s9NheHc99t0yHwTmF2buHRPd 0beMUXL3GCE0hwtmY1i8c5bX3zoHU8NpSx2fJhquiNZ7hsXdS3BwGVOk+7252VXhS4eZfi/Y2 WZ9wLBoosuWNMg= X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/virtualization.scm (runc): Update to 1.0.3. =2D-- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index 14f415cf1d..b34de1a4dc 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1716,7 +1716,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.0.0-rc93") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append @@ -1725,7 +1725,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))= ) + "1dhss89fcs7acwd6ja0hfswqvzz8zcxllk0dlk1jqf1viwrpnag9")))= ) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 25 09:40:32 2021 Received: (at 52790) by debbugs.gnu.org; 25 Dec 2021 14:40:32 +0000 Received: from localhost ([127.0.0.1]:38728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dn-0002aZ-VF for submit@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:32 -0500 Received: from mout.gmx.net ([212.227.17.22]:60595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n18Dj-0002ZY-P6 for 52790@debbugs.gnu.org; Sat, 25 Dec 2021 09:40:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640443222; bh=8RqfWs/3ROk79x6kVdONVjDce3nGHEdnjjptQUlQVwU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=UzThtUlAQDm5/wWTBktR0ka6GAQ7klJ1WqubEho0vvenFrfZ6Yzd4TQe68qGJ7nAq f3vlj2Zqqb7s/lDQevpZPdBKVht2ArLNjOn7midwznB58iJfC9r6dq7HsgnreHOKcE tXiPokNxB/bMOEudfCC4YZngpenXLc+qdPmnRJRU= 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 1MMGRK-1mhwuJ341G-00JFTD; Sat, 25 Dec 2021 15:40:21 +0100 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH 4/4] gnu: docker: Update to 20.10.11. Date: Sat, 25 Dec 2021 14:40:14 +0000 Message-Id: <20211225144014.3196-4-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 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:JzXaM17wtcBaRUSOL64NZaDiqfnUx95skCU9MA7IpM5poc9tjge lP7n1TTx25fGVawUE/AIT2Ik/01wTQUIu4hIec4SOsIUBAvfMDwspjg7ZjDVdPPU/NX6Kqq o5nPYV7TcpuxyBa0PClrEoTQTw/xroGIGGmpAlKS2A1tFLW2fQOOgoL+0gE7kgFBi0i3Ntt bCn8MT/WOzQGPl8SKStqA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:/0ggyLaiZ9s=:FWKLgPDW42Mofv8SasNUU+ appKxL7WMJaewvySLArcxYC+6sZ4SACm8xdSf1mAryl9iNjS+8H5oWmhiNgofkon2t9tkkfY/ bRpEFUKj8OTdsSgS+38mxUJbh5/AcN6PT3VpXC72w5rUvYXPdTwB1IEc81UTH2cvVYc0q5o1Y lY9H8JnqwNcbcZFLlDerroClcbS0GX3O/hecuJtGKNP9RdKCRme9JRcK0F5HzeKriqPOIrqRS YC2FkcoeIY5GFoFWIDS5E3OULDjP5TZv13rT/VOjddjJyPNHuwYcQgqcK0U7JN4ayfZUw343N JZoyiu2nZjzTEIZQvhtBoWsYvdhtA9MXrkFBX2E12BXnAUq0SnSf4c1hzWEnyOHBJNdC6dkln n0SAOKvYc+ianCkxCDJ+zkslqSvbDru5fsZ+XX7DXM4Uxiu9CCCb8lpA2gBOGF7Wbkhq1cfCI PPq+RZLLsTAbMBuuobrHkJ7ds19VrwtouJkCtlb5xKbfLUqnfi2AlXIHn+alOUgW7DxrDPScJ H2eWhq2IQ3QLqS8vrc2kcV4hWb5slsz+J+7VQa3M8+aGnT0kC1G3pv9BgNRub9P2eXtjcX2JP qKCYbLTltbbr2yjVCMcy7xl8uMd7wSd3+SNx6F4l276mnCI+V1R/2wH3YIF04wrL154yl61lz Wjc/GYWIg4niFURoXbOdMCctwx+THvuBrcrNqRFQJ/24vQW9u7Wv2vNx56DU3letsIS9wczAi +wiu8krKUF0mdskpiYx3qaT8MHSpqhstc2j55S12yl83+7BPueg3ehUaTbGpu4BNPs5h/dYTm jY2YTPjr162ISOuGb7IFfVvlBLQRTg6QBhPs6AgqHLLGdX6/BvRwmkCWuoJ3gvHbEp2C5hWa1 HL4SQ8s9E3mHg2pMiviiSKqgrp7mJ0yOPzdFh3Hudyg1NWRQZSjUSluxDhCLNZshJPEXsOCpc jkKn2gppB5RwtJXMs/DYzdVxM7RO1+IU3ox+X5En1+eiZVpoRlF9QwgGnPJaTN4wfTo1b4vnr NMah2gJ0ePwKNqF5/Yywf0grAI+sj3W/W+fcVkwLXDBcw2uW/Vqd8toq9PlCL1ZellaDW98xj wfwN2E2KNPKESA= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/docker.scm (%docker-version): Update to 20.10.11. (docker-libnetwork): Update commit according to vendor.conf. (docker)[origin]: Remove docker-fix-tests.patch. [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and buildkit-qemu. Remove trailing #t. [native-inputs]: Replace go-1.14 by go. (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t= . * gnu/packages/networking.scm (go-sctp): Update commit according to docker-libnetwork's vendor.conf. * gnu/packages/patches/docker-fix-tests.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. =2D-- gnu/local.mk | 1 - gnu/packages/docker.scm | 69 ++++++++------------- gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 --------- 4 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index aa0117a3f5..f2dbd2330a 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -996,7 +996,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 062229b3b4..1d09184e4d 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -52,7 +52,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the ver= sions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.15") +(define %docker-version "20.10.11") (define-public python-docker (package @@ -248,13 +248,12 @@ (define-public containerd ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; There are no recent release for libnetwork, so choose the last commi= t of - ;; the branch that Docker uses, as can be seen in the Docker source fil= e - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important th= at - ;; this version is kept in sync with the version of Docker being used. - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's ven= dor.conf. - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Doc= ker + ;; source file. NOTE - It is important that this version is kept in sy= nc + ;; with the version of Docker being used. + (let ((commit "64b7a4574d1426139437d20e81c0b6d391130ec8") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -267,7 +266,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")= ) + "1sxn10kn5b6wv06im3y2as7pjsz51zyv3cd007blxjl9wivxzzxs")= ) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -320,9 +319,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) - (patches - (search-patches "docker-fix-tests.patch")))) + (base32 "1h1r66j57l073iba6hwrhcz779vaym68l1gfycdiw2d2gglfrdgr")))= ) (build-system gnu-build-system) (arguments `(#:modules @@ -365,9 +362,10 @@ (define-public docker (("DefaultRuntimeBinary =3D .*") (string-append "DefaultRuntimeBinary =3D \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName =3D .*") - (string-append "DefaultRuntimeName =3D \"" + "/sbin/runc\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" @@ -396,16 +394,6 @@ (define-public docker (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "registry/resumable/resumablerequestreader_test= .go" - (("I%27m%20not%20an%20url" all) - (string-append "\"" all "\""))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "vendor/gotest.tools/x/subtest/context.go" - (("func \\(tc \\*testcase\\) Cleanup\\(" all) - (string-append all "func()")) - (("tc\\.Cleanup\\(" all) - (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "te= st"))) @@ -442,6 +430,7 @@ (define-public docker ("blkid" "util-linux" "sbin/blkid") ("unpigz" "pigz" "bin/unpigz") ("iptables" "iptables" "sbin/iptables") + ("ip6tables" "iptables" "sbin/ip6tables") ("iptables-legacy" "iptables" "sbin/iptables") ("ip" "iproute2" "sbin/ip")) @@ -490,10 +479,10 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ .pc) - go-1.14 gotestsum pkg-config)) + go gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specializ= ed container systems. It includes components for orchestration, image @@ -611,7 +596,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "0dmmxn9ahyq2yq935fvp1b6ka6s43ih9nh6wwx8v6rjg7y35rb1n")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -631,11 +616,11 @@ (define-public docker-cli ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") - (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile"))) (replace 'build (lambda _ - (invoke "./scripts/build/dynbinary"))) + (setenv "GO_LINKMODE" "dynamic") + (invoke "./scripts/build/binary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PA= TH"))) @@ -644,8 +629,7 @@ (define-public docker-cli (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit= " - (or make-flags '()))) - #t))) + (or make-flags '())))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -658,8 +642,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))= ) - (install-file "build/docker" out-bin) - #t)))))) + (install-file "build/docker" out-bin))))))) (native-inputs (list go libltdl pkg-config)) (synopsis "Command line interface to Docker") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4923ec91e9..cc9864ef19 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1655,8 +1655,8 @@ (define-public go-netns (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.con= f. - (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847") - (revision "2")) + (let ((commit "f2269e66cdee387bd321445d5d300893449805be") + (revision "3")) (package (name "go-sctp") (version (git-version "0.0.0" revision commit)) @@ -1668,7 +1668,7 @@ (define-public go-sctp (file-name (git-file-name name version)) (sha256 (base32 - "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb")= ))) + "04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g")= ))) (build-system go-build-system) (arguments `(#:tests? #f ; Test suite is flakey. diff --git a/gnu/packages/patches/docker-fix-tests.patch b/gnu/packages/pa= tches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 =2D-- a/gnu/packages/patches/docker-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Danny Milosavljevic -The socket name ended up too long inside the container. -Use a shorter one. =2D--- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.99798594= 7 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 = +0100 -@@ -24,7 +24,7 @@ - ) - - const ( =2D- pluginAddress =3D "authz-test-plugin.sock" -+ pluginAddress =3D "/tmp/authz-test-plugin.sock" - ) - - func TestAuthZRequestPluginError(t *testing.T) { -@@ -263,12 +263,7 @@ - - // createTestPlugin creates a new sample authorization plugin - func createTestPlugin(t *testing.T) *authorizationPlugin { =2D- pwd, err :=3D os.Getwd() =2D- if err !=3D nil { =2D- t.Fatal(err) =2D- } =2D- =2D- client, err :=3D plugins.NewClient("unix:///"+path.Join(pwd, pluginAd= dress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err :=3D plugins.NewClient("unix:///"+path.Join("/", pluginAddr= ess), &tlsconfig.Options{InsecureSkipVerify: true}) - if err !=3D nil { - t.Fatalf("Failed to create client %v", err) - } =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 26 06:37:18 2021 Received: (at 52790) by debbugs.gnu.org; 26 Dec 2021 11:37:18 +0000 Received: from localhost ([127.0.0.1]:40304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1Rq2-0006KS-N6 for submit@debbugs.gnu.org; Sun, 26 Dec 2021 06:37:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1Rq0-0006KD-86 for 52790@debbugs.gnu.org; Sun, 26 Dec 2021 06:37:17 -0500 Received: from [2001:470:142:3::e] (port=51608 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1Rpu-00073d-VA; Sun, 26 Dec 2021 06:37:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=MddUmOSOp9isXo7UVzgZ1r6pB9Jy8rOiVOw7Hn2ymyM=; b=SeUymSkLDYUMG4Zbk57T NZYsCrvMk40LmjVGfFGLbI+UkFTvkMMZ0StELeDvrDmO6HEesYblM1IcnvAJD1DVX1bYPzgjZ87Wg omIBH1TEjv4BIolOWEkvxWrO/1tNCDzFDjgDT4+I6pYaE/tdxtfIGormTWOUB42LgNLR8Xc4SAdrp TneG0DWD2314VjQvVAgFlekbn5SWATEtjne7ZYohzwU1h8z9dCD/VqA4lMlDyXEyqLH9D+J2YOhpU IlYeUmjL3jXBK/eDLg1rD8Ev7uZ40i408VAL78FCPkRXY5Jb4RQlm89MCy5oP2MvzOMCkaYiyuJoh gqIiiXn+43cj7w==; Received: from [2a01:cb18:832e:5f00:3563:417e:2a38:86d8] (port=48398 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1Rpu-0006VZ-W5; Sun, 26 Dec 2021 06:37:11 -0500 From: Mathieu Othacehe To: Pierre Langlois Subject: Re: bug#52790: [PATCH 0/4] Update docker to 20.10.11. References: <877dbsu57g.fsf@gmx.com> Date: Sun, 26 Dec 2021 12:37:08 +0100 In-Reply-To: <877dbsu57g.fsf@gmx.com> (Pierre Langlois's message of "Sat, 25 Dec 2021 14:17:50 +0000") Message-ID: <874k6vsil7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52790 Cc: 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Pierre, > 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. Thanks for updating Docker. We have two system tests, that you can run this way: --8<---------------cut here---------------start------------->8--- make check-system TESTS="docker docker-system" --8<---------------cut here---------------end--------------->8--- Mathieu From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 11:44:47 2021 Received: (at 52790) by debbugs.gnu.org; 27 Dec 2021 16:44:47 +0000 Received: from localhost ([127.0.0.1]:44040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1t79-0000me-HW for submit@debbugs.gnu.org; Mon, 27 Dec 2021 11:44:47 -0500 Received: from mout.gmx.net ([212.227.15.19]:46439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1t73-0000mE-4u for 52790@debbugs.gnu.org; Mon, 27 Dec 2021 11:44:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640623475; bh=o+F1J2TXCcdwmZFYIwPRB8QVtmRNoMTmgu0QyF5xovE=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=P8OKajPQL9sHpkoiwBMHzBbabfVKbyG3+TrrdwSk+nF91fAZr/qDBrUyUEs7Iopfv dAHQhgIRXe20AkrVgSb2C5HGPOtXpJ5iollmFe90zbWvO22rFVDbDecGbBUAL89tP2 DLUdH4vyAgRIAFkAmgNDapMfHQB/tSJ384TRE0iE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MmlT2-1mcxwi2xWA-00jswH; Mon, 27 Dec 2021 17:44:34 +0100 References: <877dbsu57g.fsf@gmx.com> <874k6vsil7.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois To: Mathieu Othacehe Subject: Re: bug#52790: [PATCH 0/4] Update docker to 20.10.11. Date: Mon, 27 Dec 2021 16:42:24 +0000 In-reply-to: <874k6vsil7.fsf@gnu.org> Message-ID: <877dbqdmky.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:PgTD/qXLMOYBDv/4rPvBVhKNqbOgHYkfyTdHSAWpxsQecQ4J1RT c1IWQO8UtVmEuDNUtgm5t6K4xX0oh4zJvyUIwnSedHIjRkV3ifLFhgSv5Nw33z5Bk5oFzHS FJol3v7Z5lmxgRof7WJFmRnP4JquQIZ4BkpApOq1CvXdgij/gk6hhQ9YGIe0Y9v+itY9+Nw VSY00Eu9lUCgNw36j7rdQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:XzmAoMf8D+U=:FJwpfvX0xBEzJJFGRDaq7K iKzMdRaKtzjpDdvNbXdJ0jV0GiYrmHVnh5uSLIelPG3LhuhNNnchL9rOtaoQktWUozRjYewqo z49huq73VQLrV70CPxYqF5+fczvRUYzAIWsr4q90qFRfKJgYWs6jdvXjEBhlBiqC6BGc0Wu1K KxoBmf2CpZu8OTMAtpXLRTH+3YtRUTJLt+/qT0/KE1aai2V6/deyfRbD4wsSjGyOlGtXmTyVS nnrxc1FberY94677pK0zyvECh9gt8t2f4DDDINNUAavLydrYVRV3F8czWwogJbhMC/EuOrFuJ wdPGkHKS80pKHLEImnBFlYdu2A2PoizzAnydyXZGshJPpeRWkE9vEqxBeR+nLzuxlTJ9IsAtc pAPUip/Ta+r8RzuZmXkV6B+SQYqsCkj2YaHC9mopTjVocvbW9Gd7syE3Ssunxjoj69LySL9F4 3ymPTDnXLhc9GSKTIk+LmTNS2AIH7PjeGbx9JB4XWV0eN8VoW2MAJqCf5Ss0PablaB7LGJbyw JWzB60ypfdNoS8HBJCB/8jKraKSWa/0ycu5J9U4sQT501yNohY5Je48nLfuzb6vQwwXlXQJij C+9t6rDFbNcTe7FhX00LE+EVIScSBXAy2pLr0I54DfQUCD5D9jaBjKyg9Zz5UWc0dLxTgiyYV QzKRjEYqmlRbAgeuWuL1zs7DM+xiEUPYKEs98jnX7JLL41SL2EBg0DnJVU8at38HULFUfmOGq Sp9MyNaBjBun0rJvzCH+/t50wt96gFaQv/A8EFeCpJcLwaLIVrGHOVKIoExKBpssiRUAsA6A2 j15oc3uNLtD8/dg+GFJdDQ2XwUqHGw8tRfIV8qzYrCUKH2SiQVH5tp5KzWMbrk2untSngjAqg geR/LlSbjDqptwdc0Keia143aroad3T7yXCUnpRA0u39zUTd/QiiIzoekM+5LD7VjS5kQFb0w NtMA2/NYghQ+4g08zh4frHQY7o04UIDhzIZfmC6gl5X/Srql2TMDMUPrbBCAGgYG4wBQn3H+C 0q4ZfwSZeJXtFiMnC3Z1/4rzaI2Fs4JFy8NhLLQmwsUyEXy7uRVySQ0QtaU5CQZnmCbZ29rgD w4RbVGN2TsE5h0= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois , 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Hi, Mathieu Othacehe writes: > Hello Pierre, > >> 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. > > Thanks for updating Docker. We have two system tests, that you can run > this way: > > make check-system TESTS="docker docker-system" Oh yeah of course! These tests pass for me with this series. Thanks, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmHJ7W0YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U2cEH/09438Vwlzk/Mh5wLn+zqNKt uDQYpIpJ4dCOSCbJMqUk9nMwxgxdcDviRqEryUvI2E6JsH7YC9RDbn0NCWKzdrwo Wf9sNrcbfime9cbofLKZgZ8wCDsbIEMkNd9JkoBWNhGjGBdkLAngcdfGLFTwdy1M b0ojdv4WO6YEfq7kQGzmc+NdTxBU43qSJ+O8Rm39BQHLfnfASi4x/uiM3NLk/326 jadSoAukRY+MwIvV1OAG1c4K4muUnuh8azKX0oAhspUlufNZ1g11mO4qAfyyD/qP avAcnCmnYzZgkpoCHi2du1cbfQ3B+kcSc490QwBdVbE8sqF6+JU+/Ix5+ySSMLc= =ks5j -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:07 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:07 +0000 Received: from localhost ([127.0.0.1]:40291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SR-0003Lo-1y for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:07 -0400 Received: from mout.gmx.net ([212.227.17.22]:56989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Ka-D0 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774079; bh=5JW0WGmuVh0+zm+mF5jJ6VpT1xP3tJOxirayPYpgSWo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=d4sc3LKJlUGZJuoS0szjYbHBHnhti9Z2nZZP15gzUd9zWfJsXReSSZ7Xog9Qmx0Gw mqcFk0VelSS6lntRoVSdjcxsaaoHvptQvC5D8IS63reigvrKwbaDZDkvdKAzXY7HBm xsWQzIqanCGdI6WjYOnfXcl5tgz9i9FQtrGCgpIw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxUrx-1nydVu1pfd-00xvkE; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 1/7] gnu: runc: Update to 1.1.0. Date: Fri, 1 Apr 2022 01:46:36 +0100 Message-Id: <20220401004642.14949-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Non7UZ1Nd9SgmgPN/jD25evZGWeu0vq0YPHa8QaDswxLgT/ihFO olNBHMb0uF7p5aAMhqLasLDgd4xk4X3y53Vj4BOh7vLmd+7NW83C5oTGwMPEqYzygtAVQWI Yzejv+NLi1eBfZCho6jQh6w1JQzFJPVMq3AtYn5q12lny7kvRiiD5nXjSYTF5khSHcs07Ph JgWM3r458lCh1yxrOh7Dg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:CCAWkb+3ZOA=:7HPmyc7Yu24p1vXVgfF3rT 2pYzrw4gKmgVGbMfvSVJC9mk1tQuj2OQ+8SNiyRItvUn4UpRjtsY82rvAWWSrFs6SbMWagCqd Pbn2puFzFV6KkBN5WYJt8iTE1uJX+D2DJB8Yk+UZ8r7CY4Trj2CoEH2hHoIMSjX9jBllVwATE tgpsOj6UUFKDkZr4b1FbqHBOO8fAGuw2lIz+iPsfCIz2MORySu+yzilfHX3frYPGMfFiiFtHm xZ/G2hOpKnKSrYXA8nLdwHFUvX5b8PqeGpD/EpKSes0U46ZTj90zMYLI45Kh2Gd7wZnT/RrZK 7mUUzMcKyj+0GZ+f5c81AKKUQwbexmNgOiPeV9xInwb9OO0Y/RfiUsdM6DxkxHnIdIAtsicoS LWzxo0PxmuE8d/cOhtBz/3UFFlL2rfAwuj/PZxUpYcbNNeJyJGxb7CqZtGdWJnipNHy/YhEJ0 e3UrHbgvFSrEBWs/Y5w+1mbNR88ibhfBJRDZ7n3nln0smoRz63imiiB1lSnAreFnU6KEYAhsN 2pUWvarN/Cx1w/iooZhv8qinW3cdhSbb2HObfuyEtqkETwun45x6kgg1V3/NXmWGKd08MzHp8 JzxmNUHgAiL3ZRcykqs4huwtWEXT21oVVaXpEyZhhgxAyGwcl92XrK4udr6jvsqBk2KOVmO2m dBWWwWaGJUvdL8fw2GU2sgAQkxo4hUa9YIFydQi+XE0C/z/jae2lLAWXfksOCShHmABU5hvXr xm2dhNSbb5Yg6Y+A8dxTzA5C77sO4J/uTu4WCDMT3uMsOz7qtmBbLtFEZm0nNALSIwrqc9RdJ lzvp7lYfbhT5xinOTRK3Yrxauh7E3WNSKdoiwc/epUN0n3qg+pmKH4eSR3sD2v1iWKtQBUiQj p/1O1uiOw4JVjTURMqiIIjzscbszL+nwregjrpzaRSKhQSB0tWiqouScIqNPpZNQw6BeUpt5K OOlEEocUegUC9WuzDysWd5LYSBO1x0DpuOTtdhsdoihfWXp+CvBZWPPQUwxtGMeiQX+5M6zw8 AKIPc/nh4CoK8Kr/y1N/jN+dFXTU8baKj6xbe1JlRpPkWXq7J+rjvAoE6JqwFdDdGAJEKNShm c5NxVqfP1vtpoQ= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (runc): Update to 1.1.0. =2D-- gnu/packages/virtualization.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index a058e59f6b..d0a37fcb0c 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2020, 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2021 Leo Famulari -;;; Copyright =C2=A9 2021 Pierre Langlois +;;; Copyright =C2=A9 2021, 2022 Pierre Langlois ;;; Copyright =C2=A9 2021 Dion Mendel ;;; Copyright =C2=A9 2021 Andrew Whatson ;;; Copyright =C2=A9 2021 Vincent Legoll @@ -1776,7 +1776,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.0.0-rc93") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append @@ -1785,7 +1785,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))= ) + "08y6vp94y37ps8wx7njss8l7f57qa8bbsrz32xkmm91sg5sqjbhm")))= ) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:08 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:08 +0000 Received: from localhost ([127.0.0.1]:40294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SR-0003Lr-Cz for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:08 -0400 Received: from mout.gmx.net ([212.227.17.20]:48025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Kb-Do for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774079; bh=6rG94DA0geVgXhdK2XddauNP8sCo9E/0XkSK++UK8nE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=JEiMXgvfWh2W9yopCFQm3Js7laI/rQFaMcAvFQ2EpOzehd2c2QDjbFGA93y9o0SkL PpWIJyLWXmtEu78JLo5YVxuqsBp53UTecpLSVXyygxBTrtVjMco4bCJHt94iWTDCKM QW/2PzRiI+uFnFKoOT479NCyldDQC2NX6L3azKzY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MaJ81-1nUqfC0cir-00WH1G; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 0/7] Update docker to 20.10.14. Date: Fri, 1 Apr 2022 01:46:35 +0100 Message-Id: <20220401004642.14949-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:GKd/dJDINo2xkLYjDpEYwWDVOmj5nREwFh/8Oa140n1P43kmnnK qV2cH8HniGmjoWPuqfxy1iqlKPTqQt4wFeSCFBk2Gpf4T20Mf19X9GHR0yZO/Url2TWCpqE DHC3Dv4ZZDjXAW3dDdyP0TGtLlDqy5Zv5R/kHz8utPjVpVsgGSI1N+PycQqCv2WddoKcDZr tjgZOakUd2ihUwsAkNBlQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:6xyX6jZZk58=:H1tRoIuDIb0/mXhN/PRs0C 8O0VvJcyivWdC3Kt5mI9sUeoCx4+tylhkNiPiqceJ7anGyg2dh8EZMp8fP2ruxw+YtYCLFBX8 KMiUfVmFHYvK9SFhMHiZct5nWQuhIPwkXMyrClc+smiT674LhHdHzeR2dZYfufo7WcdZd1n4q u2PJ4/PBLREibWTnGICM33zmbBQ6bFh0INZ9SRsS4LdHh8ylzMKxdzog8O3gwhtk3WxeV7Ihz /4jY+NKoe3LjWizGLPLj/6DHOWIeQ8YCWS0hW/o4Wrb4hsT1n4oN5nTlKdSCn7QrhImtOewJ1 5dtIm/Vd9SHH8DGiUEOgL1KzPqaGkmVVNxzais7PMzVBR3Bmv6skXm7cZArnH3kYehnajgDJQ CqnD/aqWZN53GRUKWmzciOGVIMLVNs+jVoaY8aWEoxYApxgC02BcWCGtLrjVq1AB5HulNN+Ip NhMN0AszIrd7YhkH6Uh1hccFiqvJMI9IEKLv67mUxlnV3rx5RyIYGal+Un5xeVySOzAVQbRPj B05o22QvHW9bBfn14LuCgMVGdpssfJudfKWwBowd+GUfqnfWDHrcU0FeT+1ZRYSMrHb2TodQM N0yIaSjfyZ5pobMaxGFqTH/k+P7X5ximkumgpbP5c1MPUtYmrNwmqUmRp6pXzgsRZz4csqiOL df1ZvSRS0+542tYP/jt8NNXoKRAO++lwPLr4wC/CAHmTUAsqxcfiyjzTmNMFwJgijfMxNTFZh WQytNonPf6Q3cgYSAgsuf4nKQA/mqsl9R+P9VucKyT6jsJjv9lCEdIHpl98Nf96ucI6Q1x64n YZOCS37u0BA6PyGZ9gNKpfs/v/oc2eI97lRRzlKAEgBHNv6NP29LDvkmzywM+zc3F2+/y8QFB bKb6dmHvdl2J3sqLyXCmasvFBcDSnqzsxRbPehFsA+gXnOoVCvsMRfsNO1HPKjNyIHfBcZ0kM qdJ9ynryORjZXeofpyIXac3+W7h5Kp+XMbomHczWrWKd0ybYztLaDeB+y8fsaXoFfxt4dmZNi dEG0V86Ujc9DaYzdPW12K6hGRwo+QPW2XAa1P87b2kvCJTWyXDcbzLkMQCYxzqU1ZHjMNCJNz WH3uL+jnXhdRbs= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Guix! I rebased this series, updated it to 20.10.14 and did a bit of spring gexp cleanup. Tested manually with a simple Ubuntu container, and with make check-system TESTS=3D"docker docker-system" I've seen reports of issues on help-guix that /look/ like patch number 2 m= ight fix it, so we could submit that first if the rest needs more work. WDYT? Thanks, Pierre Pierre Langlois (7): gnu: runc: Update to 1.1.0. gnu: containerd: Fix patch-paths build phase. gnu: containerd: Update to 1.6.2. gnu: containerd: Switch to gexp arguments. gnu: docker: Fix mkfs.xfs reference. gnu: docker: Update to 20.10.14. gnu: docker: Switch to gexp and new input style. gnu/local.mk | 1 - gnu/packages/docker.scm | 625 ++++++++++---------- gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 - gnu/packages/virtualization.scm | 6 +- 5 files changed, 314 insertions(+), 352 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:14 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:14 +0000 Received: from localhost ([127.0.0.1]:40297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MW-AP for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:34063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Kc-L3 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=MvcC6U6hN7fxQUIhROriuHBQpgsuvj2vFKRUdFYkRFc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hmyvNz33WuwbV9v0fQFLPFM3mVKkBTU5OrNoDwAO53zz/pIiX+wz1FrTXh7VW7Gwz 6NboqUd2Z5h5AdJ0htHVABrgVrYYjID5MCSdt7ldjxvFheZejjyVIk1+uFlFpjF/Ju bAsIZ+JX1ohAinOt6BrmB2u7Ywf5j3Ujpsnq/7pM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MY6Cb-1nX2WI3BE5-00YSsc; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 2/7] gnu: containerd: Fix patch-paths build phase. Date: Fri, 1 Apr 2022 01:46:37 +0100 Message-Id: <20220401004642.14949-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:k4yOIkug6PAhy/RISuMtrWxLKw1fdnoZa+u86vA2QUlRQSE49Ox ZdUafBqzgHk1UVmMIX1ItdUfoaALEyAaibesHtPSrD57XlozUcnSHIXLXgiTBIbow1YI/am CgP20iBBHpuxIP6Uvz+mABdMtqv0JRwSBgov2WsDImIPLgc3EkhU4GN2yBW2htDldkrs2DI dDzC6W/5mko3i4tdteroA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:y+BoSEDzkXA=:J1PBeKd7F9BEigse44KNsg fMhEK5ts3r9naxKETQJJ/nL7yLizdXI+Qegkh1kAcaRwLcyhnYflcXHhbXZ34U2U2ssOy5B2Q gHzDwwPbgmM5QZ7yMeE7k+DOf2gGJwIoB7RVFEyoD00BxrEGoHNgVt3PDf9aDr8S+lPSNxm8h 56oYT6++XPjUCRAy0USa7XwyL9vArH6y29SfxkArNbKjmvXbJmIIzl50meHU0Bs5dFmmSA3Ox z+tlgh0cUrqW0cT02KVluVSb3Bwbh1iKRtIqEdqG9DS0YySWA9WrDhQ1r47pyJdGg/I0TW8pp kY4/iOJQCaXLkKXBad5XJAoZtSmJCvMuIkYjFaqEf4CnrQhJOYORp3TmODw5b90BgLcZMtAbw sPqnY3db816LEfZB9oPw5riyHEFKZfsQq8GYw6d6qXQL0MRNQfwkPCXCGHljQsY0NsWwzfHaX LVNk1kIz1Spyk2P+ujk/F88CcJqmEDN18/nLYgCSDTAaykLpLL/dJ9UxMoI2FNqwgm7cn6x+C fYrQszV1dIiN2+g0aPGDWaGTOlRRV/nq+I165KRkL3Ws/h+nfAinXifYIsJRAphFnloiccfkd b0sU6prX0xDbMY6IvBj4IdTotAZyeyuGK99JDZrC0vW74sOYKUP1NQCn8IyBViiYyHkx0ICkP sdNIXAHZSjV0nJMSEC1B1zmY4VqtlCZ9fLwMY/RKDLlqEYv1SiYMntxDAXEyYek84RNOeAo8S Dn9bMyRRRjcXWt/THArdn6c8qe2EW6fMtVnb6LTLGRFrKcVUQNflHehovbIPJzoeGo3NXQHlD GYyoINiblh+hP2Wc1ek/LnmYNNTGPetjGbX10HcpJ+2wsC0YFtj5FjTFBcJioBXvuCS5egppi ndKW9aNBnR1HC1VAi2VJ8Bkb0EVmMnTL8TXi2nGZyrer1BldyCuiAM5redxu9EzK3KBanlOpK adu6UUiLEiTLmu/4zUXnNl3Y/VCNC22SCp8fMbGxT1vhQkXz24Ib0IHAwrOgdGxaqVC60VLJ/ /jqOWIlN8zUn4u0s0H+EjrBP+0foH/gVB4W9aeQAJBB2cWcixjOyiZCSeG4L3IiaDFetDI6E3 oOTA2lbUqZ3F/I= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. =2D-- gnu/packages/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3f52f4f8db..b76db22d58 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Katherine Cox-Buday ;;; Copyright =C2=A9 2020 Jesse Dowell ;;; Copyright =C2=A9 2021 Oleg Pykhalov +;;; Copyright =C2=A9 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,7 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-after 'chdir 'patch-paths + (add-after 'unpack 'patch-paths (lambda* (#:key inputs import-path outputs #:allow-other-key= s) (with-directory-excursion (string-append "src/" import-pat= h) (substitute* "runtime/v1/linux/runtime.go" =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:15 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MY-O0 for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:56489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Ke-34 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=+IvPEElv+cBXbh5a0A65j6GOK6ILdAzJ6HR/YfD+DKI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XnzO2wCPf+WPRge9jEplPe8JZNY253p2JSZWaGICtdN2+KOh2keYHk7lB5gxlvTtg +hlRKFTSQkdVq4hJfneMrpEwFMIQ6ttX3poEp4cjJQhQMpvi0NyCeidkOeYDFZ+Obb Q91+eXF0Mn0BEaHg9W81Xwistat+a7gGj1G0hhw4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MXXyJ-1nWUHv0LTb-00Z0qO; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 3/7] gnu: containerd: Update to 1.6.2. Date: Fri, 1 Apr 2022 01:46:38 +0100 Message-Id: <20220401004642.14949-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:abrjmIZq+iztjVYRWSQY/B8YSavoSfsuDHSu10PSUlvHj5PToIw Gq9wNpgitZPe2tdAE93YtvoOtE5txsfdwAUHyTXWDy+kpyY8dNhqBtwZ/RZlabQGMTOK+2w f++gkdLw315MSzF2Yql1P6MXjvr8U3UO0y2Z5QpnwG4NTZQAU+4vGD8o5B+xyLnQrUCLeaG oSlWoJeKzBRrjOo9beGSw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:zsp6pgBsbjA=:I+0UmHrzc0N+mXrQvcm9hw jf04X64/h2FBMOY+Gy56AiA4tASYIcc/pLctg0T8eyfphqjK0Hbsy6cJ/vY2BzZlRIZ9si0I6 IVA7g0XmotNnu5UtIGCngxJptdvs0eOzg9wtEWP28EG0PHfX+s1cmShn7ADhJ415YN9tDEAko jbgzC+Qknyl3wYkJ61JjEVodFpIVE4uRd7LFqlaDGoHDfxThTIzcih4gKf0aHUpIpYYd1EkUl eUPiGCcNTQjVfhhzAi7Qk9LmtRRqPf8OxCuVm0VySG5xyvAfqUjvgK9Y0Gz7hZw2WhHYNdBRH 9caBO9rEfPVLpw1vUIgFYiHx48vGMvZrXeT1bF4uT9fb0h+VWyzKH3lq/nyIllr532o6/yVF6 o7D4glynrGhxWu79lBz2DQiG4kmLVjg/LqVHz5TIBTOhPLGXQCxRxcWTk1UmgKIYW/QVI/+hx 1VW/MPue02kqWq9S29+qNBMFnb9EGnkKY7iFw3WNFF6q6nhDycPmCBs8EAYUW2NRiXPYwWtFz uKOxDTAovwUJkSnAgm/GzQCUhDWfUgt+sQPwrP2MSkLnooI+pHZs1sHSro8QRYgnEeXUPLYB+ lX+Q1PieT55UrtAcB6NRJpNJcJEvQOOxQ3pGdtmafrV2DveAPh0jkwDkafUAzlg45nTaELdkj eXRifPTwMWEhu1qEChDhILcD9Ph0TRZHjKrkQVOVnIEpLQ9UrV2GSSa7AeDKcAeLjT5LBsfSS 0cOAgnzQqat2E315D6jS2zHTIq1fEhDF9+3F1pp+rfNBgIIzQ7S9U5PBd6u0KrF8IbKZew9Z2 YdJs2XEZD/NZR8VKCBpU2rbuyiwhEQthMmOFUIGbnFRxPIsSRBT+oYKgeR4ek7bRKmuKydALO zgP74uXtdmsNSg9ixP4IHdP4aGGkYHMuZndk1XPJlK8yLFggw/LXBNIZdomEJ5PKaj/RK71z/ hI/4D2sY2D4q6QuUoFZ9x+sQYwEI9X6ZzqPFkHqNIlk/dIOYAtG2rYQOXRCUsiBuSp/5EcSSM VOBJiWwkKjvM46JLaCEGwBIPKFOHNQVzvbcP/LEURoBpRcZNuKsyY36d4S0JMi9Wat/aGYWLc RMSwaUQzQ5DDzk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd): Update to 1.6.2. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". = Set PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX. =2D-- 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 b76db22d58..7a7594f2b1 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -174,7 +174,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.6.2") (source (origin (method git-fetch) @@ -183,7 +183,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))= ) + (base32 "0fw62aya0gwxaa2kkcjkbifp8n0xmk1x0qzjahlsls6g0pmh5pkq")))= ) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=3D" version) @@ -203,6 +203,11 @@ (define-public containerd (string-append "defaultShim =3D \"" (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]*=3D.*") (string-append "DefaultCommand =3D \"" @@ -226,8 +231,8 @@ (define-public containerd (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-pat= h) (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=3D" out) = "install" - ',make-flags))))))))) + (apply invoke "make" (string-append "DESTDIR=3D" out) + "PREFIX=3D" "install" ',make-flags))))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:15 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mg-0j for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:15 -0400 Received: from mout.gmx.net ([212.227.17.20]:56229) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Kf-9W for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=wpuY0jE0Kjgp3uAXlwWTpSxzbEmYcwYp2LaBjQfdYP0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=l4xhw07el7vSIa5puavUIjejxTSg3rf6sU4FoG9jvckzZwIcPbw265+o8LEksOoVG RqTa5o7q3adq5yPB8X790GAs++EpvtYcBnipIqHsLkNGzP1dRukA30HZ8D0LYBbqCy G7B7m68Uy17s/+C2Q4PE2ffer/OHd26UvBgTTEis= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MrQJ5-1oLIaV1eXX-00oUMK; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 4/7] gnu: containerd: Switch to gexp arguments. Date: Fri, 1 Apr 2022 01:46:39 +0100 Message-Id: <20220401004642.14949-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:jlYTAVBc9bg+Bb6YKCqodi5HHFXPhWQcf7TCoTVryUXYb/SQUCW VzU6xsmloqbQz1P0i/QmXKvWKSUrt0f9/o/hdWJTsM8LVv6iUDrpGY9ixtZ+RTM1cBaof5G 80njqMIQlXk9Jpbry9ETBEVHHDQdY5T+o7uFHUVN5fJnscoYkpDvtMo4BHZ1Pgs0cJ+rx2h IA8CpaJhl4/v3VCneX8DQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:7MzxoOmavMY=:EO+qVzEIpH/hl0uU0HSA2e T/NIhEhQWK+EFEL1twrfilsM47dSsZTjAhOuMGmc6VOCS8QlJQgQf9Cux3lLr+Zhb7dU+m/cT FhYTUekSiGi3Nd7raKj7U4KUG1YU6ez5U0dzwwG/hg/73Zc6AlysLZQX3NYfHvU6OI83JThOF YmrctpDjhVGCzJCCejnAJKh35dChzfrA09XVMjJbrz1CbVmDq1cCC+9X1DHaM0qyGP7RVRSIn Qj0fDbwsqemmjQwI0jO+IL0buGPhYo7msNjVULasc6YF8x7JkLtWQJZsEHT6qF3io2gtUZXQt Kc5vhleJBPtXJgg184jaEeSkaPl4UOOEFiJE6l3dkleuRYYKe9q6jWG5+hSe7vUDZkYg+Kg9f 2H8Zq1JQJkXobHNZByHfDu0keNAkIWut96XI35R5Kc4LGDbj1oGGGKT4gXPhkknFNgyP109+e dfgXbck8E9fCik2dtcMUACCotlqCeJPT3GWtOTnkPftx1MlZUIoEl45pSHn9jvCjNi94HrlL3 n4UUE0YbhpoD465idJFPwYxwOuDFlfgqM3y9uxeel1bu3OT/a/ji4kx0xiETGcED75TybRkzv I5sr41jg1F78PhmOaJwyFRGqfXm2JPCbQbTSpvetDXd/VD3x2e1v8sXfng6gv/FpZr2pNO6Zt Lz5H6YXprYb1IyC0tDr4xiy783tJX8j5bBnZolWEThcotEsqEkhHV4ZlA4R2Rg7UIanAh8E6q B2pFcXVC0nXzYyaeudJ92VeJQ4GRzu1S2Mp5hN5fIhMqtHNJLUUASbEXQc7RkmkPj/9yWi/bo 43K6SCFSOkK9LnoekfxIlsto3esMLT7/d2a2A4safRAgUZ50PDAHyukXzpt7+41hOnC7V2hlF C+lkGGw52b077pdoQqGFCEhJwvZzXoMySpcYnty1QWRF2bS7lDVNJAFt0nrRe7xjd/nGzZpmh 5RmxI+7pfET0lGQXssAbNzwlYlPLksubdUG0q4l3Y3m8SIpS9PYsTuRcWz4vTOLdRuyHjfrpl W9IrtY2QQjMbP57azfEYEfXjPm0tKk1DILR8+ZeGK4gjdwbu56BQsHdQjpp1bRKcR/jr8aO9U 8RFayiMtAV49Yo= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd)[arguments]: Rewrite as gexps. Pass all flags via make-flags variable. Switch to using search-input-file. =2D-- gnu/packages/docker.scm | 95 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7a7594f2b1..d2c022f552 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -29,6 +29,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -186,53 +187,55 @@ (define-public containerd (base32 "0fw62aya0gwxaa2kkcjkbifp8n0xmk1x0qzjahlsls6g0pmh5pkq")))= ) (build-system go-build-system) (arguments - (let ((make-flags (list (string-append "VERSION=3D" version) - "REVISION=3D0"))) - `(#:import-path "github.com/containerd/containerd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs import-path outputs #:allow-other-key= s) - (with-directory-excursion (string-append "src/" import-pat= h) - (substitute* "runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=3D.*") - (string-append "defaultRuntime =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=3D.*") - (string-append "defaultShim =3D \"" - (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]*=3D.*") - (string-append "DefaultCommand =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/te= stutil\ + (let ((make-flags #~(list (string-append "VERSION=3D" #$version) + (string-append "DESTDIR=3D" #$output) + "PREFIX=3D" + "REVISION=3D0"))) + (list + #:import-path "github.com/containerd/containerd" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs import-path outputs #:allow-other-ke= ys) + (with-directory-excursion (string-append "src/" import-pa= th) + (substitute* "runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (search-input-file inputs "/sbin/runc= ") + "\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (search-input-file inputs "/sbin/runc= ") + "\""))) + (substitute* "vendor/github.com/containerd/go-runc/runc= .go" + (("DefaultCommand[ \t]*=3D.*") + (string-append "DefaultCommand =3D \"" + (search-input-file inputs "/sbin/runc= ") + "\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/t= estutil\ /loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) - (substitute* "archive/compression/compression.go" - (("exec\\.LookPath\\(\"unpigz\"\\)") - (string-append "\"" (assoc-ref inputs "pigz") - "/bin/unpigz\", error(nil)")))))) - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-pat= h) - (apply invoke "make" ',make-flags)))) - (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-pat= h) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=3D" out) - "PREFIX=3D" "install" ',make-flags))))))))) + (("exec\\.Command\\(\"losetup\"") + (string-append "exec.Command(\"" + (search-input-file inputs "/sbin/lose= tup") + "\""))) + (substitute* "archive/compression/compression.go" + (("exec\\.LookPath\\(\"unpigz\"\\)") + (string-append "\"" + (search-input-file inputs "/bin/unpig= z") + "\", error(nil)")))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-pa= th) + (apply invoke "make" #$make-flags)))) + (replace 'install + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-pa= th) + (apply invoke "make" "install" #$make-flags)))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:15 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mn-ID for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:15 -0400 Received: from mout.gmx.net ([212.227.17.21]:40443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Ki-RY for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=QgwONXUMdcZ6CcUXT7ll+aKkXEftXpmu3oZ4FF/MWcU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SRzlBbB7kt8j5XjhnRyKAnLSV9ccZzLPzTRAXpYWDAvvCfBMYx+5cbvDM3tJm3lyu drj8QJhmLbc96GL4k1N1RTp3y5i4ImJGzI2bVJJU7cuxMwUA8Yi+5zGYYHkP8J38w1 cm5hkL8h6RLIQgNwDweqFFhTpwBiHry64OnU+IQA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsHnm-1ntOQc2uKY-00tmsH; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 5/7] gnu: docker: Fix mkfs.xfs reference. Date: Fri, 1 Apr 2022 01:46:40 +0100 Message-Id: <20220401004642.14949-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:0LV0jJVxk/Rjtq5NJQS+GegKLlafUkMK8gKCok3VsR4GDb6t39g ihNyc7CvYbBROzTLoOYpQVMDI5ujfCpmNfpHsFq5RUi+u8Es1XDIwQJVC6SKSzZJ3FvTzHZ p8LNJGVq8fKJGX9+wwtLdMv6Kgnl06/kTGxXkl/Px2LgvIHriMcLCmBFnf7rcgjxClr06/6 D9YAlrTvtdxKIYgOwYdxQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:msASw76Ppow=:vWYXdA/foHf9WZPq3s88lX LjBIM6QzmrWXJuKvs7faNrVA0VLXQPhsxMpCOpY0hjNNNIc5W/5ksd5Z7Kl0mh5OAJRNTygfd pwHI0W9TqE8hbBkfJtokBBPo0QyXrKDncg8bdUvwSKMelxkubwxwfeB6yKHkMQ1roo9MSFOqL dOIJgYRFPy8niqGtAI/zamXDxQJJlL83c0vbFB6Oy6vYAKdYPYfWIzdxcl4orz9HW4E7wIDaz zNWfQ6zaXb+l2MNQblVMZ+rYxO29GYLnvdVWwz+83md4FvlwkbXMFXhjDif0oG36Pe6OJfv1I YQADJ5GNFxFRU+HFXIwwvFgPSaXd05pGZNZoBKxZkFgIuEZ++YJPkAfEd1+9SLm8orroO4PsS Zyjt3L84qGdb3egkbR59q1TCkRd3QzekANg/PIdq+G8sAOWhY8t4TsM6uJsouOCjvhUy6XeBD guvj9vAcuqheSpLyehsw3W/3aLjp2Qyg2hi8eK/BzsvvQvNu7B8sePNVVA+0zKs0PTxFxKTHa IpLIxbB8mxIaOXKZj8YmhJWwJn4KxVX6QV2TDBGo5IR0KXRP9BCNGohP4CUT1BYLaEHuzAioz sTVgNlWBK6jCK8Ut3pmN9KdtMugOrRx8OCROOuGHtqG/FkrurFnCuWxFnm+LH44zFHnPqNk7G r4aDPcfKuGFlIFbZr2MyV8Eq3hNUe/drEWbw0SA2fytguc4dP03f9MGeZsLDy5njumJgaUitd IMyjOA9cSFW8fs9ygH7GSTrTyTmO0ZDbP3R7k56i+p1jrmj+QHDpd64ePaAuFXDcX+mvpDYy5 AUk0FeRl79qVntiQApZXd/rKuRkdyn8V+zcCD6f3K8+2nevnQdO7vpQ9hwdtpyipsU+Rvtr67 WbrNoZ5MIirlxwcJSJ0NG42AJts3Gd+K/Fg+DOLq89QkXKwp4x1C4Vpi6H8bnBrzjuknZe6xB Mr6g/uEcer2YYKko8edKXMDh8dTD37If8EMpXV/asbqgxqQ0jS4tOIuSA3WZstTJ7756IFsy3 IXw3I9hjUl6eEfN57V7G7T8rQX7IQ6Pevc+hZjAyWTB4FmO2/+I06/QoQWTg6kCHXRo9ajcSo by87dltteeRadM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (docker)[arguments]: Refer to sbin/mkfs.xfs instead of bin/mkfs.xfs. =2D-- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index d2c022f552..0d721ead38 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -440,7 +440,7 @@ (define-public docker (substitute-LookPath* ("containerd" "containerd" "bin/containerd") ("ps" "procps" "bin/ps") - ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") + ("mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") ("pvdisplay" "lvm2" "sbin/pvdisplay") ("blkid" "util-linux" "sbin/blkid") =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:20 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:20 +0000 Received: from localhost ([127.0.0.1]:40305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mu-QT for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:20 -0400 Received: from mout.gmx.net ([212.227.17.21]:58821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Kk-Ul for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774081; bh=mCTP99AL91AbFIb9Dck7nh1badsTt69n3gx+7E6LFKo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Xvkr9mcIslDqkYO8w68ZE6FWCJmN3a+3Q+FXHpN5po8Wr42k1F94TLVz831AeA25K yUdXK8n06HmKy1tfxWclgEMTxsSGHKxQ6bgMmgK4LT1T6wby1OCd6IUAQp29F4/Aou VzpgEKcy9+YBew05+VpYIXP0rEFkyfPflP1TgSZ0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MBUqF-1njjqQ0Arn-00CvcG; Fri, 01 Apr 2022 02:48:01 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 6/7] gnu: docker: Update to 20.10.14. Date: Fri, 1 Apr 2022 01:46:41 +0100 Message-Id: <20220401004642.14949-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:I0S7OvuPdm4nMhPUHJyZBhpM/0qyXk1YEchsYY/pE1/t4HhxuSZ jBPmvQP5Ow1SLWr1IH9KfjQxmuV0zJVX9vJkqy3O1NPKmbvduEGmHFQKmAxNL3m6NIvHBgq Zs/CXgiq3O2VoEmgqi98sMDrCQqJgQR4Ong7CVjGns3B3ffswfaUXDCW3V2aj4KV8vQJSlx 3SVzjKqLdX5y7/1Y2D0lA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:gkj60CeNQCI=:IUW2Ux1OJlMxdciakfh1iv IGLxuwo0lJhzknOFZ9IgjxniQ3WMQY/udFwHqMbdpOwvqCKz8zIPdnMRjS3Sdjwx8UTds2F0n 50Fa/IfMOaDsxhgDeM8KRQVy+F4C7dKQ4/7wZLw2llWHN3Ewab9kH5dv5i/i7MFEvTJL24L7I 2wJjr2UuUD9gJUzcgkcI5osB5nTQ2Xqnq6+3sqOlTAK7SCbec2J/eqJQI19QolLx02qgdulQ/ +B+kVvHQJHwiMBY4fIneOMqdAhF6YQnQLgRW/v1r/4qSYBw/1+PQF/K0zDNi8/EJzFgXfB0Pi 8PP+QYB0IjMti+hMtlUHbYnlOmDlIFdD4+rKsYpL3U86fMln/CtCWITfyzmYjJBTEqc9mBfQu MTfq8fdIEr/yYE94jEW4s93esSSbx1ulwXKlP+v/lAi2h2M2TYnad80QkYwzOM6PhnTeVIqYd l7G1u6aDD0Xf2j8Pn3V3EsBWh27sQWAqnmJRFzisnaKo+UACvZqIfYCXTGAD2PU+SNN1TTw8T 7vkK2iUlGL9N0nWoKd3XspW99zFOH2dDTdKGhe7HnUD0kgIKJSqAl/nVChZd0GWjImPKQER/2 kcVNrWJXN2GWFck2VZqfp3wAwFozY8M2augUQyk5KdJ5Tc5F9jglXNAJVYe+sSunQ1wmWmIiW 4BQZyquHtQRVsN65QDq3JOwAEVv9xwm0rrrrJHvH9PIztrrQfOIuPRr2nOSzmR5uLiTwEZ5S1 KxsacWj3p+MBPHi8JszogX+nMZ8hl3c4bSsBSElYtpKRPdxwX2Xji9rh8xozNwGHIXm+Xi48f kArhYKOzbMXxOWLG14If5sNpUPzpdHFIUsAnYyZ289y1S4OQchTa5skCWuoWgxM1Xzu9ker0y TI0X2LB0nF4DFEfg45fwMqeJo0q729KziR5GLh6RUBElkXwKnqclKV/U6BnQUoybMrbFWsP7l 0gn2VhJYJ2P1N33oPWK9mOn3AaHd76hkaFFBcFGkSgSV3VYhgeNUkwr7DBjRlOZHFc6HCsoGP f2c/THjbXz6HWjS9BrbPG2btvLZKv9kovH94e0kaABShCyhca9EvZZrAuAsioSXu6BHgzA+om d9OerULU05ivFM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (%docker-version): Update to 20.10.14. (docker-libnetwork): Update commit according to vendor.conf. (docker)[origin]: Remove docker-fix-tests.patch. [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and buildkit-qemu. Remove trailing #t. [native-inputs]: Replace go-1.14 by go. (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t= . * gnu/packages/networking.scm (go-sctp): Update commit according to docker-libnetwork's vendor.conf. * gnu/packages/patches/docker-fix-tests.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. =2D-- gnu/local.mk | 1 - gnu/packages/docker.scm | 69 ++++++++------------- gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 --------- 4 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index a704161abc..d5b3d4bba3 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1007,7 +1007,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0d721ead38..020c89bb11 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -54,7 +54,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the ver= sions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.15") +(define %docker-version "20.10.14") (define-public python-docker (package @@ -252,13 +252,12 @@ (define-public containerd ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; There are no recent release for libnetwork, so choose the last commi= t of - ;; the branch that Docker uses, as can be seen in the Docker source fil= e - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important th= at - ;; this version is kept in sync with the version of Docker being used. - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's ven= dor.conf. - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Doc= ker + ;; source file. NOTE - It is important that this version is kept in sy= nc + ;; with the version of Docker being used. + (let ((commit "339b972b464ee3d401b5788b2af9e31d09d6b7da") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -271,7 +270,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")= ) + "0wx2hdwx56cbxiaky9kw2bi1prdfgzwr776lq1k0slw8kvn0cn32")= ) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -324,9 +323,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) - (patches - (search-patches "docker-fix-tests.patch")))) + (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))= ) (build-system gnu-build-system) (arguments `(#:modules @@ -369,9 +366,10 @@ (define-public docker (("DefaultRuntimeBinary =3D .*") (string-append "DefaultRuntimeBinary =3D \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName =3D .*") - (string-append "DefaultRuntimeName =3D \"" + "/sbin/runc\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" @@ -400,16 +398,6 @@ (define-public docker (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "registry/resumable/resumablerequestreader_test= .go" - (("I%27m%20not%20an%20url" all) - (string-append "\"" all "\""))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "vendor/gotest.tools/x/subtest/context.go" - (("func \\(tc \\*testcase\\) Cleanup\\(" all) - (string-append all "func()")) - (("tc\\.Cleanup\\(" all) - (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "te= st"))) @@ -446,6 +434,7 @@ (define-public docker ("blkid" "util-linux" "sbin/blkid") ("unpigz" "pigz" "bin/unpigz") ("iptables" "iptables" "sbin/iptables") + ("ip6tables" "iptables" "sbin/ip6tables") ("iptables-legacy" "iptables" "sbin/iptables") ("ip" "iproute2" "sbin/ip")) @@ -494,10 +483,10 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ .pc) - go-1.14 gotestsum pkg-config)) + go gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specializ= ed container systems. It includes components for orchestration, image @@ -615,7 +600,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "1nv6mzq9i9psgfbzx7hfx1qb6fjp649qg8y392z8z2kqbjl20g3q")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -635,11 +620,11 @@ (define-public docker-cli ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") - (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile"))) (replace 'build (lambda _ - (invoke "./scripts/build/dynbinary"))) + (setenv "GO_LINKMODE" "dynamic") + (invoke "./scripts/build/binary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PA= TH"))) @@ -648,8 +633,7 @@ (define-public docker-cli (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit= " - (or make-flags '()))) - #t))) + (or make-flags '())))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -662,8 +646,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))= ) - (install-file "build/docker" out-bin) - #t)))))) + (install-file "build/docker" out-bin))))))) (native-inputs (list go libltdl pkg-config)) (synopsis "Command line interface to Docker") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b45f2f79f2..54116e4f4c 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1691,8 +1691,8 @@ (define-public go-netns (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.con= f. - (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847") - (revision "2")) + (let ((commit "f2269e66cdee387bd321445d5d300893449805be") + (revision "3")) (package (name "go-sctp") (version (git-version "0.0.0" revision commit)) @@ -1704,7 +1704,7 @@ (define-public go-sctp (file-name (git-file-name name version)) (sha256 (base32 - "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb")= ))) + "04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g")= ))) (build-system go-build-system) (arguments `(#:tests? #f ; Test suite is flakey. diff --git a/gnu/packages/patches/docker-fix-tests.patch b/gnu/packages/pa= tches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 =2D-- a/gnu/packages/patches/docker-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Danny Milosavljevic -The socket name ended up too long inside the container. -Use a shorter one. =2D--- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.99798594= 7 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 = +0100 -@@ -24,7 +24,7 @@ - ) - - const ( =2D- pluginAddress =3D "authz-test-plugin.sock" -+ pluginAddress =3D "/tmp/authz-test-plugin.sock" - ) - - func TestAuthZRequestPluginError(t *testing.T) { -@@ -263,12 +263,7 @@ - - // createTestPlugin creates a new sample authorization plugin - func createTestPlugin(t *testing.T) *authorizationPlugin { =2D- pwd, err :=3D os.Getwd() =2D- if err !=3D nil { =2D- t.Fatal(err) =2D- } =2D- =2D- client, err :=3D plugins.NewClient("unix:///"+path.Join(pwd, pluginAd= dress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err :=3D plugins.NewClient("unix:///"+path.Join("/", pluginAddr= ess), &tlsconfig.Options{InsecureSkipVerify: true}) - if err !=3D nil { - t.Fatalf("Failed to create client %v", err) - } =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 20:48:21 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:21 +0000 Received: from localhost ([127.0.0.1]:40307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5Se-0003N7-BM for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:21 -0400 Received: from mout.gmx.net ([212.227.17.22]:37393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SR-0003Kq-Ac for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774081; bh=8IXyVPXuFauSLWdwZi0pa0g26lOvFjg9C+706UMSuwA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=C8qYWogy8fBMjppQMFkdHSyglNyP3KDKs3ddrm0PUXyx9E1TbfDC41GxIoeW6bHms Ay1caDctRQMmYnrhinmkRnDMRCuwmzUKjSsdtzzKSRi24BbkA+AhT+00zUBzgOGZFZ 8aoBrAvc2x/U5LRPlt4Y/faQP8TIFplckFpCFRr0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MZktj-1nUIQY1Oo3-00Woz2; Fri, 01 Apr 2022 02:48:01 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v2 7/7] gnu: docker: Switch to gexp and new input style. Date: Fri, 1 Apr 2022 01:46:42 +0100 Message-Id: <20220401004642.14949-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:7TtLWnNUxdJYKS/zTAUf0S4EE8UUTaYHjC/jUuNq6A2AriqpXPd QhVBse848B5hBqVjXsn7AAJt4c4Bl84uKOYA0C0k7rzi15uEXnN2gmfxQRKxazt8we4R5qV b+JILbjRtW6hsIww0K83Fxwf0tKiktF5Pjjk74c5oF7dulOUXuH0h2g3bZfdDniqq+SLJSE U7aRs8dmtuYv7wBPuzk6Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Pl/jTqmjbvs=:eU+s/sFeGSGteWkuagfauI 6pbspCETQ8szDEDsGgx0ojo1VgbPYY8yzhp9VU5L+rmtI1G1ofYNvxTQ4NvMFN5nceCiz0Ypb 9OnEJjADDf/Q2zAw3Uf/EpeR/4ibv1xIfF19Z42CpcAiqIEFdIgOdF3MkdIsTfxDvwb8q8z6k wSk8RnlB6SBabYKt1iO1lDbR/1sSRFdZSqBvEADgdfhWr94nXKe/x/TkMd520iCvFLq20shrz brMyAAN5QEDcE/rcLcOj9lvixUvcIaaefvXj7WrA4kgJMwnyY0CYqBDoI8F5ltcXIl7ASu/qK MuIdWszRoxdJnZo+Uifwmu5yuR8BNXYLzCa1+il0baV45xtp26xlyVsxON/bLKyJs+0opyKjW U0w4N2bzjciFoGWYyHSfhyug5pxGQLO5EAwcIrmtxOTJ29VM6k0cFIUrsV6FkN5lV5i0frfK8 W07UAtZIMv7GbTCmT6wKRIGVDeNxtdmeEWT5x0m5tyEqeIKmxqP03afhbMDi6GodMiBMc5sus kDjUfONadp/davMUoIl7k28B+Hghg24EDI9bKyA97vv++hD982Ywc8Mkpg4M4Li+f4BZcpgGs y2QXChZOR+a2Qnq3P0fU9mloHJTq7IwSqTJGIwmPGmWTG7nMmGK8CO4FBaXIYU836rvBvgAt1 FLRL8ZTs3WsTr0fnIThJLXlh6srV4GWGd40NSAcTGsCiI6837QCW5pidJ3v5nzf7mCCe3J6Hg rR4jrxmzr/Wl6V0WHM/jZbcTHlvIEg5HTvalgvmG07DsabcMy45TvTHqfnG7k0gJRR3CzErtB 8V9FPHzDGuy0VGb+ls/+Rl9wJlO7G+Jeo2abgnatns69/qlyb37AiwP7/1znSzPXGykY8hqbA +foer4IRFOLHkp4WW2S3yxfXdz2SRn59+WuhKx2IM8p2UZ13LOR4K9BHOdWUuwkeVL07rDoby 8CAnteCowD34r9YJiC+6v3JxBq0bmblsKQ0WTpckC2MkHvuPQSVJJ9MKGOIz4k5ZlUeJWN14c 2U+rh0Edcaf7tmb4a6d836odAXRxE3KNWwJBG3P6vyxhXbOO8hlEt68rrbVWD9Evd37ww7UEp lkai0GvubveVRk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (docker)[arguments]: Rewrite as gexps. Switch to using search-input-file. [inputs]: Use new style inputs. =2D-- gnu/packages/docker.scm | 483 ++++++++++++++++++++-------------------- 1 file changed, 241 insertions(+), 242 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 020c89bb11..b4095eb00f 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -326,257 +326,256 @@ (define-public docker (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))= ) (build-system gnu-build-system) (arguments - `(#:modules - ((guix build gnu-build-system) + (list + #:modules + '((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) (guix build union) (guix build utils)) - #:imported-modules - (,@%gnu-build-system-modules + #:imported-modules + `(,@%gnu-build-system-modules (guix build union) (guix build go-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "builder/builder-next/executor_unix.go" - (("CommandCandidates:.*runc.*") - (string-append "CommandCandidates: []string{\"" - (assoc-ref inputs "runc") - "/sbin/runc\"},\n"))) - (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand =3D .*") - (string-append "DefaultCommand =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/containerd/runtim= e/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=3D.*") - (string-append "defaultRuntime =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=3D.*") - (string-append "defaultShim =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n"))) - (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary =3D .*") - (string-append "DefaultShimBinary =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n")) - (("DefaultRuntimeBinary =3D .*") - (string-append "DefaultRuntimeBinary =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/runtime_unix.go" - (("defaultRuntimeName =3D .*") - (string-append "defaultRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/config/config.go" - (("StockRuntimeName =3D .*") - (string-append "StockRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultInitBinary =3D .*") - (string-append "DefaultInitBinary =3D \"" - (assoc-ref inputs "tini") - "/bin/tini-static\"\n"))) - (substitute* "daemon/config/config_common_unix_test.go" - (("expectedInitPath: \"docker-init\"") - (string-append "expectedInitPath: \"" - (assoc-ref inputs "tini") - "/bin/tini-static\""))) - (substitute* "vendor/github.com/moby/buildkit/executor/runce= xecutor/executor.go" - (("var defaultCommandCandidates =3D .*") - (string-append "var defaultCommandCandidates =3D []string= {\"" - (assoc-ref inputs "runc") "/sbin/runc\"}")= )) - (substitute* "vendor/github.com/docker/libnetwork/portmapper= /proxy.go" - (("var userlandProxyCommandName =3D .*") - (string-append "var userlandProxyCommandName =3D \"" - (assoc-ref inputs "docker-proxy") - "/bin/proxy\"\n"))) - (substitute* "pkg/archive/archive.go" - (("string\\{\"xz") - (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "builder/builder-next/executor_unix.go" + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (search-input-file inputs "/sbin/runc") + "\"},\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand =3D .*") + (string-append "DefaultCommand =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "vendor/github.com/containerd/containerd/runti= me/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n"))) + (substitute* "daemon/daemon_unix.go" + (("DefaultShimBinary =3D .*") + (string-append "DefaultShimBinary =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n")) + (("DefaultRuntimeBinary =3D .*") + (string-append "DefaultRuntimeBinary =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/config/config.go" + (("StockRuntimeName =3D .*") + (string-append "StockRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("DefaultInitBinary =3D .*") + (string-append "DefaultInitBinary =3D \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\"\n"))) + (substitute* "daemon/config/config_common_unix_test.go" + (("expectedInitPath: \"docker-init\"") + (string-append "expectedInitPath: \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\""))) + (substitute* "vendor/github.com/moby/buildkit/executor/runc= executor/executor.go" + (("var defaultCommandCandidates =3D .*") + (string-append "var defaultCommandCandidates =3D []strin= g{\"" + (search-input-file inputs "/sbin/runc") "= \"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmappe= r/proxy.go" + (("var userlandProxyCommandName =3D .*") + (string-append "var userlandProxyCommandName =3D \"" + (search-input-file inputs "/bin/proxy") + "\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (search-input-file inputs "/b= in/xz")))) - (let ((source-files (filter (lambda (name) - (not (string-contains name "te= st"))) - (find-files "." "\\.go$")))) - (let-syntax ((substitute-LookPath* - (syntax-rules () - ((_ (source-text package relative-path) ..= .) - (substitute* source-files - (((string-append "\\ .pc) go gotestsum pkg-config)) =2D- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 21:16:51 2022 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 01:16:51 +0000 Received: from localhost ([127.0.0.1]:40343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5uB-0004FG-6o for submit@debbugs.gnu.org; Thu, 31 Mar 2022 21:16:50 -0400 Received: from mout.gmx.net ([212.227.17.20]:45943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5u7-0004F1-KW for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 21:16:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648775797; bh=1ILzbZtlmx57crOpRhGvbNZ6pmuGkjgXYpIBLNSSz1M=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=YWYxf5P7NgpZPQYz52b8tlr+qVZOtyl5ZQR2skBt3dGqEeA7iZ8VOTCpRy3no/OL6 0sjmEi0lWE4CczIqYa0gvgFR0MHZQ7nPsMTL9OHEXDCbFFMXk7b+QsIPnOaNC+b2JW FG/DjU3EZgSXDr+JR9Dm+N7U2Y1HDDyCJYgk9esQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MkHMP-1oKkRw0nST-00keRI; Fri, 01 Apr 2022 03:16:37 +0200 References: <20220401004642.14949-1-pierre.langlois@gmx.com> <20220401004642.14949-7-pierre.langlois@gmx.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: Re: [PATCH v2 6/7] gnu: docker: Update to 20.10.14. Date: Fri, 01 Apr 2022 02:11:56 +0100 In-reply-to: <20220401004642.14949-7-pierre.langlois@gmx.com> Message-ID: <87pmm1wqks.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:yM9HAs9hd2jdgw+cuNg8m7brcnb/+nbj2QZgy4xlgZr69faBI4D CNYlr0aDZtu5MlTek4+fRgCux4Ca90crYbFrWJw6NQxkkhAt04iKhIDhx6u4664hiXI8+rG l8WvLr3f+4CWHOYPfT5Bdbw7KW0BONtRoRl0tiNAMWeyawE1wsd7+dqBj6Qxfe1x5IcGVA7 QvNnHkwDVXY5zp6bjIN/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:lCAB0fi1Dns=:0lqpI4rLbkGH+iyvzNGPXm 3CNf3MARpLDMcc4vl3lOQ4YcI2RS08f+9mJ+kT9T1fcrHpa/5ToO2WtjwlmffCZmVfgzIFXmB gLwLXQ4KMDAdyrl5BN/Op2FStuNvlQl9uBTQ0gp7/gUBKwqiB/ZkNkvq1xK5ciE/kw30bS2qh a2Ynfy5dWc7UVebG1+cgJEf+w2pS44fab+knpVJcTiZrTSyXniP3RkKpOtJWxb8wVNoKuGw17 IYFLkEzj/gaDWC3lIO8lp95w9ipcPgQg6D8+AH7Pm466Vw5K1vxb0k0TZz2xXXvBn5sapzF1C o89+5Znrc+Als3PMbkBJnb++bCtWBo5FGtDnxfa3VNnNVpnDRq9Vz2rWL+utksyCN8JRK/gcL cvbGOqEN4tdEOwhn7ugU80QlYwf4VpJ4cGipKs0TeXvmuiAcnTKqpYE3zT0mAAf9t9cKystNL SeQQl9E+wWN+t7f6c0J9tp+DQ4LpSLdyhk+Ab25w1BsyfwXBoIz521ekhdHrnDBaj7R8fZ11I YWhi5dspVw7+T9rNBMamQkrZrl6H6ou7d9eTrcaTZ87jYpTGLrZSMQWo2Pp7GL0rZwp9Fve8N c7JATXBI/nQQwg8CxjrbzbFMmjTIQbP2M8JeetShYMbIWEY2bJ90eF2axtgsiMMYaecZi3BQB G3/c2XpYa56LMI6f0Y6xQc2vtPwevzlCpVriHBx3KjaqNMm6k5Ih9FZ7ddS0GD7hbB4FTdUbR U2M+recrc9derUGd3vLSWIx7NnS65MlnRpSc/Ga4Ewo4lXWAReehkgVTde1+cLWD6NO5GZv8E JSHZ1mKHmC9tV4wzfHKyjOnrSz0rFClaRlFKUlfjGwsjc0faqRVOkH3Zo6RfB17VmpxkmMgva 7caF7rLgaPBlSrSFRswCHx6FmJ9pZ2CLgOMuvb/Pi7Bj/jB4TJYbgSSfSYDHg6rriJZY8IqPB bWh+au3B6GYnDeyeT9YsKgHbaL+Gz5hSN46Oz2yYlZQUQmuzkPjrmitueHp2vm8wgWxFGcnRU RkY1bjSMRvL6f8UW2+oZcnQLYbv2umIHRVnqckniF2iwOP6LsiYpIz5oxypDyGj4Eu+/BMin5 OgrlBjKlxXp/98= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Pierre Langlois writes: > * gnu/packages/docker.scm (%docker-version): Update to 20.10.14. > (docker-libnetwork): Update commit according to vendor.conf. > (docker)[origin]: Remove docker-fix-tests.patch. > [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and > buildkit-qemu. Remove trailing #t. > [native-inputs]: Replace go-1.14 by go. > (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t. > * gnu/packages/networking.scm (go-sctp): Update commit according to > docker-libnetwork's vendor.conf. > * gnu/packages/patches/docker-fix-tests.patch: Delete. > * gnu/local.mk (dist_patch_DATA): Remove patch. > --- > gnu/local.mk | 1 - > gnu/packages/docker.scm | 69 ++++++++------------- > gnu/packages/networking.scm | 6 +- > gnu/packages/patches/docker-fix-tests.patch | 28 --------- > 4 files changed, 29 insertions(+), 75 deletions(-) > delete mode 100644 gnu/packages/patches/docker-fix-tests.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index a704161abc..d5b3d4bba3 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1007,7 +1007,6 @@ dist_patch_DATA = \ > %D%/packages/patches/docbook-xsl-support-old-url.patch \ > %D%/packages/patches/doc++-include-directives.patch \ > %D%/packages/patches/doc++-segfault-fix.patch \ > - %D%/packages/patches/docker-fix-tests.patch \ > %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ > %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ > %D%/packages/patches/dstat-skip-devices-without-io.patch \ > diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm > index 0d721ead38..020c89bb11 100644 > --- a/gnu/packages/docker.scm > +++ b/gnu/packages/docker.scm > @@ -54,7 +54,7 @@ (define-module (gnu packages docker) > > ;; Note - when changing Docker versions it is important to update the versions > ;; of several associated packages (docker-libnetwork and go-sctp). > -(define %docker-version "19.03.15") > +(define %docker-version "20.10.14") > > (define-public python-docker > (package > @@ -252,13 +252,12 @@ (define-public containerd > ;;; anyway, as it needs many dependencies that aren't being satisfied. > (define docker-libnetwork > ;; There are no recent release for libnetwork, so choose the last commit of > - ;; the branch that Docker uses, as can be seen in the Docker source file > - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that > - ;; this version is kept in sync with the version of Docker being used. > - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf. > - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") > + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Docker > + ;; source file. NOTE - It is important that this version is kept in sync > + ;; with the version of Docker being used. > + (let ((commit "339b972b464ee3d401b5788b2af9e31d09d6b7da") > (version (version-major+minor %docker-version)) > - (revision "1")) > + (revision "2")) > (package > (name "docker-libnetwork") > (version (git-version version revision commit)) > @@ -271,7 +270,7 @@ (define docker-libnetwork > (file-name (git-file-name name version)) > (sha256 > (base32 > - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")) > + "0wx2hdwx56cbxiaky9kw2bi1prdfgzwr776lq1k0slw8kvn0cn32")) > ;; Delete bundled ("vendored") free software source code. > (modules '((guix build utils))) > (snippet '(begin > @@ -324,9 +323,7 @@ (define-public docker > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) > - (patches > - (search-patches "docker-fix-tests.patch")))) > + (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))) > (build-system gnu-build-system) > (arguments > `(#:modules > @@ -369,9 +366,10 @@ (define-public docker > (("DefaultRuntimeBinary = .*") > (string-append "DefaultRuntimeBinary = \"" > (assoc-ref inputs "runc") > - "/sbin/runc\"\n")) > - (("DefaultRuntimeName = .*") > - (string-append "DefaultRuntimeName = \"" > + "/sbin/runc\"\n"))) > + (substitute* "daemon/runtime_unix.go" > + (("defaultRuntimeName = .*") > + (string-append "defaultRuntimeName = \"" > (assoc-ref inputs "runc") > "/sbin/runc\"\n"))) > (substitute* "daemon/config/config.go" > @@ -400,16 +398,6 @@ (define-public docker > (substitute* "pkg/archive/archive.go" > (("string\\{\"xz") > (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) > - ;; TODO: Remove when Docker proper uses v1.14.x to build > - (substitute* "registry/resumable/resumablerequestreader_test.go" > - (("I%27m%20not%20an%20url" all) > - (string-append "\"" all "\""))) > - ;; TODO: Remove when Docker proper uses v1.14.x to build > - (substitute* "vendor/gotest.tools/x/subtest/context.go" > - (("func \\(tc \\*testcase\\) Cleanup\\(" all) > - (string-append all "func()")) > - (("tc\\.Cleanup\\(" all) > - (string-append all "nil"))) > > (let ((source-files (filter (lambda (name) > (not (string-contains name "test"))) > @@ -446,6 +434,7 @@ (define-public docker > ("blkid" "util-linux" "sbin/blkid") > ("unpigz" "pigz" "bin/unpigz") > ("iptables" "iptables" "sbin/iptables") > + ("ip6tables" "iptables" "sbin/ip6tables") > ("iptables-legacy" "iptables" "sbin/iptables") > ("ip" "iproute2" "sbin/ip")) > > @@ -494,10 +483,10 @@ (define-public docker > "exec.Command") > ;; Search for ZFS in PATH. > (("\\ + (("\\ isn't found. ;; FIXME: We might need to package buildkit and docker's ;; buildx plugin, to support qemu-based docker containers. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmJGUnMYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UrxAH/RL/uKB0gOoQGZ4roaJP+QcD lmDPVKOeY5wdqTaHrkJ7Pk06gPzt39e6CKXYw06es6OVLvBHA9CK2x2YlqWs7/SQ KNSqMAAmDV/MESEuKxbtvJ8Kr3fOaCCebkyLRBsbAPWyI/J3wRG+DWpDUlQS/8s7 cjLMft2jgC2kkU3XeSHpbkh65DljYKXZKA/kaR2M60j6yZx8zZzMOj59wxOdYeVR sjFl7QxYw86b5AXXU82BZI8uajQpA6rC9KBXCzZFGn7ZeTj9KiFE/meI/2rv20HV tp+TyEdqdu8IX0pIaKXLEmfmK1NM0yqE5pgDQedDBitHUdpvoU+InLYoTXXAxRw= =Tdyh -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-docker-Update-to-20.10.14.patch Content-Transfer-Encoding: quoted-printable =46rom 7c9a1ac422d802234099b7c57e067dbe217ac386 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 25 Dec 2021 02:08:39 +0000 Subject: [PATCH v2.5 6/7] gnu: docker: Update to 20.10.14. * gnu/packages/docker.scm (%docker-version): Update to 20.10.14. (docker-libnetwork): Update commit according to vendor.conf. (docker)[origin]: Remove docker-fix-tests.patch. [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and buildkit-qemu. Remove trailing #t. [native-inputs]: Replace go-1.14 by go. (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t= . * gnu/packages/networking.scm (go-sctp): Update commit according to docker-libnetwork's vendor.conf. * gnu/packages/patches/docker-fix-tests.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. =2D-- gnu/local.mk | 1 - gnu/packages/docker.scm | 72 +++++++++------------ gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 -------- 4 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index a704161abc..d5b3d4bba3 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1007,7 +1007,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0d721ead38..82c017157d 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -54,7 +54,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the ver= sions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.15") +(define %docker-version "20.10.14") (define-public python-docker (package @@ -252,13 +252,12 @@ (define-public containerd ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; There are no recent release for libnetwork, so choose the last commi= t of - ;; the branch that Docker uses, as can be seen in the Docker source fil= e - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important th= at - ;; this version is kept in sync with the version of Docker being used. - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's ven= dor.conf. - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Doc= ker + ;; source file. NOTE - It is important that this version is kept in sy= nc + ;; with the version of Docker being used. + (let ((commit "339b972b464ee3d401b5788b2af9e31d09d6b7da") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -271,7 +270,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")= ) + "0wx2hdwx56cbxiaky9kw2bi1prdfgzwr776lq1k0slw8kvn0cn32")= ) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -324,9 +323,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) - (patches - (search-patches "docker-fix-tests.patch")))) + (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))= ) (build-system gnu-build-system) (arguments `(#:modules @@ -369,9 +366,10 @@ (define-public docker (("DefaultRuntimeBinary =3D .*") (string-append "DefaultRuntimeBinary =3D \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName =3D .*") - (string-append "DefaultRuntimeName =3D \"" + "/sbin/runc\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" @@ -400,16 +398,6 @@ (define-public docker (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "registry/resumable/resumablerequestreader_test= .go" - (("I%27m%20not%20an%20url" all) - (string-append "\"" all "\""))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "vendor/gotest.tools/x/subtest/context.go" - (("func \\(tc \\*testcase\\) Cleanup\\(" all) - (string-append all "func()")) - (("tc\\.Cleanup\\(" all) - (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "te= st"))) @@ -446,6 +434,7 @@ (define-public docker ("blkid" "util-linux" "sbin/blkid") ("unpigz" "pigz" "bin/unpigz") ("iptables" "iptables" "sbin/iptables") + ("ip6tables" "iptables" "sbin/ip6tables") ("iptables-legacy" "iptables" "sbin/iptables") ("ip" "iproute2" "sbin/ip")) @@ -494,10 +483,13 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ isn't found. + ;; FIXME: We might need to package buildkit and docker's + ;; buildx plugin, to support qemu-based docker container= s. + (("\\ .pc) - go-1.14 gotestsum pkg-config)) + go gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specializ= ed container systems. It includes components for orchestration, image @@ -615,7 +603,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "1nv6mzq9i9psgfbzx7hfx1qb6fjp649qg8y392z8z2kqbjl20g3q")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -635,11 +623,11 @@ (define-public docker-cli ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") - (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile"))) (replace 'build (lambda _ - (invoke "./scripts/build/dynbinary"))) + (setenv "GO_LINKMODE" "dynamic") + (invoke "./scripts/build/binary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PA= TH"))) @@ -648,8 +636,7 @@ (define-public docker-cli (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit= " - (or make-flags '()))) - #t))) + (or make-flags '())))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -662,8 +649,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))= ) - (install-file "build/docker" out-bin) - #t)))))) + (install-file "build/docker" out-bin))))))) (native-inputs (list go libltdl pkg-config)) (synopsis "Command line interface to Docker") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b45f2f79f2..54116e4f4c 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1691,8 +1691,8 @@ (define-public go-netns (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.con= f. - (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847") - (revision "2")) + (let ((commit "f2269e66cdee387bd321445d5d300893449805be") + (revision "3")) (package (name "go-sctp") (version (git-version "0.0.0" revision commit)) @@ -1704,7 +1704,7 @@ (define-public go-sctp (file-name (git-file-name name version)) (sha256 (base32 - "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb")= ))) + "04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g")= ))) (build-system go-build-system) (arguments `(#:tests? #f ; Test suite is flakey. diff --git a/gnu/packages/patches/docker-fix-tests.patch b/gnu/packages/pa= tches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 =2D-- a/gnu/packages/patches/docker-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Danny Milosavljevic -The socket name ended up too long inside the container. -Use a shorter one. =2D--- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.99798594= 7 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 = +0100 -@@ -24,7 +24,7 @@ - ) - - const ( =2D- pluginAddress =3D "authz-test-plugin.sock" -+ pluginAddress =3D "/tmp/authz-test-plugin.sock" - ) - - func TestAuthZRequestPluginError(t *testing.T) { -@@ -263,12 +263,7 @@ - - // createTestPlugin creates a new sample authorization plugin - func createTestPlugin(t *testing.T) *authorizationPlugin { =2D- pwd, err :=3D os.Getwd() =2D- if err !=3D nil { =2D- t.Fatal(err) =2D- } =2D- =2D- client, err :=3D plugins.NewClient("unix:///"+path.Join(pwd, pluginAd= dress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err :=3D plugins.NewClient("unix:///"+path.Join("/", pluginAddr= ess), &tlsconfig.Options{InsecureSkipVerify: true}) - if err !=3D nil { - t.Fatalf("Failed to create client %v", err) - } =2D- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0007-gnu-docker-Switch-to-gexp-and-new-input-style.patch Content-Transfer-Encoding: quoted-printable =46rom 4089db85b366e3f8fd394d254807ddd4b4631c3c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:34:52 +0100 Subject: [PATCH v2.5 7/7] gnu: docker: Switch to gexp and new input style. * gnu/packages/docker.scm (docker)[arguments]: Rewrite as gexps. Switch to using search-input-file. [inputs]: Use new style inputs. =2D-- gnu/packages/docker.scm | 483 ++++++++++++++++++++-------------------- 1 file changed, 241 insertions(+), 242 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 82c017157d..edec4d3b27 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -326,260 +326,259 @@ (define-public docker (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))= ) (build-system gnu-build-system) (arguments - `(#:modules - ((guix build gnu-build-system) + (list + #:modules + '((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) (guix build union) (guix build utils)) - #:imported-modules - (,@%gnu-build-system-modules + #:imported-modules + `(,@%gnu-build-system-modules (guix build union) (guix build go-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "builder/builder-next/executor_unix.go" - (("CommandCandidates:.*runc.*") - (string-append "CommandCandidates: []string{\"" - (assoc-ref inputs "runc") - "/sbin/runc\"},\n"))) - (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand =3D .*") - (string-append "DefaultCommand =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/containerd/runtim= e/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=3D.*") - (string-append "defaultRuntime =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=3D.*") - (string-append "defaultShim =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n"))) - (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary =3D .*") - (string-append "DefaultShimBinary =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n")) - (("DefaultRuntimeBinary =3D .*") - (string-append "DefaultRuntimeBinary =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/runtime_unix.go" - (("defaultRuntimeName =3D .*") - (string-append "defaultRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/config/config.go" - (("StockRuntimeName =3D .*") - (string-append "StockRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultInitBinary =3D .*") - (string-append "DefaultInitBinary =3D \"" - (assoc-ref inputs "tini") - "/bin/tini-static\"\n"))) - (substitute* "daemon/config/config_common_unix_test.go" - (("expectedInitPath: \"docker-init\"") - (string-append "expectedInitPath: \"" - (assoc-ref inputs "tini") - "/bin/tini-static\""))) - (substitute* "vendor/github.com/moby/buildkit/executor/runce= xecutor/executor.go" - (("var defaultCommandCandidates =3D .*") - (string-append "var defaultCommandCandidates =3D []string= {\"" - (assoc-ref inputs "runc") "/sbin/runc\"}")= )) - (substitute* "vendor/github.com/docker/libnetwork/portmapper= /proxy.go" - (("var userlandProxyCommandName =3D .*") - (string-append "var userlandProxyCommandName =3D \"" - (assoc-ref inputs "docker-proxy") - "/bin/proxy\"\n"))) - (substitute* "pkg/archive/archive.go" - (("string\\{\"xz") - (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "builder/builder-next/executor_unix.go" + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (search-input-file inputs "/sbin/runc") + "\"},\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand =3D .*") + (string-append "DefaultCommand =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "vendor/github.com/containerd/containerd/runti= me/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n"))) + (substitute* "daemon/daemon_unix.go" + (("DefaultShimBinary =3D .*") + (string-append "DefaultShimBinary =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n")) + (("DefaultRuntimeBinary =3D .*") + (string-append "DefaultRuntimeBinary =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/config/config.go" + (("StockRuntimeName =3D .*") + (string-append "StockRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("DefaultInitBinary =3D .*") + (string-append "DefaultInitBinary =3D \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\"\n"))) + (substitute* "daemon/config/config_common_unix_test.go" + (("expectedInitPath: \"docker-init\"") + (string-append "expectedInitPath: \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\""))) + (substitute* "vendor/github.com/moby/buildkit/executor/runc= executor/executor.go" + (("var defaultCommandCandidates =3D .*") + (string-append "var defaultCommandCandidates =3D []strin= g{\"" + (search-input-file inputs "/sbin/runc") "= \"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmappe= r/proxy.go" + (("var userlandProxyCommandName =3D .*") + (string-append "var userlandProxyCommandName =3D \"" + (search-input-file inputs "/bin/proxy") + "\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (search-input-file inputs "/b= in/xz")))) - (let ((source-files (filter (lambda (name) - (not (string-contains name "te= st"))) - (find-files "." "\\.go$")))) - (let-syntax ((substitute-LookPath* - (syntax-rules () - ((_ (source-text package relative-path) ..= .) - (substitute* source-files - (((string-append "\\ isn't found. ;; FIXME: We might need to package buildkit and docker's ;; buildx plugin, to support qemu-based docker container= s. - (("\\ .pc) go gotestsum pkg-config)) =2D- 2.34.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:30:25 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:30:25 +0000 Received: from localhost ([127.0.0.1]:59727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCpd-0003nZ-1K for submit@debbugs.gnu.org; Mon, 09 May 2022 19:30:25 -0400 Received: from mout.gmx.net ([212.227.17.20]:54201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCpb-0003nF-0Z for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:30:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139016; bh=n5OlSTjfKA9ul2KBgyek2+7JgVmNo/ZxmM/FgGeHTcA=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=OPG/pf+H3VUMMfjxD6eD/2LOkzzZ7/qoHVCWZ33SO7lJj8Zi/NLPfBJpqtXuVxFjC gMSu0oKYh851sK1eTVXi/Dmu/QYnfukf6X9Egh/TeovslLfKniu3yjte7Aa3HP2jum 9x0rGVviCeaJaPtRfSbXEuuDvpiLxZBbTzvVMkMs= 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 1MEFzx-1ngC5d2Oij-00AFzS; Tue, 10 May 2022 01:30:16 +0200 References: <20220401004642.14949-1-pierre.langlois@gmx.com> User-agent: mu4e 1.6.10; emacs 28.1 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 0/7] Update docker to 20.10.15. Date: Tue, 10 May 2022 00:27:48 +0100 In-reply-to: <20220401004642.14949-1-pierre.langlois@gmx.com> Message-ID: <87wneu1dyz.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:9VrNqybmOtPQLP9nWKjrfviW4W3mcNCdCNEVLRXzdYGHpXbyG72 2rB0IKRvVgbhrp2DFC++QeEpKjxxvLnS2mhpH/YLuXxTT33D3SQ/8BPMR/PzThX5CHYEEiU vD+ebCi4eYUW8+4HP/ycbE2VEECji/cRZLU2xUOJhWVVb/D+f4DBJeflgHGaMD8WCuofncZ IW9bXXIj6fPlChe4246tw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:qx4iwBplyYE=:uvVwTQyBYSkewANTKEDVgc nqtVEOSvgh7iVhjYQU659wXsbnv7eAlxV/L+M+Pu7oILyYMLA/zFAoiBBQKGyccOPcQhgsBba OLhNdO0tVuABFPrhRYrIpmOIKrLQCetsYGyq7S4DUtRpq+qk/UPVtHiDrGV8MaaKbCc7icf9w vYNbIULFOM9sEPgyR01zI57k2EQgZBrRdCGLWbBJEpjnYZDUGUmAPCJ4L3PqKfbcaVRsZqvqR LNanb3jEb+U+nei7dgZrg/1EHT3wPeKndckkxobhfN/puDGpVeyO9l6/ISr3eooUR93oaUqzf Ge8U7KyZ0Wl5+si+j4TnmVH1lCD3pX0Nk4ylaiofUu1gwcsPg0YeI1nv7sC1ivgfs/p58NCUH C7FFK9pFQ0MFMJUssR8RH2qx6EkvW1I2OHx2eRUgAw6NLSWab1+71um53Bcu5Zx3JlG+YyD+7 ZI5B3qSql+qCZYdoW3aK3Lp+mEGSJg9KS08eUSid/bV+9yzxVupwzrqdQi5qzlYYCY7CmZ8gi Wft+EP4ULDbd4aZocWIjN1m2BY3LCtEuIcyQxcvWyMwkOdzjxjf4jTXkzcsOoOxAPWwMOjkWX PaP8KBOXtTFbTY1diBHCEmwlRmIwt9h6PLkoTi1t+bkTOnO7ctaCn65IZqTXkewSc31YdDuoJ sDs+/46HhpXYOIjeeSp3dHGvzV0iZ+xnL5w/9QhTJ76rKNfMwyHG8phIgVu3NaRGJLOYV2ymf JC+9K4xllmxXVKteTogkGPK0fFAqVkCICUM7hglAxgRwETpj9EORicETBSsFznumbsq+Yvzu0 j/fVJbycCfzXwlILX6nGTHUDE3qNRdHAYMEDSJYmjuXCPjsIoLxhKkti4oYOzFR0wItDU4Al1 eVJ6jECcwwbx2YTu+EG0k7eEZMsodb19NRq6N9rAbfh21wy4uj2tlGy8WoxRy2X3jgjLTFNeg kjCdvKXygnYlgPNCy6xhYbfUT3960/fI43+2ylBz+KC9aFEWsRcIiZJi1LiNBo58p0tH4KbIT N8hhnJzpdM997SdYxE8Zi2VcjO+uaYdM9fWBLHljrTZmP87PYWEfK+4gcvPMVBptV25K4OdWU aiNSY1YL5vpTAU= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Guix! I just rebased this series, and did a quick round of new updates: runc: 1.1.0 -> 1.1.1 containerd: 1.6.2 -> 1.6.4 docker: 20.10.14 -> 20.10.15 Tested locally briefly and ran: make check-system TESTS=3D"docker docker-system" Thanks, Pierre Pierre Langlois (7): gnu: runc: Update to 1.1.1. gnu: containerd: Fix patch-paths build phase. gnu: containerd: Update to 1.6.4. gnu: containerd: Switch to gexp arguments. gnu: docker: Fix mkfs.xfs reference. gnu: docker: Update to 20.10.15. gnu: docker: Switch to gexp and new input style. gnu/local.mk | 1 - gnu/packages/docker.scm | 628 ++++++++++---------- gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 - gnu/packages/virtualization.scm | 9 +- 5 files changed, 318 insertions(+), 354 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch =2D-=20 2.36.0 Pierre Langlois writes: > Hi Guix! > > I rebased this series, updated it to 20.10.14 and did a bit of spring gexp > cleanup. Tested manually with a simple Ubuntu container, and with > > make check-system TESTS=3D"docker docker-system" > > I've seen reports of issues on help-guix that /look/ like patch number 2 = might > fix it, so we could submit that first if the rest needs more work. > > WDYT? > Thanks, > Pierre > > Pierre Langlois (7): > gnu: runc: Update to 1.1.0. > gnu: containerd: Fix patch-paths build phase. > gnu: containerd: Update to 1.6.2. > gnu: containerd: Switch to gexp arguments. > gnu: docker: Fix mkfs.xfs reference. > gnu: docker: Update to 20.10.14. > gnu: docker: Switch to gexp and new input style. > > gnu/local.mk | 1 - > gnu/packages/docker.scm | 625 ++++++++++---------- > gnu/packages/networking.scm | 6 +- > gnu/packages/patches/docker-fix-tests.patch | 28 - > gnu/packages/virtualization.scm | 6 +- > 5 files changed, 314 insertions(+), 352 deletions(-) > delete mode 100644 gnu/packages/patches/docker-fix-tests.patch --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmJ5pAQYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31URQgH/3kazOSvsfIpSuaSpp5Z/6EO GGpQBaR+ZG5m90eBCCeAPf7X4rYOHpG9AjZxL/HRz6iler45KcO4W7hoX9KtewdS +pLQX0crLPzxUKZLlFn7yI5H1eAXBEbvZAB5pO3StkS73RlGxiNpX3KwPUuWzKe7 Hc7JTd//ElNVUat5BkBZsasQYBSZCTTRlvRF7TJianjA5Lv51vd1QijBJcYRtSlY +C16LNvPyU5xeoQDuEMKvfWtqDWaxCJHRLIds4/q1NcRSrcqOPmzB2jqjYEqEYBJ bE8G0tKySNxrtG/pVS13NePSrGxceXyiqQE1Yegkl5BNbE2ipiowwqMaPnv5ZVQ= =jCT/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:39 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003wM-Oj for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:39 -0400 Received: from mout.gmx.net ([212.227.17.22]:57581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vq-Em for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=mpJqyN7EBdfr+4b+T7Y9x8pTyAHYJ1iFk1ALgFk6cRk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ia3pQwq6VgLYMqPS6ntuv4zqBI8fc7nVD2Mk9LuKCCiIV0LJ3LKpMwB0DrAGWujCK tfCZ+B71Uv7E32bJOmX6ICkPIe3KPUE6xYFiw8FrnD+MXhymOQr0wIFncZrclorloP eAbyK+GSzC42+mWyrNBIh3AIy54oulgHEQWfDbAY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N49lJ-1nwd0Z1UIL-0101iE; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 2/7] gnu: containerd: Fix patch-paths build phase. Date: Tue, 10 May 2022 00:35:14 +0100 Message-Id: <20220509233519.26703-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:hpiarWYNPb3HvLR29ruwV/+IxENdcuwTOGc0GQfyVLFagpCdRlZ I+Oz/ifVa+Z8tbz1qjyLCI1piKlznLbRyKqeNHEgG9Ct2N2BId4HherII0WJSSvYI6DjOGi Il//onNt6Jty+HEMUzgBrrJLRh/+Oi6nEatDZTy9Xk83goqVlsV9OQd62Ey7nkn/djqr2mW YCM5f8RSR8WvA36ESdA/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:+eSvTks0Nlk=:l12/zQzo6+Q176+wIIZziy OPStWSGNZlB3Yo9dMVnn5ixZ/nM94sc+lfJb1hRvleSVvoKq4F1a9C1f94KeR87s6ZciJir3t 75/gvd6bmwfwT+D9JBZmS1sHCmQPFOFhmPHjoqQ1D0QWlSpAgi/JcSCzsaT59312wlfuLSpae xaCBKeC5JHe3STkjfo5zk7XXinuSl02n+aQf4mSEHrd/frcteAekRKy+5nbRSNERzymyDgaO6 iGKSE8smUYa6JGTDnjRJNnP0z1mH+LYl0eZ3ZgUBsCm3wnjaVBX/JCAqfLT51VbwpsK9xsPKp d6sd6bwkuR0FaxTj6+81R6479LCx6hZkngsUDZKwsyTx6H7I7qqRavrLd/zcUHJUzlu05DMcm IEcMe+DnhnHccdOuwTRlgyIm9rbcCSVoGlvQjc1MO7IH38qPVCKXZOdIY8Bh6egtp9Y7fQbp5 HAuIlKseZR1DvViyZ/yWjdKmGM1tFZsO0bgJ79XhONr0h8huuaJkzgsNnT4nHpvgMFM7Gy7FU Bc/rYfNLAyUaG9elEOxP98DhOH7Tb/ykZgU8vMX8OuAOAY9QmCj64kUTKJnD84dbyv/FEZvzL nFV5Rs0Rrz2/r8t/rs3I1A+CZtG1tWaCF3vaukDPOWb9a+Rc5xsGe1q4hm4lfW5L0dXi2Yhsf mBLkQAlgKdv3F6R9cwBqA13C7f5UwKmF/41+TckpokHKZ5O7pLu+TutKMnW0GDcB7j+vW4uUV cAf7tiLvvoRlJ8exRO2ynLc5LRAV6/OmM5b3uIdtAkpYxxhGsNfqtGVIePE5KWaNx6FKc5D5T 7qAnk4xiP6lHSJF2YO/vgj3ZTnF6dFdJDgguQahupPflQiraEPjWKHNcwOnR3bUQAbD+qSQST w4BR6LFBJ+hI14VM3YBMj5i8ruNkJdoARx/3qszB8/9QsSfBz5IkD/iaOkT1Qhr8sMT22mWJ2 5CPMUsMU0aIM7VOA3u+OxT9+MhonzJgnsGROfRlRHc7GJl/phb+lJGMsDDrn+ivQv9AgIrGx9 ALfrEKOJo7WPdHJGXUlIUi6z50vloiopqT427+FuDwQ2IWUxH2EJpJ/vIG3qhIOMpTp1XgbqC ZkhzOfGG8oKn3A= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. =2D-- gnu/packages/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 07731886ae..5c0f4d496d 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Katherine Cox-Buday ;;; Copyright =C2=A9 2020 Jesse Dowell ;;; Copyright =C2=A9 2021 Oleg Pykhalov +;;; Copyright =C2=A9 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,7 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-after 'chdir 'patch-paths + (add-after 'unpack 'patch-paths (lambda* (#:key inputs import-path outputs #:allow-other-key= s) (with-directory-excursion (string-append "src/" import-pat= h) (substitute* "runtime/v1/linux/runtime.go" =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:40 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuh-0003wu-Ts for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:40 -0400 Received: from mout.gmx.net ([212.227.17.21]:60325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vp-6R for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=zPL23sGnW2LS9L2cBZP4kO2/1rRkjOOQYlzdaDynLkA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ur7a+3qTuDSC7TgAk+UN/GRKNZ7i2Hw3lYNE2r/e/g2hOHj7OdqI4nOMsTsFOZZKf ZBtSw7sG4NWz9RcX3lt35AEdikSvyVStW5C5hinzLVgvaQNnD9HImzbn7cB/wUcNPj UA+3lNtF83bU0Umx1kMqBqxfLIPAVh9f1UPJwBkQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MLi8m-1nWg3i0Cw4-00HeLz; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 1/7] gnu: runc: Update to 1.1.1. Date: Tue, 10 May 2022 00:35:13 +0100 Message-Id: <20220509233519.26703-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <87wneu1dyz.fsf@gmx.com> References: <87wneu1dyz.fsf@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:bEZ6KEFXxxfeeG4OsIuVTHDHLcxZGIbgoKaAgKXBYZ23w++R8zc PF1TjkArxTWHoE7y+kKmZCgX1jfhPLuAEQOG07cX+GpAIH4fa3tiIKc8hQXuGzn5ALO+TSV tNlojXgHBfcBgFsrFRXKqTXbwcxLCMzT8bJq1JugIDyLfiUHYyERzpeTWIPeuBCo46g1EG1 UvaDSA3q2VRm4u/tqwDQA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:l6RDJqfJGmQ=:8+BIgFE0T7OI+i9NBjtxu/ 8Z064fkSjjL29gK5uxLGDY49HeSBHEw81j4XxrGE1oFtXzXbOXYXIcdwDX0SzyTz7hC8gCa/l b7pZhNhXuh/AulovDdu0xJwyDIIgUVHNeTsI3woS10Cmn0quSQcoxqQVTBjUrUeY3lueSkQJW qLI+X4DoD/SmdOQSGwe7a4F3+ku3BmoPN7mXEZ7FKWtfJQ7XmzuR15mmWWN7vdxVmQFUiZock DGQxavBi3slRTcHNiFnTVkGUdRdjAHWdJXrYll5cT5vmMdrtrkkMBZnFHySwDNe9HgLTUptPY jIExytGsDKaQJmqLB/8IQwa8Okxla00fiOBeIQHnHKPN1QkrmYq06QlH/jG2TuVNi+23mxQ06 MLDbN1AZKcOo6yQRugY/hILin0TQbas7rMfqH7SFp68aFtLpJOQ8S7zYF2K5Rlu0+bc+VH2ug uid8+3Vy2Qk9xoDtBNXwJFTg/C6ceM2u2tZQETordjW0mbrjG4Pd3ES3in9/JFbVl8dpnV971 belQKJ7zNJrJw4KJS2qcrJ1QJlMc2Eqrkf5VeNB266kEMXvtk9Itj/HYTMnFRtWnvvKXUGtyD VQPCN1e5+mxVwlcPMb0CkbxboSDzPKRzNU3iShOzPkejo9Ve1IzZkDltZvVa9oG0YEKmBF7FK ccMCYIZEL3w6uipL5kjpZwPc+BR/XrZ8o3DjsRxgkc61Pn8u+wQNyTrGFG8SLSmOY1b0f7D7X QCvdkqSyW8J6bfYxm+c8c+jflw3alUVHFh04bf/uivtQkGcSdBNFmOXq1Gl/oJRiJscSTVBnd uuAjWw2YsFyLQo3Bdbn7cHGxBbfA06nnFV9RbLjQYkkN2uc3jPNoJJbpf/9naiC3M/ToH+eUr LaBPXgnpyOgGxOOObkg6oYAZfyeYoEzoRQT+r5V4EIsaw01DM3sY9czCEzsXzgtBTubyWygo2 4j2MpimEe7TuoNn8QMy88IF+tQZXsOyrONTfupv/2jJXhH+Scxt+X4FOmRspcJtauBnkkXrOx /AAbR8XL/zS6B23CFc2WFQHgxwGdAmpbrHJoedqnguMtqjt7xBfcgdz63XV93GN9W3I1UQZAr UuEzAN0TG80l9U= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (runc): Update to 1.1.1. [native-inputs]: Use new style. =2D-- gnu/packages/virtualization.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index f3396e7c94..55f1878a18 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,7 +18,7 @@ ;;; Copyright =C2=A9 2020, 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2021 Leo Famulari -;;; Copyright =C2=A9 2021 Pierre Langlois +;;; Copyright =C2=A9 2021, 2022 Pierre Langlois ;;; Copyright =C2=A9 2021 Dion Mendel ;;; Copyright =C2=A9 2021 Andrew Whatson ;;; Copyright =C2=A9 2021 Vincent Legoll @@ -1762,7 +1762,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.0.0-rc93") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append @@ -1771,7 +1771,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))= ) + "0jx56x49dgkygdbrfb3pmxycy1n37arj97jra8n422dj36xz1hbm")))= ) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" @@ -1796,8 +1796,7 @@ (define-public runc (invoke "make" "install" "install-bash" "install-man" (string-append "PREFIX=3D" out))))))))) (native-inputs - `(("go-md2man" ,go-github-com-go-md2man) - ("pkg-config" ,pkg-config))) + (list go-github-com-go-md2man pkg-config)) (inputs (list libseccomp)) (synopsis "Open container initiative runtime") =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:40 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCui-0003x1-Bw for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:40 -0400 Received: from mout.gmx.net ([212.227.17.20]:53943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vs-PR for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=1rB/jtLzY4rN2tVRaszVD08rEMWgs27Lr9Zyxe1TIBw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JjQiQPTWRcH2K1nROzP4Jw+kClWWIArYr8sX8A9YPT/RymTiHkhaSU3B9vHPTfdHa /WkC+j55YRxm4ULuVwCV8iRWq6dCCPJSnc+AKpf0yanlsDoNbZkTVFJoEGe5quWORe EKmZJOmFbdAI0kZg7WrX5WJh9dmxtAtsX/iAmjws= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N2mBQ-1nvoBu2m0y-0133yx; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 3/7] gnu: containerd: Update to 1.6.4. Date: Tue, 10 May 2022 00:35:15 +0100 Message-Id: <20220509233519.26703-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:93Rm4xIRpVH+xPlSF8Dl3629sFmPD+MnqRKvR06O02xgOrkcux2 Iq+x7/jnegA3nBHGMV3gon45B9sT9YjGNVFaV2DWY2ePtlLJU98EjuaOj5kIns1Ywlb4ehQ O05CAZCYB3n9ZpWvGOvvCjBPHffKgGSxQXEMMmJo7733PU4fqkXGaHg/RhvJMze95bHcPQn wMC1D2JBTbg8y31FK5Wow== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:5Sk3gXp4WwE=:aeQKSqkZit/+wBOOEPr4VO Caf2y7hjMX9Pf06uUVrVkGG7PIXJcYvwVYRiSycKWi/4gUXyDnymEAhS7KZnwV3O+/7xGnbBE xRxDfaZDJkzZBhYwO8xK83SWcYwcfAntAvXXWEAsedE5WjjlZnRjTe+paJoJ2OymkHXUyJrTn KcbQA+DO7dZl2CIAcO8jrqBsW4rvbOTRaZtEU9+HZGohE/jjDVyALmFV8gk3fipveGdNZS932 2GEA6EKy3msXSgNtWdBVhjF5xKpdH9bVIM7L7LfUl/J3Hy4J3cPviaExpPb7x9GoQ6H5miOuG hpOWzzVwzvYayv3wigIv7N+Sb+MPna3tUP2TKFVa5gaCny5wXVJRLz/zrqW/DohgcfhMybKDT Qsy8f2mIfAJTrS9fES6CWv2Kl9GsoT9GC5elaFYHURCOOzm9EBmxz5a9hKxz4qCVMrbHePvpM 7VdK2VIkxs62feNKi1iNDozv5sumYH9LvadHc1rKiBbrlyn8LQBNmbcC0PSCRTZ2KWl3G51eg x1qqo4/ZoYrsPVgzqGM4z/i2zdpZpvy2b9uQbzLTXSWkZl0tRsVOrbXZFIKCEOG0woC6ZEgqK Fo6REGzCZatnO3wnDZVKBtXmAZtcixWug80yjJ9vdV5zTFjWShlsv7eyq1vH0au55r5qGEXWr YbKBQ8vWMbKP2e/cJJn4oWYJuWOuYY/QrTimgs4drG4iR6cJ8FcEJjaxC11huZimai9F2dTxY B2P4XmLrfyHh4LsIvLAMtR+bqEoE8+rJHsBKOXr+f4XuhN8AA4k81BXuxydtdYl/4BkN2kpcu YXBgJKtZVwqigMG1wq0fEsHKSBaGvuY1jYhJBHuFcgITpx8NwLh9hr+a/8zrS7+v01GQ88ek1 n6rroNdaPqtZmt0VWGvzK9F5olB8GKa23ueA4hjoBVyMw90nwut5CV+8QCxpKCR1EvrZm0xFK Sr+oFKUVXqWD4+887doWca6RL9sMDT2KGA6oDVNnOsoUt6rwLsiBDDMBC2IYUdaLmLXbhvJve 5MTNuUwqisweLx49rlPQ/A1IyFjOMSbhHyhJhr/X1vIHHnqwB8n6m/x1n5icMLsZhIAVKsoKa bMzicDUZSAwuMw= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd): Update to 1.6.4. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". = Set PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX. =2D-- 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..e95614cfae 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -174,7 +174,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.6.4") (source (origin (method git-fetch) @@ -183,7 +183,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))= ) + (base32 "1hy5jaf5x8lffh3p4hdkk6ar8i4w84i0b539k1h5baqx9gnq2l2s")))= ) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=3D" version) @@ -203,6 +203,11 @@ (define-public containerd (string-append "defaultShim =3D \"" (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]*=3D.*") (string-append "DefaultCommand =3D \"" @@ -226,8 +231,8 @@ (define-public containerd (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-pat= h) (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=3D" out) = "install" - ',make-flags))))))))) + (apply invoke "make" (string-append "DESTDIR=3D" out) + "PREFIX=3D" "install" ',make-flags))))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:41 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:41 +0000 Received: from localhost ([127.0.0.1]:59743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCui-0003x9-Np for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:48059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vt-RI for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=Dhy2AQoYBE800tmU6GY9PyKj+4POxKBXCi2L+TwZAG4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=N3VqVKuhG9PXsprC3mMZcfwCe9A0Vv1K7ywaLpAkgACNi4Fr848YNAoJf6O0KvZBk 1DVbQJUYVy4TkICSY4H3cZlTI8v2yfSHTgjiL2vIlpY2RRxoEfGOKyDgoam4xsppNm +4pQhDI99A+7M8lWK+uirnz47ZQN5boZMYgeCmZY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N7zFj-1nsnW947Od-014xfE; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 4/7] gnu: containerd: Switch to gexp arguments. Date: Tue, 10 May 2022 00:35:16 +0100 Message-Id: <20220509233519.26703-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6bNye7AoCoeH+ukW2WeIfM48WSJR0q+jHm1y0YX3lqSq9wqom64 g+HWbytjXh1ANgfmGI2Hs93wqxW+lCrFySvfvN8GJP2oHbZ4ElF7Y0N/bRGnzNB39UkH+Ga yaapXS/wegWxRwzb8wlOppaLPzZYl+zdQjH2Nzi2q2f28OaeuqWK1dFD9u3n+x+lhdMr5yX juvJ63wDR30UqzLD67oGg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:6bHX3lZjk1Y=:95rEHjzE5IoAur8vQwICVm SBm+sLZwkhp06jA5TZ8YbXQ/vS6Hz8YbTBIYARx4kUI5z5MMgybtut2WnsOlwQBJbnLuI5qJI dEKJ+E3lP6K3rvCun+/qxRvQBQBgci0j6A3Qpr27pEfyU8AyjeIZEVqyi5Nz1u6dd3NrzvP8M kk7+dbrS4SLNAbwrkWwCO77LPWUyABDnBKLCksvMkrTeySyWkY+CFOuptJOZY+Zer16CgFQ44 GFuJy+nR7oWPQvoxp9xidICJo25GaUPJLfvIp9XIanSi3DdfkoOLgrSu2yhvN1T9bDOrj4LU7 JRVeYifNiMZNzfd9SFQKGXEk0W5lLZcSdD8fZ89XDK8gpyDn/qxOjZfx2SyQYkmp2DLjOoftH SNoWZtNv/uSyxyMBSzEtmJK5Onh2/5GpoTs3905a8lFvgAydHZ1qCjS2r8IZRRI+GD5QTeL7s taOpf8B8xkWLOaOhsOhW4yWi98Q9wdmDcF7KDfJqBDttj/z/EGaDxfkOCcISL9+Bvetx/J6T7 RMKcgvVVhCmnz0NDib3nsewGREe05qqR+nJsD8bypFbWJsZT2lHK2Ie6f+DuGFJR9uTHGlhC+ GIPa5f9LqHlhv5WGGzMqoanb/0fcsQrgpZiOCURWc/SIWl5ZTFxgViX55Zw7PEKQmXEIyokUW mgBUUVb6umNcIbNbvCTm2Rwk2BxIJWWy11763dcpmzqis9KLp/DB6FN6QR+gtytdc8/0WAkWG VW3EFb9YSKD/y6gwArzmcIN77dmo5757As8jLSWzD/gfGPh1dZHAU2/oaphnqWK2YeAOY6/mq hf20tAC+/P16HSpPzUXLuC2prH2TDgWqvQvDN1Hb7C+h8l/lv89tpkFI014H5foooLZkU1Fjn 3eYPeossYeeVCkIPKRoh+9P6gcXWSJURF2DspQPEVOkp5k9uq0HTssVXsDttvFxSi4cKr54KF 3SxMemqsIEYGeK6/sRCiCaiR4ZP8VXMD+SakkfQ9gilqYQvB31KKSFUUwripKMwJKK3S5jEKO ogz0oBBlKitW4rDmhLhIPXREE2kodz+J+AmdnfH3gZs7Bzb8cREnPhq6q6OyVwTN9GN1kD7EL JkQ7g+FgZuLW3I= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (containerd)[arguments]: Rewrite as gexps. Pass all flags via make-flags variable. Switch to using search-input-file. =2D-- gnu/packages/docker.scm | 95 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index e95614cfae..aa5f4d523b 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -29,6 +29,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -186,53 +187,55 @@ (define-public containerd (base32 "1hy5jaf5x8lffh3p4hdkk6ar8i4w84i0b539k1h5baqx9gnq2l2s")))= ) (build-system go-build-system) (arguments - (let ((make-flags (list (string-append "VERSION=3D" version) - "REVISION=3D0"))) - `(#:import-path "github.com/containerd/containerd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs import-path outputs #:allow-other-key= s) - (with-directory-excursion (string-append "src/" import-pat= h) - (substitute* "runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=3D.*") - (string-append "defaultRuntime =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=3D.*") - (string-append "defaultShim =3D \"" - (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]*=3D.*") - (string-append "DefaultCommand =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/te= stutil\ + (let ((make-flags #~(list (string-append "VERSION=3D" #$version) + (string-append "DESTDIR=3D" #$output) + "PREFIX=3D" + "REVISION=3D0"))) + (list + #:import-path "github.com/containerd/containerd" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs import-path outputs #:allow-other-ke= ys) + (with-directory-excursion (string-append "src/" import-pa= th) + (substitute* "runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (search-input-file inputs "/sbin/runc= ") + "\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (search-input-file inputs "/sbin/runc= ") + "\""))) + (substitute* "vendor/github.com/containerd/go-runc/runc= .go" + (("DefaultCommand[ \t]*=3D.*") + (string-append "DefaultCommand =3D \"" + (search-input-file inputs "/sbin/runc= ") + "\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/t= estutil\ /loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) - (substitute* "archive/compression/compression.go" - (("exec\\.LookPath\\(\"unpigz\"\\)") - (string-append "\"" (assoc-ref inputs "pigz") - "/bin/unpigz\", error(nil)")))))) - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-pat= h) - (apply invoke "make" ',make-flags)))) - (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-pat= h) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=3D" out) - "PREFIX=3D" "install" ',make-flags))))))))) + (("exec\\.Command\\(\"losetup\"") + (string-append "exec.Command(\"" + (search-input-file inputs "/sbin/lose= tup") + "\""))) + (substitute* "archive/compression/compression.go" + (("exec\\.LookPath\\(\"unpigz\"\\)") + (string-append "\"" + (search-input-file inputs "/bin/unpig= z") + "\", error(nil)")))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-pa= th) + (apply invoke "make" #$make-flags)))) + (replace 'install + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-pa= th) + (apply invoke "make" "install" #$make-flags)))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:41 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:41 +0000 Received: from localhost ([127.0.0.1]:59745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuj-0003xH-78 for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:51347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuc-0003vu-5Q for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=ggciaduO5S+HruLgM1xRqMx6FKob/DJ1aj0MleEliP0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Nf/a7x9JOV9mUW0N/TXjaeBMxulY5ZG9ASYnSBRpt+M7YXkZ+mfOaMpWGjSdbp+Cb w3N2jTbC6AnyLF2ocwLxDTxqKYzZetlC/HSYEOyC/sU05ehYbuqkr0hZuJzE5gFvBV 0RyN2gRSZVQoYxDFEhdebFEsGRf6y6j6xE6ZgXJg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MVeI8-1nOwHb1FDA-00RWF5; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 5/7] gnu: docker: Fix mkfs.xfs reference. Date: Tue, 10 May 2022 00:35:17 +0100 Message-Id: <20220509233519.26703-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:YYNJqmNsi/kPoQYwCDltcnkGeJ2eTaPx1uZ+Nkl78hcGOR4ch54 eGEj02o8SdYkRglclTJnirRV8PFGk1RFBVjp79DuCfRNLX8HZLb3f5SwDBRzt+gIJtdpSWf F1fUMIvLP1lFydbHCEC/H9xuskC+4/YOAzLDAuiEyIvgaE6vnATb3K9LZyLwDgPnq1haC3Q my58d4cjg2wYL3P24VKhg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:bJ/dPgXkH2A=:9PXPwkr99H93dTC4L+kEtw R8SnEp/hKuFdrJO/RXl+nZlpWAE62l1RXZ5EieeG45ckl7qbXe2QfuqxUwz7Rw3STKD409EcR 2hRaW3EMr1ArVeb5etxfCZo+qJllHtBIOqVPjmRGSHXYDc9iIBZNCLCG26039Uq5gq3jqDTY3 uneRNjINToLcm9Oy5QLmaVqVLDvXo55SsCAo6G9QQm9/9OuA6Qo4a9bYDs8YcYdIcs0B8lWzj snbItQCdRX5LXesTBOZ3h8xO20xfyuRoNYKkIur/q2zeMpPI6keikSgGmXMsg1T9jvp+Rhl7E I8vTuFXpydCEjwdK01Xm7+Jvbz3fPHMYXCB4bLR4qQOeL0pyT9i2LYu0e7HcGgdndiiiK7KB1 M50XCbfpvVGgxHCyD3WfCKPcR0ROST1VT6SUsobwTpBnz8rpbjT5ZkfuJcL/hTPtTA/5GCOPW m5VJuscdqQo6YIOmdvgwRvX6g/tcdurf9YcJzORRXwDIxP5j8flRTi4FuSS/0cTaFPc7Nlvu3 qumy0OUmseYErnFaDT0Ve19OZg36Z/ss7RNjuHE0zmz8+lxU4g1C9o3nZFMyDEqc6pyS15XY7 zMmOKDgmkelY7OS5NF6iB6koR3sJo9SjJSh+fI/7EayCbII0ZKuST0e4F4hu8WxHHn7qqclJs rvbCCLvmy8j24A1SyzR0pg32MSXJVBysodUDRho3DTsya44FeFBuD1pwuxHo8s9EVn/sE3FU/ agX1BRoKhjwJMm0qZEXYDPr+/ZQVc3bXWIEqfQvaCSLuKuO+NPkFKety1oxmtajS2P35KY+bk Y02nS1wgPod+qhPVFGbOo1QtUR8vVyI4yywp6kcsqyBSz/AxQ3to5JjB39VjpMvxsPikWWQBG hVEznho/vn8ecfjCxo43OW7mmfobZ+QL6kVx9rPaLq/4ln5YyTf/dU89E2E3/zkMEp4lDfiZO /vvuzk0MkQtJXIhUvHJZRFbePol2Ra4ktq6n7SH+f/B+/7bZka+JWh+eIX5YAtRzTr1d33Fax IMiA6Fq9uramGTL9F7gGY0GFT2l8y8naV7pnltdXHsnMOYGno2JJ7rLQ7tOGCEjImL+AZsWSy b9wF9DOvDFppCg= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (docker)[arguments]: Refer to sbin/mkfs.xfs instead of bin/mkfs.xfs. =2D-- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index aa5f4d523b..ff9bbecab6 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -440,7 +440,7 @@ (define-public docker (substitute-LookPath* ("containerd" "containerd" "bin/containerd") ("ps" "procps" "bin/ps") - ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") + ("mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") ("pvdisplay" "lvm2" "sbin/pvdisplay") ("blkid" "util-linux" "sbin/blkid") =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:42 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:42 +0000 Received: from localhost ([127.0.0.1]:59747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuj-0003xO-Gi for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:42 -0400 Received: from mout.gmx.net ([212.227.17.22]:40255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003vv-HL for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=tJ+ZsZyfLUBfbEnLDMBwVBP69pnw02b1NUoS/iMP01A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=azayeJxWwC7YmbDHfHXGaPWOUk63XSwohP2A4Q49NH7GWfuLtRE+KPtV/47yoWL4e LpxFtqcSyo5NT9MgOIzKNcfG0twvskmMuhtL0iNd0RgU3Y57Zxn2kRH8uf9M/aKWbH Nwoxe8xTGF19nE0bWvkBVp8bzA7HBnnFiKrz6dEs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mof9F-1o7aHG2jTF-00p5TG; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 6/7] gnu: docker: Update to 20.10.15. Date: Tue, 10 May 2022 00:35:18 +0100 Message-Id: <20220509233519.26703-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:l06rLhJ4rkxCZGDs3bPq5iOoLna87TkRff+g580cu5lGSnjLP/g qYD4/4SPI/vTE6xX5vrHlucdN1WO9CzhMLDlCdIO+XquXZC/9aQdbXPysMGJ4qgd/7qYjS5 6sYmxFFoIAiizgmPjyOQqqjvVcQ/+qOZX2GSjwkmGPooji0wfh+mwEtnItcjBkv7BWax1s1 ++VwxYrB7LoZybTlZ3v9w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:+1dccVZKWvk=:MHaJIzifH6oaGmSzvUHTYI IgwvPR8i5KtcnU33wuyOomr6mvknExz/fn0Z2b9GZSXeEkXR1V2aygiMWroOk2npe7+K63qLW kIfJU6KjscQi3BjC9SFixS9wW5Ias7IfhV8k8jNK5l0SuJ7YLPADmXLp4dW9YnR6XICp449EV EwQmFiLlhVuqy9o62UzDgO5omNfIqBXiHRiohlW2Hw4ZkUDZvI5cDUpAYaImfob8BXBtw3+EN EsQGjn8iszMT8BgT/a3OJh5WWNgHwssK9CPATW4zsWenlXUrKqTW6xUVIgWvnzclhMAOMqd4g m3lYEXB8KymxqRgI208ATzQPAztTik5fDX49YFnID1S5fyus2nDIfW6jQehLYRWlTi7v7wx2f rqdT1n/CAEn3/JyxE3qtx8fcnaugPS9avfsmhUQ4uN51BGTwM7w+1QJghATuSUixUQ4F877A0 lubzW060HIIylBZPrK6/209Qk5OBTCj6hzqnPwth2Ne95rk4x05mCPwXLU14apMDyNWiTNuTp 84MxVUeiIhXjgifzsvh1q0eLWaf1fmiZPA4Iq9224HzV04bAPw+X/2XWY3aWTntmLGolb8GP1 X2WfQ5UXRBEwMQVkbz1Bijd8eZK0elsCmaTIP8s3mIBByBXB7a8I+DWDnL71FZohKBquNuHXC tvp3ACUmx4akkrm2ifkwBAEwZ2jdGuf4mEakpYQsKctIh+4FGCvrivO79DP+/gRJVLm16QUrp SeHt9QA8zBjFFqczjFYEGVahMT0/msx+NZNKG3g4+S6tzFprXJAWJXDolxSi+wjXIvA1qawjp wyaMjfPf6r9tB9mVLhqobYP7v4l6kOSjM4exwzKV+lM1AtzcOC8/pOmah71FJxzpYIFYhoSOd ryrzk/UDgpFUTGSmi0c+EEgM1mQ+qgjIBgFzhdPa/Z0033h8LGKhLroiTUU5Frth+D1l2ZYVM qKBmzLJkBNkNkwMXzrYyNHpeBmLr0Syjuqxn4sh++EMZfDpHBB7MtvQuAIWOVcGlhooesMSFR cK9nz8PDMFB8k2MWa+exFLZrWktbs1OwV8EN/meBjV4puzRjwGVoQyJa3edmEBVIw8bf/1PUW RvKCzPovph9bvM= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (%docker-version): Update to 20.10.15. (docker-libnetwork): Update commit according to vendor.conf. (docker)[origin]: Remove docker-fix-tests.patch. [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and buildkit-qemu. Remove trailing #t. [native-inputs]: Replace go-1.14 by go. (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t= . * gnu/packages/networking.scm (go-sctp): Update commit according to docker-libnetwork's vendor.conf. * gnu/packages/patches/docker-fix-tests.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. =2D-- gnu/local.mk | 1 - gnu/packages/docker.scm | 72 +++++++++------------ gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 -------- 4 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3b7db46b26..69d3f404b7 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1008,7 +1008,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index ff9bbecab6..a3d3e5fb51 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -54,7 +54,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the ver= sions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.15") +(define %docker-version "20.10.15") (define-public python-docker (package @@ -252,13 +252,12 @@ (define-public containerd ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; There are no recent release for libnetwork, so choose the last commi= t of - ;; the branch that Docker uses, as can be seen in the Docker source fil= e - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important th= at - ;; this version is kept in sync with the version of Docker being used. - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's ven= dor.conf. - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Doc= ker + ;; source file. NOTE - It is important that this version is kept in sy= nc + ;; with the version of Docker being used. + (let ((commit "339b972b464ee3d401b5788b2af9e31d09d6b7da") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -271,7 +270,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")= ) + "0wx2hdwx56cbxiaky9kw2bi1prdfgzwr776lq1k0slw8kvn0cn32")= ) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -324,9 +323,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) - (patches - (search-patches "docker-fix-tests.patch")))) + (base32 "1z816496aqla4nq0aksf0kpy8qk8x1a6y5hrazzkqliycbjnqizq")))= ) (build-system gnu-build-system) (arguments `(#:modules @@ -369,9 +366,10 @@ (define-public docker (("DefaultRuntimeBinary =3D .*") (string-append "DefaultRuntimeBinary =3D \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName =3D .*") - (string-append "DefaultRuntimeName =3D \"" + "/sbin/runc\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" @@ -400,16 +398,6 @@ (define-public docker (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "registry/resumable/resumablerequestreader_test= .go" - (("I%27m%20not%20an%20url" all) - (string-append "\"" all "\""))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "vendor/gotest.tools/x/subtest/context.go" - (("func \\(tc \\*testcase\\) Cleanup\\(" all) - (string-append all "func()")) - (("tc\\.Cleanup\\(" all) - (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "te= st"))) @@ -446,6 +434,7 @@ (define-public docker ("blkid" "util-linux" "sbin/blkid") ("unpigz" "pigz" "bin/unpigz") ("iptables" "iptables" "sbin/iptables") + ("ip6tables" "iptables" "sbin/ip6tables") ("iptables-legacy" "iptables" "sbin/iptables") ("ip" "iproute2" "sbin/ip")) @@ -494,10 +483,13 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ isn't found. + ;; FIXME: We might need to package buildkit and docker's + ;; buildx plugin, to support qemu-based docker container= s. + (("\\ .pc) - go-1.14 gotestsum pkg-config)) + go gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specializ= ed container systems. It includes components for orchestration, image @@ -615,7 +603,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "1jnql7szdk2wd3f5g1bxcairsmzirzybn3hy7xzqx1i679f2fg5v")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -635,11 +623,11 @@ (define-public docker-cli ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") - (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./dock= er.Makefile"))) (replace 'build (lambda _ - (invoke "./scripts/build/dynbinary"))) + (setenv "GO_LINKMODE" "dynamic") + (invoke "./scripts/build/binary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PA= TH"))) @@ -648,8 +636,7 @@ (define-public docker-cli (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit= " - (or make-flags '()))) - #t))) + (or make-flags '())))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -662,8 +649,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))= ) - (install-file "build/docker" out-bin) - #t)))))) + (install-file "build/docker" out-bin))))))) (native-inputs (list go libltdl pkg-config)) (synopsis "Command line interface to Docker") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9010e1f120..28ef92679d 100644 =2D-- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1691,8 +1691,8 @@ (define-public go-netns (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.con= f. - (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847") - (revision "2")) + (let ((commit "f2269e66cdee387bd321445d5d300893449805be") + (revision "3")) (package (name "go-sctp") (version (git-version "0.0.0" revision commit)) @@ -1704,7 +1704,7 @@ (define-public go-sctp (file-name (git-file-name name version)) (sha256 (base32 - "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb")= ))) + "04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g")= ))) (build-system go-build-system) (arguments `(#:tests? #f ; Test suite is flakey. diff --git a/gnu/packages/patches/docker-fix-tests.patch b/gnu/packages/pa= tches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 =2D-- a/gnu/packages/patches/docker-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Danny Milosavljevic -The socket name ended up too long inside the container. -Use a shorter one. =2D--- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.99798594= 7 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 = +0100 -@@ -24,7 +24,7 @@ - ) - - const ( =2D- pluginAddress =3D "authz-test-plugin.sock" -+ pluginAddress =3D "/tmp/authz-test-plugin.sock" - ) - - func TestAuthZRequestPluginError(t *testing.T) { -@@ -263,12 +263,7 @@ - - // createTestPlugin creates a new sample authorization plugin - func createTestPlugin(t *testing.T) *authorizationPlugin { =2D- pwd, err :=3D os.Getwd() =2D- if err !=3D nil { =2D- t.Fatal(err) =2D- } =2D- =2D- client, err :=3D plugins.NewClient("unix:///"+path.Join(pwd, pluginAd= dress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err :=3D plugins.NewClient("unix:///"+path.Join("/", pluginAddr= ess), &tlsconfig.Options{InsecureSkipVerify: true}) - if err !=3D nil { - t.Fatalf("Failed to create client %v", err) - } =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 09 19:35:43 2022 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:44 +0000 Received: from localhost ([127.0.0.1]:59749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuk-0003xW-FR for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:43 -0400 Received: from mout.gmx.net ([212.227.17.20]:35955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003vy-Tb for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139328; bh=T7UvKtpyEWBjUIFQvSshKc6kmRtmWLSIjnKG2efdJFs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CEdVoWXYL0Uz9hhFp9rtt51JyRjMBp/VYv1Kofgrb5mIOVlo1DkXW42n7n8z2R7XO 1PL8SQ73F6r/YOwpwEVz5XpXY4hwyJyFfNVt6w3X9jczzEbGcgBBUXJrNkJBehDglo fkyvxdK19CT81Uv/3ZD+ed751T5HGW2JNMhWfW2s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsHnm-1o46CL41n8-00tkK9; Tue, 10 May 2022 01:35:28 +0200 From: Pierre Langlois To: 52790@debbugs.gnu.org Subject: [PATCH v3 7/7] gnu: docker: Switch to gexp and new input style. Date: Tue, 10 May 2022 00:35:19 +0100 Message-Id: <20220509233519.26703-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:WK6eTdUXRrjGeNloaIOGSOaFWhYOh6Yd3YvoojPKl99QSgpkGZx scniUEoequtpQv1D2ClZXT/JR/QJ+eZwlsLr5kMqVTrqF+FClF7Na/o5gHLfwbk68XhnGLt Oc0XOLU7j8/X03e4ysftzyDsleRhw9aH+MmgaFS15rmYja33nCQHjbclJS6cG8ueYdPlHcd Ag3+22d8Pem7mqtorYCMg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:2VhmABSr5dM=:QmSB25rArL3Pbl8032uhTp nQo/O75qeNf2VK9BSIj35/PQjToinj8Cp9WsWACu/P+tulTfwj9bFPz4nh0PurFu/WyNf2Ztv eshrERJIYKTMNxsig0lL/oKLP9ExcmcHBfS1aRC1txtm9mAT6h7uz0KfI8AI2/ItFmWctouvv GoI/V0kXL2f7vdjs/GwnFcQOwddIg177hybyap8MjXOwsoLxDe4zO/rT7N7S5Y4Wt3jBxiCul 9NJai04H3aWySqroeOHcJDG3gIV+8bQu4ZQAT1ZCYlbEUInw9qla/+PSekwmGdJf6IfCniKbv w7TgX+BqpXARUJWUtV6tC07k7xCe0yQzn+EuHKdQfo30pmTf2dviulBlx7ao9AkUygToouxPw 7Ww8R+EV7Hi7jE9PtqRD2dxH3U8cZfDyfxyk8oHo1LGP5g2Y75jK+KgAKll9Yav0eKimQ2G5h VAaK1AfWhj+F5WuFAJmgcqWBsbH3L3Urr6jlfjFe4VMpdBhJz5vtvtxDyViz0by6Q3ESiwson Hd+JPDk82ZlyP93hEcY2fASMfZLmlhTl/OLT/UfXxZSO91GWfuRF+2lqXGGFwxNvYMvu+IsBn 1Tvigluk3C6nf+yGQ/G6fSJF/vIkx67QjkLL4eJRtFqQPG962UvBz+Oy9xqKUyuOLWJzkoXPC Ty7hQXPeSMsiGZ5dUNbzRO/ELF5jwAKOHUM7ktWWr5PPD7Upw1QUr7qAbhwMKB6dS0V6q6++8 oFBGiHeArKbSIai5h/i0KJ0kxgmOevjLpUe7QTPtqNzE/Hqv98tTeak32lOHzYcfV7e5NWjkt XrFSxmiheYkIMMeij292djOLab5u6K4FYkjuxWZmz6MZpwBUoXRwbQfhb5MlIOJs2doqDuuXv cCm8pGGVUj59VxCQmV75SVYoO5cndbVQLif/3/4E5OXsx+5a6uRWKXEol3KsF01M7tSzYNlFT wNqVOIVyHtcylfHWvHF+JzB5RgjbWC+2JC8lBMcPcmGsjDyY0Att9dpkD1XbSnGIIG7pnUXr3 UYKCqJbFZHiHmRWaj+0UG+l054SZ6Q+D19wW7ILfUKhwq1JoSR36RFAiNAxYWhcBMj7nFqVf8 haZhecJzay9J2c= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/docker.scm (docker)[arguments]: Rewrite as gexps. Switch to using search-input-file. [inputs]: Use new style inputs. =2D-- gnu/packages/docker.scm | 483 ++++++++++++++++++++-------------------- 1 file changed, 241 insertions(+), 242 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a3d3e5fb51..2df4cdb98a 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -326,260 +326,259 @@ (define-public docker (base32 "1z816496aqla4nq0aksf0kpy8qk8x1a6y5hrazzkqliycbjnqizq")))= ) (build-system gnu-build-system) (arguments - `(#:modules - ((guix build gnu-build-system) + (list + #:modules + '((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) (guix build union) (guix build utils)) - #:imported-modules - (,@%gnu-build-system-modules + #:imported-modules + `(,@%gnu-build-system-modules (guix build union) (guix build go-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "builder/builder-next/executor_unix.go" - (("CommandCandidates:.*runc.*") - (string-append "CommandCandidates: []string{\"" - (assoc-ref inputs "runc") - "/sbin/runc\"},\n"))) - (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand =3D .*") - (string-append "DefaultCommand =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/containerd/runtim= e/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=3D.*") - (string-append "defaultRuntime =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=3D.*") - (string-append "defaultShim =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n"))) - (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary =3D .*") - (string-append "DefaultShimBinary =3D \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n")) - (("DefaultRuntimeBinary =3D .*") - (string-append "DefaultRuntimeBinary =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/runtime_unix.go" - (("defaultRuntimeName =3D .*") - (string-append "defaultRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/config/config.go" - (("StockRuntimeName =3D .*") - (string-append "StockRuntimeName =3D \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultInitBinary =3D .*") - (string-append "DefaultInitBinary =3D \"" - (assoc-ref inputs "tini") - "/bin/tini-static\"\n"))) - (substitute* "daemon/config/config_common_unix_test.go" - (("expectedInitPath: \"docker-init\"") - (string-append "expectedInitPath: \"" - (assoc-ref inputs "tini") - "/bin/tini-static\""))) - (substitute* "vendor/github.com/moby/buildkit/executor/runce= xecutor/executor.go" - (("var defaultCommandCandidates =3D .*") - (string-append "var defaultCommandCandidates =3D []string= {\"" - (assoc-ref inputs "runc") "/sbin/runc\"}")= )) - (substitute* "vendor/github.com/docker/libnetwork/portmapper= /proxy.go" - (("var userlandProxyCommandName =3D .*") - (string-append "var userlandProxyCommandName =3D \"" - (assoc-ref inputs "docker-proxy") - "/bin/proxy\"\n"))) - (substitute* "pkg/archive/archive.go" - (("string\\{\"xz") - (string-append "string{\"" (assoc-ref inputs "xz") "/bin/= xz"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "builder/builder-next/executor_unix.go" + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (search-input-file inputs "/sbin/runc") + "\"},\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand =3D .*") + (string-append "DefaultCommand =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "vendor/github.com/containerd/containerd/runti= me/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=3D.*") + (string-append "defaultRuntime =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("defaultShim[ \t]*=3D.*") + (string-append "defaultShim =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n"))) + (substitute* "daemon/daemon_unix.go" + (("DefaultShimBinary =3D .*") + (string-append "DefaultShimBinary =3D \"" + (search-input-file inputs "/bin/container= d-shim") + "\"\n")) + (("DefaultRuntimeBinary =3D .*") + (string-append "DefaultRuntimeBinary =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName =3D .*") + (string-append "defaultRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/config/config.go" + (("StockRuntimeName =3D .*") + (string-append "StockRuntimeName =3D \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("DefaultInitBinary =3D .*") + (string-append "DefaultInitBinary =3D \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\"\n"))) + (substitute* "daemon/config/config_common_unix_test.go" + (("expectedInitPath: \"docker-init\"") + (string-append "expectedInitPath: \"" + (search-input-file inputs "/bin/tini-stat= ic") + "\""))) + (substitute* "vendor/github.com/moby/buildkit/executor/runc= executor/executor.go" + (("var defaultCommandCandidates =3D .*") + (string-append "var defaultCommandCandidates =3D []strin= g{\"" + (search-input-file inputs "/sbin/runc") "= \"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmappe= r/proxy.go" + (("var userlandProxyCommandName =3D .*") + (string-append "var userlandProxyCommandName =3D \"" + (search-input-file inputs "/bin/proxy") + "\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (search-input-file inputs "/b= in/xz")))) - (let ((source-files (filter (lambda (name) - (not (string-contains name "te= st"))) - (find-files "." "\\.go$")))) - (let-syntax ((substitute-LookPath* - (syntax-rules () - ((_ (source-text package relative-path) ..= .) - (substitute* source-files - (((string-append "\\ isn't found. ;; FIXME: We might need to package buildkit and docker's ;; buildx plugin, to support qemu-based docker container= s. - (("\\ .pc) go gotestsum pkg-config)) =2D- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 10 06:06:09 2022 Received: (at 52790) by debbugs.gnu.org; 10 May 2022 10:06:09 +0000 Received: from localhost ([127.0.0.1]:60375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noMkr-0004BK-2a for submit@debbugs.gnu.org; Tue, 10 May 2022 06:06:09 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:57902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noMkp-0004BB-If for 52790@debbugs.gnu.org; Tue, 10 May 2022 06:06:07 -0400 Received: from localhost (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 0C3B31120130; Tue, 10 May 2022 12:06:06 +0200 (CEST) Date: Tue, 10 May 2022 12:06:02 +0200 From: Danny Milosavljevic To: Pierre Langlois Subject: Re: [bug#52790] [PATCH v3 5/7] gnu: docker: Fix mkfs.xfs reference. Message-ID: <20220510120602.3f591e9b@scratchpost.org> In-Reply-To: <20220509233519.26703-5-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> <20220509233519.26703-5-pierre.langlois@gmx.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/NNlumnMOSkjuwZzCBv+hTMS"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/NNlumnMOSkjuwZzCBv+hTMS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 10 May 2022 00:35:17 +0100 Pierre Langlois wrote: > * gnu/packages/docker.scm (docker)[arguments]: Refer to sbin/mkfs.xfs > instead of bin/mkfs.xfs. > --- > gnu/packages/docker.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm > index aa5f4d523b..ff9bbecab6 100644 > --- a/gnu/packages/docker.scm > +++ b/gnu/packages/docker.scm > @@ -440,7 +440,7 @@ (define-public docker > (substitute-LookPath* > ("containerd" "containerd" "bin/containerd") > ("ps" "procps" "bin/ps") > - ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") > + ("mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") > ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") > ("pvdisplay" "lvm2" "sbin/pvdisplay") > ("blkid" "util-linux" "sbin/blkid") LGTM! --Sig_/NNlumnMOSkjuwZzCBv+hTMS Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAmJ6OQoACgkQ5xo1VCww uqWvbQf/WRYhm5UjbtPpUq+9KUGShdNJSRjklhm3nDkrkGzqZpMV1HleRdPciLb0 E/uupOrfvCJzjOTa5AeDKfUlal1Es1CXYOug/RdrGNNzRbQ+BT2RU90HxvH/chWN 8Z497hJ+U1nBfwiS5K284fbymr00z0P8Cb4cAhyxuZbPwwitQx6lyXYiZQhYPty0 oTT1aCbXy4hCCySSAGtNWHrYNljNZ1RNeqqXTKL8rQ6203CWccQerNLlT9zE3P39 IiZ9kjdAbzTSo9FUs+4E9G2s4qiLgZJqwyiwtQwS8EjHiRmVyEPhlEJrP1cHh+p2 /QpG+5+r8dJkB5MLPed1v+nAzDeuaQ== =XwV9 -----END PGP SIGNATURE----- --Sig_/NNlumnMOSkjuwZzCBv+hTMS-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 10 06:11:10 2022 Received: (at 52790) by debbugs.gnu.org; 10 May 2022 10:11:10 +0000 Received: from localhost ([127.0.0.1]:60379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noMpi-0004JA-Ka for submit@debbugs.gnu.org; Tue, 10 May 2022 06:11:10 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:58652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noMph-0004J2-0M for 52790@debbugs.gnu.org; Tue, 10 May 2022 06:11:09 -0400 Received: from localhost (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 35E15112017C; Tue, 10 May 2022 12:11:08 +0200 (CEST) Date: Tue, 10 May 2022 12:11:07 +0200 From: Danny Milosavljevic To: Pierre Langlois Subject: Re: [bug#52790] [PATCH v3 6/7] gnu: docker: Update to 20.10.15. Message-ID: <20220510121107.4cce29ed@scratchpost.org> In-Reply-To: <20220509233519.26703-6-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> <20220509233519.26703-6-pierre.langlois@gmx.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_//sztn11srQbxFz_d1w7HCxl"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_//sztn11srQbxFz_d1w7HCxl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable LGTM! --Sig_//sztn11srQbxFz_d1w7HCxl Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAmJ6OjsACgkQ5xo1VCww uqWBFAf+LinuD14MXN7geI3NItt8YCLH5sbnwxeOGbQ/71tjEnf7to3iU7oG6GhB SZP7OMHy0+EPrF053JUSWUGanaMMP6s8LALKt0w+Wit3GiXWSZAK9s+2ma/wXFCD IpUSamN1uii3gutx2UqK2w7IHwCYQAspfZZlciJPGS1nKmhRgKA5MW4qKPK6Uupj KEESUAOsYqHbMgYrP7t307UwRtniMTZryH5hzruUnmHeJx0yu8neauwF5wwn730w wDcJ/R4bz01okzpsKuN42nWC3M4//IpHu9ferd9Xj4wPEikujd8TUk9HmDaEv+Il 1K2JZkbjJycOgSkbSG74DEj/XNcIJg== =Ljk9 -----END PGP SIGNATURE----- --Sig_//sztn11srQbxFz_d1w7HCxl-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 14 12:04:14 2022 Received: (at 52790) by debbugs.gnu.org; 14 May 2022 16:04:14 +0000 Received: from localhost ([127.0.0.1]:47351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npuFa-0005XU-Bw for submit@debbugs.gnu.org; Sat, 14 May 2022 12:04:14 -0400 Received: from mout.gmx.net ([212.227.17.22]:51111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npuFX-0005XB-Py for 52790@debbugs.gnu.org; Sat, 14 May 2022 12:04:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652544244; bh=toB9Gi/LYdVVUQ5WCbbPVj/of8NvB1RLvdhWx+RLoYg=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=cV1sNY6s7Ciew2ZK4+lwelwOQtc689UPMRizw/VQoHvj1hL7MxeNCafqnCM+sAnjT DmP8jxM+UD/efxEatERNujN5XFNiyXs5xufFkmuhy1OjUuXHYtbYnk6+l1wjAFIj9W nN3RA7qe54hVkzrjt6R239sJot6m54aGmZZ5elyQ= 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 1MulqN-1o6TKR0rrP-00rq42; Sat, 14 May 2022 18:04:04 +0200 References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> <20220509233519.26703-6-pierre.langlois@gmx.com> <20220510121107.4cce29ed@scratchpost.org> User-agent: mu4e 1.6.10; emacs 28.1 From: Pierre Langlois To: Danny Milosavljevic Subject: Re: [bug#52790] [PATCH v3 6/7] gnu: docker: Update to 20.10.15. Date: Sat, 14 May 2022 17:01:48 +0100 In-reply-to: <20220510121107.4cce29ed@scratchpost.org> Message-ID: <87v8u8m77z.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:YkbhS6EwBXOqS+t3ut9tEsTTfeBaHXSPJSqr5WZcRLCz5NbpMO5 xGmtrcP6HJpoWzchOAwUJMHJgvXttn6rx7k+dIrA8L60ZAN5jelifPEgjBh2VAzB/6FwDmP +njsCnNwngMiz0pfKCu6FD511doQ7VEW8wkSIXJF4W/FIDgHpIyo33pepicyNkAhREi2G2i 79y6BghE38+jIClL+uLEQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:dpjNpbLqVos=:aoXSHyFuz0X+JMQc8ISZmF bpLWrnjmURN5WvwD/3ZgOv/VafkDzQyDPUwqvzNqff2AMjSnLmrseFkzKlYQrS0ngH6Wb1GnC I05Q6jOEHQM2ezfGha05crK6MwO+4mdOG+WW8G71VQZVsRiUfsLgeYw/VwD1CdwTSwhutXPrA uB4nBz4WnSPBeadAn3s79WHKXHjHkSOJanRdC9BbTk4PC9I/6HwzKzFu+cNGu2vgKf95umegV 8m9RjJaR94WCqksy78R477/lNGhk9C40+7a1sX9sSCbuT9TAo+ersaCkK7ECRt0b6XHIds6Fr fWE9agUxtgELI7O+gsludWVS7wU8v1Ij5sagWX3WT1iD9zQp7fUFfvOaPSSZHWvNrC1qGweis L8MP80nSDU6JTRfdP2jtH9a6ITd+GFePLzRJxJlT2sy65mp15NNLHcBbo6lJQsuDHy6QMOpTV ZlmSZeJzdBgkLbk4xxGUS47XlRSTEK24paOlB7kEiniPJfdzBM8WDl41nGpVHPhOYVuOq7qkn rVAJNzT7aEnm1ugBRred70tDUqcTZnUoKNJ33th062ohpCy2/dEgyZUTFZKzGwSukK/5Ou5fu lKqzzDo5ZaSBlPnOl1YomoZhtsJgIFAT1fcbipxbJ9RNVd4XFIBW+0agDY//eLTdsz+9rvLJq se6v2i2kLysZqY4Dtvtxd2pTjee1j9ZSsG4PQhDrZJ8IjKlC8fal9CnBbOfJrr83omWNDn+PV hOPUwbr3wDKnZabSctMCV3tclvQOpOqiBXQ+rEaarQPzyJQiwMG9Ax1BkJvXPBMx0Fk+XMiZi Kxx6Vuc21ea7ftlBt3zVh6zOLfOoSzZK1GfFl4e5+oF26Pdq1Q3zV7kt5dfjS/kVKtBUCj3rt EszNnpD4HnkzhKB6tPTbqdw9LPaa2eZ8wgN7egwGWLF/8PFfzfi3Ck0MgOFbbPhIfjXnoh7f5 4Vub79OwM3lXtpkXO4iHlzqFdUy/km6oyHSLdFQx12QYcqKTvtDRpl1PnHT+EH550zZUbXzji 7Hz8WAWYfFwI3avZ20QZ0GzdsWvAhE7OV+OSgYUYG9WJGxPtv2TLt4qJ4a8zWMHEBlRN2rC1C zOY7Z8fg8aPCV4uEX/2zxPpl9Hb8/zeTluZVIidqjSQuueNl8z3DaaT3w== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: Pierre Langlois , 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Hi Danny, Danny Milosavljevic writes: > [[PGP Signed Part:Undecided]] > LGTM! Just to be clear, are you OK with the two patches or the entire series? Thanks for taking a look, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmJ/0vAYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31U/x4H/jSfoZR9OpwBGoiaDsbwTjz1 2T/tI56DM6A7Wcl96UVntCnA5dg7YFjI0JeKOKA0cjh1l0gsYPHOuZpUUUC9UOJE izE8whfXg2HPpHTmcCb/X0OxmL/HngA+HBpnR0m3aAy9bIcP5pTeo6UQDoHZMyak +FFv8WTxd3LdVlwtvQOOj6FcusA5Ftp2ClHFFJlOxntNwgpEL2fvSnViilMiMWcw 6oSPApfVIcTd4irdH51v+pzgc4+IRm8TZZx5AumeWnrPMWn63g+bWH+4dgFilkcw +4Nh1v2PEyiPwzdgpohcNE0m4gGYCaA8XIR2s/TriEu9Esb9bfr/SgRv+Ib3z0o= =6F+5 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 17 16:28:37 2022 Received: (at 52790) by debbugs.gnu.org; 17 May 2022 20:28:37 +0000 Received: from localhost ([127.0.0.1]:58140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr3o5-0000CW-MC for submit@debbugs.gnu.org; Tue, 17 May 2022 16:28:37 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:37730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nr3o4-0000CM-7M for 52790@debbugs.gnu.org; Tue, 17 May 2022 16:28:36 -0400 Received: from localhost (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 4BFA011202F2; Tue, 17 May 2022 22:28:33 +0200 (CEST) Date: Tue, 17 May 2022 22:28:27 +0200 From: Danny Milosavljevic To: Pierre Langlois Subject: Re: [bug#52790] [PATCH v3 6/7] gnu: docker: Update to 20.10.15. Message-ID: <20220516021735.5ebad7ff@scratchpost.org> In-Reply-To: <87v8u8m77z.fsf@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> <20220509233519.26703-6-pierre.langlois@gmx.com> <20220510121107.4cce29ed@scratchpost.org> <87v8u8m77z.fsf@gmx.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52790 Cc: 52790@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Pierre, for some reason, I only see patch 5, 6, and 7 of the series. I reviewed patch 5 and 6 already and found it good. I am still reviewing patch 7. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 24 01:06:08 2022 Received: (at 52790-done) by debbugs.gnu.org; 24 Jun 2022 05:06:08 +0000 Received: from localhost ([127.0.0.1]:40510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4bWC-0002Cj-HD for submit@debbugs.gnu.org; Fri, 24 Jun 2022 01:06:08 -0400 Received: from mail-qv1-f46.google.com ([209.85.219.46]:40538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4bW7-0002CE-Ri for 52790-done@debbugs.gnu.org; Fri, 24 Jun 2022 01:06:07 -0400 Received: by mail-qv1-f46.google.com with SMTP id cu16so3120049qvb.7 for <52790-done@debbugs.gnu.org>; Thu, 23 Jun 2022 22:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Pw6okuBtpSqQygfXPUaHhUHGIXQgRvOtUr+sp1/85KU=; b=bPd/q7fdz03Yin6gIWrpU3/8Zg0RAuwbz5VFjS7qfcgQH6cck4vvNOMyHy6QgW4EU5 aym5dLwFQ44pdYCu6G2P7Ox/uZ3TtED38bQR/0O+/fJS5v4rLXiHA5z9h3McR7NUfa36 zGEUGamv3Q5fyQVodd1vXhChTRT7N0Ig3azmGocOTerMGbwDykUZqjCSU/MCMiiVx6vc Z13pWftIhdrG+hw2ZRwUC2B6ehjDJTwWlS1y0Dm/S7PaMz0SV5uBVmDv1mdAnOPyQcJl 92nLdJ61hNrLZQB8eUCVM0IZfV+9bo8aOqETblk6WDSElFYeyF4Gw92J4Z0ye7w4Acxr IbKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Pw6okuBtpSqQygfXPUaHhUHGIXQgRvOtUr+sp1/85KU=; b=oY/t4Talj9tfeaR9dNVCKVH3NqAU5B4ipnsJ6LKM+70H508HV73nn41Ud7kTojr1SR LX9ImlA+v2vc/1gZqiqJ9HAP+XQZtxG7Bg9VVMupjBGTfTZZI1heNNV1oyhnjUgvNeC2 L8fMjijoatf4VzNYy+aInk2/j7I1iXg3Ykkm1ukasZBeeLnMGNrhUcDwh0Q6NlZft+wM WpVSBqZmjr/fnGlbcQjYWCtvmHgDrzhh4J4lgcb1SpmQ2+1H4V9qe6p4ve0CqMc8m3Z9 W2siCJ4KXWTiR/9O9fR52hqVRA07EfGDRrsC5YxzU8zw1BQdWURVGJRUL0eArciYpFnF zc9w== X-Gm-Message-State: AJIora+1CLXUC9C1xfIuayp8OA6xweRzF/+bFnBXKsJL6lPf7LRKxqAm qLPxs5T+Fo8++ran78QhBhiWfWp2ko4Wmj2x/G0= X-Google-Smtp-Source: AGRyM1u6Xh/MWeMjT94mADf/iR6aRrEtqnzWR5wh/GSkzLHz0f3fj/V8i9pa5aB3JEym54DgQr2b2w== X-Received: by 2002:a05:622a:10f:b0:315:9b4e:f8a2 with SMTP id u15-20020a05622a010f00b003159b4ef8a2mr11314461qtw.373.1656047158182; Thu, 23 Jun 2022 22:05:58 -0700 (PDT) Received: from hurd (dsl-158-129.b2b2c.ca. [66.158.158.129]) by smtp.gmail.com with ESMTPSA id t14-20020a05620a004e00b006a6d20386f6sm1052703qkt.42.2022.06.23.22.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 22:05:57 -0700 (PDT) From: Maxim Cournoyer To: Pierre Langlois Subject: Re: bug#52790: [PATCH 0/4] Update docker to 20.10.11. References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> <20220509233519.26703-7-pierre.langlois@gmx.com> Date: Fri, 24 Jun 2022 01:05:56 -0400 In-Reply-To: <20220509233519.26703-7-pierre.langlois@gmx.com> (Pierre Langlois's message of "Tue, 10 May 2022 00:35:19 +0100") Message-ID: <8735fu1wi3.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 52790-done Cc: 52790-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Pierre! Very nice work, thanks for doing it! I've reviewed the whole series (7 patches), made some changes mostly to update to the latest current version of Docker 20.10.17 and containerd at 1.6.6, added a commit to address 'guix lint' issues and another one to allow the Docker system tests to pass on my old machine. I tested using some Docker load I had at hand and pushed the series. Thanks again! Closing. Maxim From unknown Wed Jun 18 00:26:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 22 Jul 2022 11:24:15 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator