From 426ce9cbd159d1601af2ff3a69be7c5c26395782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Nussbaumer?= Date: Fri, 25 Oct 2024 08:03:19 +0200 Subject: [PATCH] fix(trident): stop searching binaries in /host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Clément Nussbaumer --- .github/workflows/trident.yaml | 4 ++++ trident-distrowith/chwrap.patch | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 trident-distrowith/chwrap.patch diff --git a/.github/workflows/trident.yaml b/.github/workflows/trident.yaml index 1bb48c7..fe32da2 100644 --- a/.github/workflows/trident.yaml +++ b/.github/workflows/trident.yaml @@ -30,6 +30,10 @@ jobs: working-directory: trident-distrowith/trident run: patch Dockerfile ../dockerfile.patch + - name: Patch chwrap.go to stop searching binaries in /host + working-directory: trident-distrowith/trident + run: patch chwrap/chwrap.go ../chwrap.patch + - name: Patch Makefile to change default registry for images working-directory: trident-distrowith/trident run: patch Makefile ../makefile.patch diff --git a/trident-distrowith/chwrap.patch b/trident-distrowith/chwrap.patch new file mode 100644 index 0000000..cb360fe --- /dev/null +++ b/trident-distrowith/chwrap.patch @@ -0,0 +1,11 @@ +--- trident/chwrap/chwrap.go.original 2024-10-25 07:59:25 ++++ trident/chwrap/chwrap.go 2024-10-25 08:01:27 +@@ -53,7 +53,7 @@ + } + + func main() { +- rootPath := "/host" ++ rootPath := "/" // Oct. 24, Clément Nussbaumer: for talos we only consider binaries in the base image, not the host + // First modify argv0 to strip off any absolute or relative paths + argv := os.Args + binary := argv[0]