michael/containerdesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

changed images to support multi arch, but not activating it at the moment

Browse source 
Signed-off-by: Michael Trip <m.trip@atcomputing.nl>
This commit is contained in:
Michael Trip 2023-10-03 20:20:22 +02:00
parent 5e4c97ed0e
commit e0071d4efc
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mate/Dockerfile
View file

@ -3,21 +3,21 @@ 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 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"
WORKDIR /tmp WORKDIR /tmp
RUN dnf install -y wget && \ RUN dnf install -y wget curl
RUN \
case ${TARGETARCH} in \ case ${TARGETARCH} in \
"amd64") DOWNLOAD_ARCH=x86_64 ;; \ "amd64") DOWNLOAD_ARCH=x86_64 ;; \
"arm64") DOWNLOAD_ARCH=aarch64 ;; \ "arm64") DOWNLOAD_ARCH=aarch64 ;; \
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 && 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 \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \

9
ubuntu-mate/Dockerfile
View file

@ -2,14 +2,15 @@ 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 curl 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 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 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 \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt update && \ apt update && \

12
xfce/Dockerfile
View file

@ -1,7 +1,7 @@
FROM docker.io/linuxserver/rdesktop:fedora-xfce FROM docker.io/linuxserver/rdesktop:fedora-xfce
# set version label # set version label
ARG BUILDARCH
ARG TARGETARCH ARG TARGETARCH
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
@ -9,19 +9,19 @@ LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- $
LABEL maintainer="Michael Trip" LABEL maintainer="Michael Trip"
WORKDIR /tmp WORKDIR /tmp
RUN dnf install -y wget RUN dnf install -y wget curl
RUN \ RUN \
case ${TARGETARCH} in \ case ${TARGETARCH} in \
"amd64") DOWNLOAD_ARCH=x86_64 ;; \ "amd64") DOWNLOAD_ARCH=x86_64 ;; \
"arm64") DOWNLOAD_ARCH=aarch64 ;; \ "arm64") DOWNLOAD_ARCH=aarch64 ;; \
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 && 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 \ 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 && \
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 \ dnf install -y --setopt=install_weak_deps=False --best \
terminator \ terminator \
tilix \ tilix \
@ -35,7 +35,7 @@ RUN \
thunderbird \ thunderbird \
firefox \ firefox \
code && \ code && \
# dnf localinstall -y /tmp/openlens.rpm && \ dnf localinstall -y /tmp/openlens.rpm && \
tar -zxvf /tmp/k9s.tar.gz && \ tar -zxvf /tmp/k9s.tar.gz && \
mv /tmp/k9s /usr/local/bin && \ mv /tmp/k9s /usr/local/bin && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \