From ee5c441d727b36d8520043888414b3ef1a213f78 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Tue, 3 Oct 2023 16:34:25 +0200 Subject: [PATCH] fixed dockerfile with buildarchs --- mate/Dockerfile | 10 +++++----- ubuntu-mate/Dockerfile | 8 ++++---- xfce/Dockerfile | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mate/Dockerfile b/mate/Dockerfile index 35e4231..192545b 100644 --- a/mate/Dockerfile +++ b/mate/Dockerfile @@ -10,11 +10,11 @@ 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 OpenLens" && \ dnf install -y wget && \ - wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm && \ + echo "Install and download OpenLens" && \ + if [ "$BUILDARCH" = "amd64" ]; then wget -O https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then wget -O https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.aarch64.rpm; fi && \ echo "Install and download k9s" && \ - wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_amd64.tar.gz && \ + wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$BUILDARCH.tar.gz && \ dnf install -y --setopt=install_weak_deps=False --best \ terminator \ tilix \ @@ -28,8 +28,8 @@ RUN \ thunderbird \ firefox \ code && \ - dnf localinstall -y /tmp/OpenLens-6.5.2-366.x86_64.rpm && \ - tar -zxvf /tmp/k9s_Linux_amd64.tar.gz && \ + if [ "$BUILDARCH" = "amd64" ]; dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; fi && \ + tar -zxvf /tmp/k9s_Linux_$BUILDARCH.tar.gz && \ mv /tmp/k9s /usr/local/bin && \ echo "**** cleanup ****" && \ dnf autoremove -y && \ diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile index 97114c8..91b4517 100644 --- a/ubuntu-mate/Dockerfile +++ b/ubuntu-mate/Dockerfile @@ -13,9 +13,9 @@ RUN \ curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg && \ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list && \ echo "Downloading and installing OpenLens" && \ - wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.amd64.deb && \ + wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.$BUILDARCH.deb && \ echo "downloading and installing k9s" &&\ - wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_amd64.tar.gz && \ + wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$BUILDARCH.tar.gz && \ echo "**** Installing vscode stuff ***" && \ wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg && \ cp packages.microsoft.gpg /etc/apt/keyrings && \ @@ -34,8 +34,8 @@ RUN \ kubectl \ code \ xdg-utils && \ - dpkg -i /tmp/OpenLens-6.5.2.286.amd64.deb && \ - tar -zxvf /tmp/k9s_Linux_amd64.tar.gz && \ + dpkg -i /tmp/OpenLens-6.5.2.366.$BUILDARCH.deb && \ + tar -zxvf /tmp/k9s_Linux_$BUILDARCH.tar.gz && \ mv /tmp/k9s /usr/local/bin && \ echo "**** cleanup ****" && \ apt-get autoclean && \ diff --git a/xfce/Dockerfile b/xfce/Dockerfile index 5770414..cadfb32 100644 --- a/xfce/Dockerfile +++ b/xfce/Dockerfile @@ -14,9 +14,9 @@ RUN \ 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 && \ dnf install -y wget && \ echo "Install and download OpenLens" && \ - wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm && \ + if [ "$BUILDARCH" = "amd64" ]; then wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then wget -O https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.aarch64.rpm; fi && \ echo "Install and download k9s" && \ - wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_amd64.tar.gz && \ + wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$BUILDARCH.tar.gz && \ dnf install -y --setopt=install_weak_deps=False --best \ terminator \ tilix \ @@ -30,8 +30,8 @@ RUN \ thunderbird \ firefox \ code && \ - dnf localinstall -y /tmp/OpenLens-6.5.2-366.x86_64.rpm && \ - tar -zxvf /tmp/k9s_Linux_amd64.tar.gz && \ + if [ "$BUILDARCH" = "amd64" ]; dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; fi && \ + tar -zxvf /tmp/k9s_Linux_$BUILDARCH.tar.gz && \ mv /tmp/k9s /usr/local/bin && \ echo "**** cleanup ****" && \ dnf autoremove -y && \