Package: guix-patches;
Reported by: Josep Bigorra <jjbigorra <at> gmail.com>
Date: Mon, 9 Dec 2024 14:56:02 UTC
Severity: normal
Message #35 received at 74746 <at> debbugs.gnu.org (full text, mbox):
From: arthurhdrodrigues <at> proton.me To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org> Subject: [PATCH 3/5] gnu: docker: Update substitutions in patch-paths phase Date: Wed, 21 May 2025 14:35:43 +0000
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"))) -- 2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.