From 5a1eb57a12041530ee5c23bc305f315734b81ce6 Mon Sep 17 00:00:00 2001
From: Michael Trip <michael@alcatrash.org>
Date: Thu, 26 Sep 2024 14:10:23 +0200
Subject: [PATCH] updating dockerfiles

---
 mate/Dockerfile         | 8 ++++----
 mate/Dockerfile.aarch64 | 6 +++++-
 ubuntu-mate/Dockerfile  | 9 ++++++---
 xfce/Dockerfile         | 6 ++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/mate/Dockerfile b/mate/Dockerfile
index fa2913f..334c890 100644
--- a/mate/Dockerfile
+++ b/mate/Dockerfile
@@ -4,8 +4,8 @@ FROM ghcr.io/linuxserver/rdesktop:fedora-mate
 ARG BUILD_DATE
 ARG VERSION
 ARG TARGETARCH
-ARG SEABIRD_VERSION=v0.5.1
-
+ARG SEABIRD_VERSION=0.5.1
+ARG K9S_VERSION=0.32.5
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
@@ -18,8 +18,8 @@ RUN \
         esac \
         && curl -L https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm --output /tmp/openlens.rpm
 
-RUN curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
-RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
+RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
+RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
 RUN \
   echo "**** install packages ****" && \
   rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
diff --git a/mate/Dockerfile.aarch64 b/mate/Dockerfile.aarch64
index 85bd20f..c30f0cf 100644
--- a/mate/Dockerfile.aarch64
+++ b/mate/Dockerfile.aarch64
@@ -4,6 +4,8 @@ FROM ghcr.io/linuxserver/rdesktop:arm64v8-fedora-mate
 ARG BUILD_DATE
 ARG VERSION
 ARG TARGETARCH
+ARG SEABIRD_VERSION=0.5.1
+ARG K9S_VERSION=0.32.5
 
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
@@ -17,7 +19,8 @@ RUN dnf install -y wget curl
         # esac \
         # && curl -L https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm --output /tmp/openlens.rpm
 #
-RUN curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
+RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
+RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
 RUN \
   echo "**** install packages ****" && \
   rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
@@ -41,6 +44,7 @@ RUN \
     code && \
   # dnf localinstall -y /tmp/openlens.rpm && \
   tar -zxvf /tmp/k9s.tar.gz && \
+  tar -zxvf /tmp/seabird.tar.gz && \
   mv /tmp/k9s /usr/local/bin && \
   echo "**** cleanup ****" && \
   dnf autoremove -y && \
diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile
index eda1e1e..85aa5c5 100644
--- a/ubuntu-mate/Dockerfile
+++ b/ubuntu-mate/Dockerfile
@@ -5,15 +5,18 @@ ARG BUILD_DATE
 ARG TARGETARCH
 ARG VERSION
 ARG KUBECTL_VERSION=1.30.2
-ARG SEABIRD_VERSION=v0.5.1
+ARG SEABIRD_VERSION=0.5.1
+ARG K9S_VERSION=0.32.5
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y curl wget
 RUN curl -L https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${TARGETARCH}.deb --output /tmp/openlens.deb
-RUN curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
+RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
 RUN curl -l https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --output /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl
-RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
+RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
+https://github.com/getseabird/seabird/releases/download/v0.5.1/seabird_linux_amd64.tar.gz
+
 RUN \
   echo "**** install packages ****" && \
   apt update && \
diff --git a/xfce/Dockerfile b/xfce/Dockerfile
index 80d2388..3f8c240 100644
--- a/xfce/Dockerfile
+++ b/xfce/Dockerfile
@@ -5,6 +5,8 @@ FROM docker.io/linuxserver/rdesktop:fedora-xfce
 ARG TARGETARCH
 ARG BUILD_DATE
 ARG VERSION
+ARG SEABIRD_VERSION=0.5.1
+ARG K9S_VERSION=0.32.5
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
@@ -17,8 +19,8 @@ RUN \
         esac \
         && curl -L https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm --output /tmp/openlens.rpm
 
-RUN curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
-RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
+RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
+RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
 RUN \
   echo "**** install packages ****" && \
   rpm --import https://packages.microsoft.com/keys/microsoft.asc && \