From 5e4c97ed0e63898e16b2fbe3a0b58f5e6f4fd0c3 Mon Sep 17 00:00:00 2001 From: Michael Trip Date: Tue, 3 Oct 2023 19:51:28 +0200 Subject: [PATCH] fixing stuff --- mate/Dockerfile | 7 +++---- ubuntu-mate/Dockerfile | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mate/Dockerfile b/mate/Dockerfile index b678f1f..c7a9a3f 100644 --- a/mate/Dockerfile +++ b/mate/Dockerfile @@ -3,8 +3,8 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate # set version label ARG BUILD_DATE ARG VERSION -ARG BUILDARCH -ARG TARGETARCH +# ARG BUILDARCH +# ARG TARGETARCH LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="Michael Trip" @@ -17,13 +17,12 @@ RUN dnf install -y wget && \ 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 - +RUN wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$TARGETARCH.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 && \ - wget -o /tmp/k9s.tar.gz 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 \ diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile index c60a917..0ad421d 100644 --- a/ubuntu-mate/Dockerfile +++ b/ubuntu-mate/Dockerfile @@ -1,15 +1,15 @@ FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate # set version label ARG BUILD_DATE -ARG BUILDARCH -ARG TARGETARCH +# ARG BUILDARCH +# 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.$BUILDARCH.deb -RUN wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$BUILDARCH.tar.gz +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 \ echo "**** install packages ****" && \ apt update && \