From patchwork Wed May 21 14:35:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arthurhdrodrigues--- via Guix-patches via X-Patchwork-Id: 42835 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 22B4E27BC4C; Wed, 21 May 2025 15:36:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 44FFF27BC49 for ; Wed, 21 May 2025 15:36:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHkYH-0003e9-5g; Wed, 21 May 2025 10:36:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHkY6-0003di-RO for guix-patches@gnu.org; Wed, 21 May 2025 10:36:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHkY6-0004Ve-CB for guix-patches@gnu.org; Wed, 21 May 2025 10:36:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=8gWpJnfvWsAw+lkxy72j5vFU6cmVJxQ2zdtWyXEOvr8=; b=D9kPT5d9gulLvP1NF193AA5yhe6JDFxNFqN7TApX7a7dsPOQzVc/bAZLoeQLksfkWthSn4NbKRG/WJKDv3nsmGFkkqwCA78qL1AP+ieDdVovD73/+N6+edfNKeXRb78RfJJkIYX3dAlItxENjQ3vpvrpI0ihQQ1wfFYVW6dbzfmSfde9ysBnTrxraElWhRd3/CIREV3DHv3KGiNn4BT0KWso09oQ3+D4MMom+vbWeDvWbzO2gWyE4pn5hXzyWg988rYDkKNMgHY4mVEwSvBkTUS3j4RCp5JTA5gGQuUrs8etn+vKH79ZT6tL7tAoq6BpOTUqXu4hVkYP+pDJ3rlNHQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHkY6-0001xv-48 for guix-patches@gnu.org; Wed, 21 May 2025 10:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 3/5] gnu: docker: Update substitutions in patch-paths phase References: In-Reply-To: Resent-From: arthurhdrodrigues@proton.me Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 May 2025 14:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74746 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "74746@debbugs.gnu.org" <74746@debbugs.gnu.org> Received: via spool by 74746-submit@debbugs.gnu.org id=B74746.17478381597536 (code B ref 74746); Wed, 21 May 2025 14:36:02 +0000 Received: (at 74746) by debbugs.gnu.org; 21 May 2025 14:35:59 +0000 Received: from localhost ([127.0.0.1]:49986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHkY1-0001xI-VJ for submit@debbugs.gnu.org; Wed, 21 May 2025 10:35:59 -0400 Received: from mail-106101.protonmail.ch ([79.135.106.101]:21775) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHkXy-0001wY-At for 74746@debbugs.gnu.org; Wed, 21 May 2025 10:35:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1747838147; x=1748097347; bh=8gWpJnfvWsAw+lkxy72j5vFU6cmVJxQ2zdtWyXEOvr8=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=X+OQKJDlpG+4p2ctpmRw4CibU4WOTy6ejiNERaVmArvrwA7SIyBXkOftOJKsNBdej 4xD0/+slsn5e0J9v888eQWBpvxkXIF/OTS8RJYhCnrZFXB9801cbRFGJqa0K979Snm uNDCA2IU7yDqQjp7qUkPJgTi8Z5EiBHqDvakRiKdjXwRzIWmcELtF/dVNVBRlzJ4p8 TDrPRVBl/LEeUNzW6yYWHo7Sjv2GgMvgrZCYYkmUzZPZSSPcRHykjq4rb599T+5AFB n9g+wV77owD1i/LZNMbKk/D5iEI1Ur5UfKJtYbftZFlTyP6XHizOhFi8Y6+JMNbcas deA8Rdce7gsVg== Date: Wed, 21 May 2025 14:35:43 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: 83d3de5eefe8d2bd0fafb29b2c1bdaeda989a4a6 MIME-Version: 1.0 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: , Reply-to: arthurhdrodrigues@proton.me X-ACL-Warn: , arthurhdrodrigues--- via Guix-patches X-Patchwork-Original-From: arthurhdrodrigues--- via Guix-patches via From: arthurhdrodrigues--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change-Id: Id681a07a796dab066f039f7d6d5508065ae02982 --- gnu/packages/docker.scm | 48 ++++++++++++----------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index ee41c86326..f4ba760914 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -356,67 +356,47 @@ (define-public docker #~(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{\"" + (substitute* "builder/builder-next/executor_linux.go" + (("runcCmds := .*") + (string-append "runcCmds := []string{\"" (search-input-file inputs "/sbin/runc") - "\"},\n"))) + "\"}"))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand = .*") (string-append "DefaultCommand = \"" (search-input-file inputs "/sbin/runc") "\"\n"))) - (substitute* "vendor/github.com/containerd/containerd/\ -runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (search-input-file inputs "/sbin/runc") - "\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (search-input-file inputs "/bin/containerd-shim") - "\"\n"))) - (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary = .*") - (string-append "DefaultShimBinary = \"" - (search-input-file inputs "/bin/containerd-shim") - "\"\n")) - (("DefaultRuntimeBinary = .*") - (string-append "DefaultRuntimeBinary = \"" - (search-input-file inputs "/sbin/runc") - "\"\n"))) (substitute* "daemon/runtime_unix.go" (("defaultRuntimeName = .*") (string-append "defaultRuntimeName = \"" (search-input-file inputs "/sbin/runc") "\"\n"))) (substitute* "daemon/config/config.go" - (("StockRuntimeName = .*") - (string-append "StockRuntimeName = \"" + (("DefaultRuntimeBinary = .*") + (string-append "DefaultRuntimeBinary = \"" (search-input-file inputs "/sbin/runc") "\"\n")) (("DefaultInitBinary = .*") (string-append "DefaultInitBinary = \"" (search-input-file inputs "/bin/tini-static") "\"\n"))) - (substitute* "daemon/config/config_common_unix_test.go" + (substitute* "daemon/config/config_linux_test.go" (("expectedInitPath: \"docker-init\"") (string-append "expectedInitPath: \"" (search-input-file inputs "/bin/tini-static") "\""))) + (substitute* "vendor.mod" + (("go 1.23.0") + (string-append "go 1.23"))) + ;; Avoid installation of proxy in unit tests + (substitute* "hack/test/unit" + (("if ! type docker-proxy") + (string-append "if type docker-proxy"))) (substitute* "vendor/github.com/moby/buildkit/executor/\ runcexecutor/executor.go" (("var defaultCommandCandidates = .*") (string-append "var defaultCommandCandidates = []string{\"" (search-input-file inputs "/sbin/runc") "\"}"))) - (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" - (("var userlandProxyCommandName = .*") - (string-append "var userlandProxyCommandName = \"" - (search-input-file inputs "/bin/proxy") - "\"\n"))) - (substitute* "pkg/archive/archive.go" - (("string\\{\"xz") - (string-append "string{\"" (search-input-file inputs "/bin/xz")))) (let ((source-files (filter (lambda (name) (not (string-contains name "test")))