From patchwork Sat Dec 25 14:40:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 35650 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D8B027BBEA; Sat, 25 Dec 2021 14:41:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3CE7527BBE9 for ; Sat, 25 Dec 2021 14:41:14 +0000 (GMT) Received: from localhost ([::1]:52428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n18ET-0004YS-DW for patchwork@mira.cbaines.net; Sat, 25 Dec 2021 09:41:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n18EK-0004Su-1W for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n18EJ-000818-Ox for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n18EJ-0002c9-Nc for guix-patches@gnu.org; Sat, 25 Dec 2021 09:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH 4/4] gnu: docker: Update to 20.10.11. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Dec 2021 14:41:03 +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.16404432329967 (code B ref 52790); Sat, 25 Dec 2021 14:41:03 +0000 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 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 X-Provags-ID: V03:K1:JzXaM17wtcBaRUSOL64NZaDiqfnUx95skCU9MA7IpM5poc9tjge lP7n1TTx25fGVawUE/AIT2Ik/01wTQUIu4hIec4SOsIUBAvfMDwspjg7ZjDVdPPU/NX6Kqq o5nPYV7TcpuxyBa0PClrEoTQTw/xroGIGGmpAlKS2A1tFLW2fQOOgoL+0gE7kgFBi0i3Ntt bCn8MT/WOzQGPl8SKStqA== 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (%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. --- 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 -- 2.34.0 diff --git a/gnu/local.mk b/gnu/local.mk index aa0117a3f5..f2dbd2330a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -996,7 +996,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 062229b3b4..1d09184e4d 100644 --- 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 versions ;; 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 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 "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 = .*") (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" @@ -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 "test"))) @@ -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 specialized 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" "./docker.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.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 "PATH"))) @@ -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 --- 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.conf. - (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/patches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 --- 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. ---- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.997985947 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 +0100 -@@ -24,7 +24,7 @@ - ) - - const ( -- pluginAddress = "authz-test-plugin.sock" -+ pluginAddress = "/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 { -- pwd, err := os.Getwd() -- if err != nil { -- t.Fatal(err) -- } -- -- client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err := plugins.NewClient("unix:///"+path.Join("/", pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true}) - if err != nil { - t.Fatalf("Failed to create client %v", err) - }