From fa8afa0e29964fd0cbe06f189f82760d4c69b4a9 Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Wed, 8 Jan 2025 13:16:55 +0200
Subject: [PATCH] cadvisor update to v0.51.0 and support for riscv64

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 pkg/cadvisor/Dockerfile                | 4 ++--
 pkg/cadvisor/static.patch              | 2 +-
 tools/guestfs/Dockerfile               | 5 ++++-
 tools/guestfs/build.yml                | 1 +
 tools/mkimage-dynamic-vhd/build.yml    | 1 +
 tools/mkimage-iso-efi-initrd/build.yml | 1 +
 tools/mkimage-iso-efi/build.yml        | 1 +
 tools/mkimage-raw-efi/build.yml        | 1 +
 tools/mkimage-vhd/build.yml            | 1 +
 tools/mkimage-vmdk/build.yml           | 1 +
 10 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile
index 751683c45..21d04b69d 100644
--- a/pkg/cadvisor/Dockerfile
+++ b/pkg/cadvisor/Dockerfile
@@ -7,7 +7,7 @@ RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 ENV GOPATH=/go PATH=$PATH:/go/bin
 ENV GITBASE=github.com/google
 ENV GITREPO=github.com/google/cadvisor
-ENV COMMIT=v0.36.0
+ENV COMMIT=v0.51.0
 
 ADD /static.patch /tmp/
 
@@ -18,7 +18,7 @@ RUN mkdir -p /go/src/${GITBASE} \
     && git checkout ${COMMIT} \
     && patch -p1 build/build.sh </tmp/static.patch \
     && make build \
-    && mv cadvisor /usr/bin/
+    && mv _output/cadvisor /usr/bin/
 
 
 FROM linuxkit/alpine:35b33c6b03c40e51046c3b053dd131a68a26c37a AS mirror
diff --git a/pkg/cadvisor/static.patch b/pkg/cadvisor/static.patch
index 091901d75..44eec7cff 100644
--- a/pkg/cadvisor/static.patch
+++ b/pkg/cadvisor/static.patch
@@ -1,6 +1,6 @@
 --- build/build.sh.orig	2017-11-16 16:29:18.281342577 +0000
 +++ build/build.sh	2017-11-16 16:29:55.534787421 +0000
-@@ -44,6 +44,7 @@
+@@ -47,6 +47,7 @@
    -X ${repo_path}/version.BuildDate${ldseparator}${BUILD_DATE}
    -X ${repo_path}/version.GoVersion${ldseparator}${go_version}"
  
diff --git a/tools/guestfs/Dockerfile b/tools/guestfs/Dockerfile
index 1c3123e07..592bc0471 100644
--- a/tools/guestfs/Dockerfile
+++ b/tools/guestfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim as base
+FROM debian:trixie-slim as base
 
 ARG TARGETARCH
 
@@ -12,6 +12,9 @@ ENV SYSLINUX="syslinux"
 FROM base as syslinux-arm64
 ENV SYSLINUX_arm64="syslinux-common"
 
+FROM base as syslinux-riscv64
+ENV SYSLINUX_riscv64="syslinux-common"
+
 FROM syslinux-${TARGETARCH} as syslinux
 RUN apt-get update && \
     apt-get -yq upgrade && \
diff --git a/tools/guestfs/build.yml b/tools/guestfs/build.yml
index a88f04a73..8da8cb282 100644
--- a/tools/guestfs/build.yml
+++ b/tools/guestfs/build.yml
@@ -3,3 +3,4 @@ network: true
 arches:
   - arm64
   - amd64
+  - riscv64
diff --git a/tools/mkimage-dynamic-vhd/build.yml b/tools/mkimage-dynamic-vhd/build.yml
index 8a606e6af..af6c3b0f3 100644
--- a/tools/mkimage-dynamic-vhd/build.yml
+++ b/tools/mkimage-dynamic-vhd/build.yml
@@ -2,3 +2,4 @@ image: mkimage-dynamic-vhd
 arches:
   - amd64
   - arm64
+  - riscv64
diff --git a/tools/mkimage-iso-efi-initrd/build.yml b/tools/mkimage-iso-efi-initrd/build.yml
index 82c58ef10..fc75c9d80 100644
--- a/tools/mkimage-iso-efi-initrd/build.yml
+++ b/tools/mkimage-iso-efi-initrd/build.yml
@@ -3,3 +3,4 @@ network: true
 arches:
   - amd64
   - arm64
+  - riscv64
diff --git a/tools/mkimage-iso-efi/build.yml b/tools/mkimage-iso-efi/build.yml
index f9cc476ea..0f5e7afb2 100644
--- a/tools/mkimage-iso-efi/build.yml
+++ b/tools/mkimage-iso-efi/build.yml
@@ -3,3 +3,4 @@ network: true
 arches:
   - amd64
   - arm64
+  - riscv64
diff --git a/tools/mkimage-raw-efi/build.yml b/tools/mkimage-raw-efi/build.yml
index e71272378..5836527be 100644
--- a/tools/mkimage-raw-efi/build.yml
+++ b/tools/mkimage-raw-efi/build.yml
@@ -3,3 +3,4 @@ network: true
 arches:
   - amd64
   - arm64
+  - riscv64
diff --git a/tools/mkimage-vhd/build.yml b/tools/mkimage-vhd/build.yml
index a516f4bf3..a6dc088fb 100644
--- a/tools/mkimage-vhd/build.yml
+++ b/tools/mkimage-vhd/build.yml
@@ -2,3 +2,4 @@ image: mkimage-vhd
 arches:
   - amd64
   - arm64
+  - riscv64
diff --git a/tools/mkimage-vmdk/build.yml b/tools/mkimage-vmdk/build.yml
index b55510a50..6f992b7c7 100644
--- a/tools/mkimage-vmdk/build.yml
+++ b/tools/mkimage-vmdk/build.yml
@@ -2,3 +2,4 @@ image: mkimage-vmdk
 arches:
   - amd64
   - arm64
+  - riscv64