fixing stuff

This commit is contained in:
Michael Trip 2023-10-03 19:51:28 +02:00
parent eadf9442cf
commit 5e4c97ed0e
2 changed files with 7 additions and 8 deletions

View file

@ -3,8 +3,8 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG BUILDARCH # ARG BUILDARCH
ARG TARGETARCH # ARG TARGETARCH
LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="Michael Trip" LABEL maintainer="Michael Trip"
@ -17,13 +17,12 @@ RUN dnf install -y wget && \
esac \ 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 && 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 \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ 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 -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 \ dnf install -y --setopt=install_weak_deps=False --best \
terminator \ terminator \
tilix \ tilix \

View file

@ -1,15 +1,15 @@
FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG BUILDARCH # ARG BUILDARCH
ARG TARGETARCH # ARG TARGETARCH
ARG VERSION ARG VERSION
LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="Michael Trip" LABEL maintainer="Michael Trip"
WORKDIR /tmp WORKDIR /tmp
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y wget 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/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_$BUILDARCH.tar.gz RUN wget -o /tmp/k9s.tar.gz https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$TARGETARCH.tar.gz
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt update && \ apt update && \