From patchwork Wed Jun 11 15:07:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Rodrigues X-Patchwork-Id: 43063 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 D459427BC4B; Wed, 11 Jun 2025 16:12:22 +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=ham 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 45BFB27BC49 for ; Wed, 11 Jun 2025 16:12:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPN3d-0007nm-54; Wed, 11 Jun 2025 11:08:05 -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 1uPN3b-0007lG-JV for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08: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 1uPN3b-0007G8-A0 for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08:03 -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=Jbvf+IKja8XnIs6V8UEfWnfTmY/gAyKGG0qMhtcoGaI=; b=iPU9eHB1R5ChwVWyOigeshPIgQJa3sJ768PjYbQ1F9loNJyBbFmgSnOJVBgV13YjOei5k1GCYi5ugbjp27QKpOcyj6KPXvZHtDtwsQlRGlKPlouJdlzqPapcHHORKS5PgD5nq7p97BiNTbqc8KfbhvK1Qo7jFaOmY1gNJwVgJWoiLNIZZQATxUU8nQcVFrlIO4TzBLzmLHd2e86FwLjVXj7zy1X3eDcTmZWtNExrQIt9CoJtqgNUUkUiJjDNtfH50yZdZXgnrxt6B2H9VbaOsnNiH/3FQU/EV5Nm69OIq2O3ZqmdPcE+8+X5GqfPY08K5X+txQ6T6Xc1o1t1g3lSqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uPN3b-0003M6-39 for guix-patches@gnu.org; Wed, 11 Jun 2025 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74746] [PATCH 3/6] gnu: docker: Update substitutions in patch-paths phase. References: In-Reply-To: Resent-From: Arthur Rodrigues Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jun 2025 15:08:03 +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> Cc: "arthurhdrodrigues@proton.me" Received: via spool by 74746-submit@debbugs.gnu.org id=B74746.174965447212834 (code B ref 74746); Wed, 11 Jun 2025 15:08:03 +0000 Received: (at 74746) by debbugs.gnu.org; 11 Jun 2025 15:07:52 +0000 Received: from localhost ([127.0.0.1]:50152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uPN3P-0003Kw-SO for submit@debbugs.gnu.org; Wed, 11 Jun 2025 11:07:52 -0400 Received: from mail-24428.protonmail.ch ([109.224.244.28]:61483) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uPN3M-0003JJ-TZ for 74746@debbugs.gnu.org; Wed, 11 Jun 2025 11:07:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1749654462; x=1749913662; bh=Jbvf+IKja8XnIs6V8UEfWnfTmY/gAyKGG0qMhtcoGaI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=UvX1yHALLbn6Zi2AVAIFyLVw/Jq/ptv5HqMZzbkPwFVFVQUHaMR2V1NqgZ38Q7WQr XS4H2eSc1EcORd2oMIbvlpgBys6R5g49XsuN/klL8zi9eelBL791Da/DOBCgRSU+8r 35w1pU8x3/pr6/w3oG7rI+dqv/XNTfwsZFuzJtV7j2f0Yyf1A+FeI5q4VYNTUUjfYL WFAUExkhn/7ehicpfkCCbmuasYO1TdqFa5HXyK5/EryQBc5gLOLcSLiiWpYH+A2HmY i9nHSk2TBgpZ4lyrACUyQXxc+wDWN3CaSgFOOfz5EMcXVRnBWlu0CyBqXDoKW/ZpSt CZgeL8vzgFRHQ== Date: Wed, 11 Jun 2025 15:07:39 +0000 Message-ID: Feedback-ID: 108589825:user:proton X-Pm-Message-ID: 4bce7e465fc3a923ce6145dc31df37a655dcb5a3 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: Arthur Rodrigues X-ACL-Warn: , Arthur Rodrigues via Guix-patches X-Patchwork-Original-From: Arthur Rodrigues via Guix-patches via From: Arthur Rodrigues 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: I9d8c6fbc189858bb061deeadbcc616787a0abbc3 --- gnu/packages/docker.scm | 63 +++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b03b551a05..755e2d7211 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -356,67 +356,62 @@ (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_test.go" + (("Path: \"/bin/true\",") + (string-append "Path: \"" + (search-input-file inputs "/bin/true") + "\",")) + (("Path: \"/bin/false\",") + (string-append "Path: \"" + (search-input-file inputs "/bin/false") + "\","))) (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")) + ;; Disable testing libnetwork, since we don't package it as an output + (("libnetwork_pkg_list=.*") + (string-append "libnetwork_pkg_list=\"\"\n")) + (("BUILDFLAGS=.*") + (string-append "BUILDFLAGS=(-tags 'netgo')\n"))) + (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")))