From 7539512a0d6c02c8151e59e351880282c73acf12 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Tue, 3 Oct 2023 16:38:39 +0200 Subject: [PATCH] testing xfce build with new variables --- xfce/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xfce/Dockerfile b/xfce/Dockerfile index cadfb32..b0b9b43 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" && \ - 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 && \ + if [ "$TARGETARCH" = "amd64" ]; then wget https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; elif [ "$TARGETARCH" = "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_$BUILDARCH.tar.gz && \ + wget 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 \ @@ -30,8 +30,8 @@ RUN \ thunderbird \ firefox \ code && \ - 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 && \ + if [ "$TARGETARCH" = "amd64" ]; dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; elif [ "$TARGETARCH" = "arm64" ]; then dnf localinstall -y /tmp/OpenLens-6.5.2-366.aarch64.rpm; fi && \ + tar -zxvf /tmp/k9s_Linux_$TARGETARCH.tar.gz && \ mv /tmp/k9s /usr/local/bin && \ echo "**** cleanup ****" && \ dnf autoremove -y && \