From 6d520b8c0c8ac562f8275cbb8f77bf6ebacd2444 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 19 Jun 2024 22:38:00 +0100 Subject: [PATCH] gnu: docker: Apply "-trimpath" flag. * gnu/packages/docker.scm (docker) [arguments]: <#:phases>: Remove 'remove-go-references phase. Set BUILDFLAGS=-trimpath to replace 'remove-go-references phase in 'build phase. Change-Id: Iada1a8764808d26e476ca8ca87a23061834f78be --- gnu/packages/docker.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b18de182fe..c033486c6a 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -547,6 +547,7 @@ runcexecutor/executor.go" ;; Our LD doesn't like the statically linked relocatable things ;; that go produces, so install the dynamic version of ;; dockerd instead. + (setenv "BUILDFLAGS" "-trimpath") (invoke "hack/make.sh" "dynbinary"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -570,9 +571,7 @@ runcexecutor/executor.go" (install-file "bundles/dynbinary-daemon/dockerd" out-bin) (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) - out-bin)))) - (add-after 'install 'remove-go-references - (assoc-ref go:%standard-phases 'remove-go-references))))) + out-bin))))))) (inputs (list btrfs-progs containerd ; for containerd-shim