From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6MxpHZVSRmLI/QAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 03:17:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id AOF9GZVSRmL6NQEAauVa8A (envelope-from ) for ; Fri, 01 Apr 2022 03:17:09 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C46C321A4E for ; Fri, 1 Apr 2022 03:17:08 +0200 (CEST) Received: from localhost ([::1]:40534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5uV-00082k-EC for larch@yhetil.org; Thu, 31 Mar 2022 21:17:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5uQ-00082G-P8 for guix-patches@gnu.org; Thu, 31 Mar 2022 21:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5uQ-0001Eb-G9 for guix-patches@gnu.org; Thu, 31 Mar 2022 21:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5uQ-0004Fn-7D for guix-patches@gnu.org; Thu, 31 Mar 2022 21:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 6/7] gnu: docker: Update to 20.10.14. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 01:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877581116331 (code B ref 52790); Fri, 01 Apr 2022 01:17:02 +0000 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 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-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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648775829; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=gxZ2J7SO4vVK2Jknioyhs9BQ214jqFEXUiHdwb8q/PI=; b=AF3CCCvXUF/YWVCc7eRBBC6+vDcjjS98D81YAqKlWbFdWQtZavu5DG/mMilyLP4WZHcdMy C9ZxyPhWLdpLtEJ4RvJTOrCGvsX3yVzUmF643Al8cWywS7u/eOXmAq1QeYoQVBuxajrJ14 kSl8EaqA84og0HhIbMMg4MWec9+d0Aw/yQJlfByi/XOtAbmeqWNLMSAsY8d6aO6PI7yx53 +hM3YWFFm0tv6oqYLEPBRhtkNdkrwQhYKPOG3MZLz2oQNg3jgZuB1PEuLNyKQRgA4IAGan gztTzt3FeSBvXAKrY8IjJl4zZE797pM7QS7Ravq5U2EZxya9RjmG3pOumntvZQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648775829; a=rsa-sha256; cv=none; b=jhhPTK31LBEGwAZe5tB00RN6jDkFvGF4GwH/OvuXTMmllUvSyuoAQKTsbCp9y62ue1u52r Kb/t0t8QxiBPYteF4vTKp7gJY5vZCNkIQ3UOlXKn6V4AkIwOMb/sb4CID1qvkNYpb0gEPS ntzOWAZbLRTODhnZUgcuj1YuuvU+4m1YonbghACMB0lIzb0iNDwwnzVb1KxNMBuYk+VFbm VwoMXMuBZ/aCu+dmiBU99xNEcVc6+3QT7PD2oxtFup1CA2+0PaYMXT+LdAQg5QiXdn9aPj shU9lIMY0CVpm3OMBM50XGZgsRr162x8AEMCBfrmdjcdK9wyLdC8d7lPs1kfiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=YWYxf5P7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.93 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=YWYxf5P7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C46C321A4E X-Spam-Score: 2.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: kqjFwnfxg3bp --=-=-= 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 --=-=-=--