updating dockerfiles

This commit is contained in:
Michael Trip 2024-09-26 14:10:23 +02:00
parent fa45aeee38
commit 5a1eb57a12
4 changed files with 19 additions and 10 deletions

View file

@ -4,8 +4,8 @@ FROM ghcr.io/linuxserver/rdesktop:fedora-mate
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG TARGETARCH ARG TARGETARCH
ARG SEABIRD_VERSION=v0.5.1 ARG SEABIRD_VERSION=0.5.1
ARG K9S_VERSION=0.32.5
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
@ -18,8 +18,8 @@ RUN \
esac \ esac \
&& 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 && 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 curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.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 && \

View file

@ -4,6 +4,8 @@ FROM ghcr.io/linuxserver/rdesktop:arm64v8-fedora-mate
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG TARGETARCH ARG TARGETARCH
ARG SEABIRD_VERSION=0.5.1
ARG K9S_VERSION=0.32.5
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,7 +19,8 @@ RUN dnf install -y wget curl
# esac \ # esac \
# && 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 # && 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 curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.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 && \
@ -41,6 +44,7 @@ RUN \
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 && \
tar -zxvf /tmp/seabird.tar.gz && \
mv /tmp/k9s /usr/local/bin && \ mv /tmp/k9s /usr/local/bin && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
dnf autoremove -y && \ dnf autoremove -y && \

View file

@ -5,15 +5,18 @@ ARG BUILD_DATE
ARG TARGETARCH ARG TARGETARCH
ARG VERSION ARG VERSION
ARG KUBECTL_VERSION=1.30.2 ARG KUBECTL_VERSION=1.30.2
ARG SEABIRD_VERSION=v0.5.1 ARG SEABIRD_VERSION=0.5.1
ARG K9S_VERSION=0.32.5
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 curl wget RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y curl wget
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 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 curl -L https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz RUN curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
RUN curl -l https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --output /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl RUN curl -l https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl --output /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl
RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz
https://github.com/getseabird/seabird/releases/download/v0.5.1/seabird_linux_amd64.tar.gz
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt update && \ apt update && \

View file

@ -5,6 +5,8 @@ FROM docker.io/linuxserver/rdesktop:fedora-xfce
ARG TARGETARCH ARG TARGETARCH
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG SEABIRD_VERSION=0.5.1
ARG K9S_VERSION=0.32.5
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
@ -17,8 +19,8 @@ RUN \
esac \ esac \
&& 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 && 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 curl -L https://github.com/derailed/k9s/releases/download/v${K9S_VERSION}/k9s_Linux_${TARGETARCH}.tar.gz --output /tmp/k9s.tar.gz
RUN curl -L https://github.com/getseabird/seabird/releases/download/${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.tar.gz RUN curl -L https://github.com/getseabird/seabird/releases/download/v${SEABIRD_VERSION}/seabird_linux_${TARGETARCH}.tar.gz --output /tmp/seabird.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 && \