From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kFO/NEpMRmLz0wAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 02:50:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IKQxLUpMRmLlLwEAG6o9tA (envelope-from ) for ; Fri, 01 Apr 2022 02:50:18 +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 54842639E for ; Fri, 1 Apr 2022 02:50:18 +0200 (CEST) Received: from localhost ([::1]:57908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UX-00071D-Ei for larch@yhetil.org; Thu, 31 Mar 2022 20:50:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TO-0006TV-OM for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TM-0004Pw-Q7 for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TM-0003Or-On for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -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 00:49:04 +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.164877410012968 (code B ref 52790); Fri, 01 Apr 2022 00:49:04 +0000 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 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-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-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=1648774218; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=RmC0rgr6/Gj8mLPpIfNvNI8HZw14MLUGqBoaPsJFbPQ=; b=iLfDG5VPcVI5oW3MlLjcdWAa6JdYmGMvQUlgBBF4o9fDN0bUh89ag878k0cYzHMsWsVI7F rZtP8sFnoItu+RdxIT/zeFw4bMehoeocau5uialHdsTal/A1LIBi8Zxoh31mwWlFaGbqWY rq1xeFR44sgE1WcYPA6NOmyDoPl0vltdzPfS9MOnYwcjDQyFc4mERsiabYzegQ4t8TXlih lk5RtCBaLFwOzqiNHSH15Kp0g8tLQYaoHIpd8TV9r9wR15RJHiTPYk+gO9ilyixpgcc9OK BuQPL8EeD12Is57lyYvRQZn3quw44MQlWwRIBainvmjE8PnEs2dFxc1nG3sKsg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648774218; a=rsa-sha256; cv=none; b=kzqA7Ack5n48WtNTou6aslw3Ue6WUg0SEnuVFqLwcXDBk9thNtNf3uy4DGl53TxBg9Cv8P 3JxMYQyfGGAjnNTp17zLJW6jmazYSmc7hYkNA3XEE+4ZBerth4TCjv15ZEy1qEL35p6C/Q 9UE6i8s65uRoetIhLkXjFGtp7emRXy5rwavwuJaIylP5erDASeeF1fHikvJLPkqI7fSBtP XM0lNGwIpa/bGAT96OVJyjZiVuAacOl7jP7qbqoGPW2+HB96YJQDBsxq8idHguekhqE3gu vwa678hfWkzPjyPs5UbBXBhxliJITWtuw6ks+Q+GKoIoBVNd5uxr0W0+Vin58w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=Xvkr9mcI; 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: 7.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=Xvkr9mcI; 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: 54842639E X-Spam-Score: 7.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: DAF/iVabEeXl * 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