From e0071d4efcde2031ba98f76717bc2941e74bbe91 Mon Sep 17 00:00:00 2001
From: Michael Trip <m.trip@atcomputing.nl>
Date: Tue, 3 Oct 2023 20:20:22 +0200
Subject: [PATCH] changed images to support multi arch, but not activating it
 at the moment

Signed-off-by: Michael Trip <m.trip@atcomputing.nl>
---
 mate/Dockerfile        | 10 +++++-----
 ubuntu-mate/Dockerfile |  9 +++++----
 xfce/Dockerfile        | 12 ++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/mate/Dockerfile b/mate/Dockerfile
index c7a9a3f..17ddad0 100644
--- a/mate/Dockerfile
+++ b/mate/Dockerfile
@@ -3,21 +3,21 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-# ARG BUILDARCH
-# ARG TARGETARCH
+ARG TARGETARCH
 
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
 
-RUN dnf install -y wget && \
+RUN dnf install -y wget curl
+RUN \
       case ${TARGETARCH} in \
             "amd64")  DOWNLOAD_ARCH=x86_64  ;; \
             "arm64")  DOWNLOAD_ARCH=aarch64  ;; \
         esac \
-        && wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm
+        && 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 wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$TARGETARCH.tar.gz
+RUN curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
 
 RUN \
   echo "**** install packages ****" && \
diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile
index 0ad421d..8b16f78 100644
--- a/ubuntu-mate/Dockerfile
+++ b/ubuntu-mate/Dockerfile
@@ -2,14 +2,15 @@ FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate
 # set version label
 ARG BUILD_DATE
 # ARG BUILDARCH
-# ARG TARGETARCH
+ARG TARGETARCH
 ARG VERSION
 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 wget
-RUN wget -o /tmp/openlens.deb https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.$TARGETARCH.deb
-RUN wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$TARGETARCH.tar.gz
+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 \
   echo "**** install packages ****" && \
   apt update && \
diff --git a/xfce/Dockerfile b/xfce/Dockerfile
index c554f14..fae2389 100644
--- a/xfce/Dockerfile
+++ b/xfce/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/linuxserver/rdesktop:fedora-xfce
 
 # set version label
-ARG BUILDARCH
+
 ARG TARGETARCH
 ARG BUILD_DATE
 ARG VERSION
@@ -9,19 +9,19 @@ LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- $
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
 
-RUN dnf install -y wget
+RUN dnf install -y wget curl
 RUN \
       case ${TARGETARCH} in \
             "amd64")  DOWNLOAD_ARCH=x86_64  ;; \
             "arm64")  DOWNLOAD_ARCH=aarch64  ;; \
         esac \
-        && wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm
+        && 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 \
   echo "**** install packages ****" && \
   rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
   echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo && \
-  echo "Install and download k9s" && \
-  wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz && \
   dnf install -y --setopt=install_weak_deps=False --best \
     terminator \
     tilix \
@@ -35,7 +35,7 @@ RUN \
     thunderbird \
     firefox \
     code && \
-#  dnf localinstall -y /tmp/openlens.rpm && \
+  dnf localinstall -y /tmp/openlens.rpm && \
   tar -zxvf /tmp/k9s.tar.gz && \
   mv /tmp/k9s /usr/local/bin && \
     echo "**** cleanup ****" && \