From 8951538e183bb66ba57eed1bc52f03d94f414a11 Mon Sep 17 00:00:00 2001
From: Michael Trip <michael@alcatrash.org>
Date: Tue, 3 Mar 2026 13:53:08 +0100
Subject: [PATCH] chore: update package versions and add conditional
 installation for Headlamp

---
 ubuntu-mate/Dockerfile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile
index 77a99c2..c2f0f10 100644
--- a/ubuntu-mate/Dockerfile
+++ b/ubuntu-mate/Dockerfile
@@ -4,12 +4,12 @@ ARG BUILD_DATE
 # ARG BUILDARCH
 ARG TARGETARCH
 ARG VERSION
-ARG KUBECTL_VERSION=1.35.0
-ARG HELM_VERSION=4.1.0
-ARG HEADLAMP_VERSION=0.39.0
+ARG KUBECTL_VERSION=1.35.2
+ARG HELM_VERSION=4.1.1
+ARG HEADLAMP_VERSION=0.40.1
 ARG K9S_VERSION=0.50.18
-ARG FREELENS_VERSION=1.8.0
-ARG KUBECM_VERSION=0.34.0
+ARG FREELENS_VERSION=1.8.1
+ARG KUBECM_VERSION=0.35.0
 ARG KUBECTX_VERSION=0.9.5
 
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
@@ -36,7 +36,10 @@ RUN set -eux; \
   chmod +x /usr/local/bin/kubectx; \
   chmod +x /usr/local/bin/kubectl; \
   curl -L "https://get.helm.sh/helm-v${HELM_VERSION}-linux-${TARGETARCH}.tar.gz" -o /tmp/helm.tar.gz; \
-  curl -L "https://github.com/kubernetes-sigs/headlamp/releases/download/v${HEADLAMP_VERSION}/headlamp_${HEADLAMP_VERSION}-1_${TARGETARCH}.deb" -o /tmp/headlamp.deb; \
+  case "${TARGETARCH}" in \
+    amd64) curl -L "https://github.com/kubernetes-sigs/headlamp/releases/download/v${HEADLAMP_VERSION}/headlamp_${HEADLAMP_VERSION}-1_amd64.deb" -o /tmp/headlamp.deb ;; \
+    arm64) curl -L "https://github.com/kubernetes-sigs/headlamp/releases/download/v${HEADLAMP_VERSION}/Headlamp-${HEADLAMP_VERSION}-linux-arm64.tar.gz" -o /tmp/headlamp.tar.gz ;; \
+  esac; \
   echo "**** Setup VS Code repository and extra PPAs ****"; \
   wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/packages.microsoft.gpg; \
   mkdir -p /etc/apt/keyrings; \
@@ -52,7 +55,14 @@ RUN set -eux; \
     libreoffice-writer libreoffice-calc libreoffice-impress libreoffice-draw thunderbird gnome-themes-extra \
     gnome-themes-extra-data code thunderbird inetutils-traceroute bash-completion zsh iputils-ping; \
   echo "**** Install downloaded packages and extract tools ****"; \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/freelens.deb /tmp/headlamp.deb; \
+  if [ -f /tmp/headlamp.deb ]; then \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/freelens.deb /tmp/headlamp.deb; \
+  else \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y /tmp/freelens.deb; \
+    tar -C /tmp -zxvf /tmp/headlamp.tar.gz; \
+    mv /tmp/Headlamp-${HEADLAMP_VERSION}-linux-arm64 /opt/headlamp; \
+    ln -s /opt/headlamp/headlamp /usr/local/bin/headlamp; \
+  fi; \
   tar -C /tmp -zxvf /tmp/k9s.tar.gz; \
   tar -C /tmp -zxvf /tmp/helm.tar.gz; \
   tar -C /tmp -zxvf /tmp/kubecm.tar.gz; \