From 80fa6dea850e6eeec4b54bff599328ea685f9db4 Mon Sep 17 00:00:00 2001 From: Christopher Schnick Date: Fri, 3 Jan 2025 08:05:36 +0100 Subject: [PATCH] Fixes [release] --- Dockerfile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06ed0c9..f2cafca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,17 @@ FROM scratch AS base -FROM base AS build-arm64 -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble +ENV VSCODE_LINK="" +ENV XPIPE_ARTIFACT="" FROM base AS build-amd64 FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble +ENV VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" +ENV XPIPE_ARTIFACT="xpipe-installer-linux-x86_64.deb" + +FROM base AS build-arm64 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble +ENV VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64" +ENV XPIPE_ARTIFACT="xpipe-installer-linux-arm64.deb" ARG DEBIAN_FRONTEND="noninteractive" @@ -54,7 +61,7 @@ RUN echo "**** install packages ****" && \ /tmp/* RUN echo "**** VsCode ****" && \ - wget -O vscode.deb "https://go.microsoft.com/fwlink/?LinkID=760868" && \ + wget -O vscode.deb "${VSCODE_LINK}" && \ DEBIAN_FRONTEND=noninteractive \ apt-get update && \ apt-get install --no-install-recommends -y "./vscode.deb" && \ @@ -74,11 +81,11 @@ RUN \ https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.png RUN echo "**** XPipe ****" && \ - wget "https://github.com/$XPIPE_REPOSITORY/releases/download/$XPIPE_VERSION/xpipe-installer-linux-x86_64.deb" && \ + wget "https://github.com/$XPIPE_REPOSITORY/releases/download/$XPIPE_VERSION/${XPIPE_ARTIFACT}" && \ DEBIAN_FRONTEND=noninteractive \ apt-get update && \ - apt-get install --no-install-recommends -y "./xpipe-installer-linux-x86_64.deb" && \ - rm "./xpipe-installer-linux-x86_64.deb" + apt-get install --no-install-recommends -y "./${XPIPE_ARTIFACT}" && \ + rm "./${XPIPE_ARTIFACT}" RUN mkdir -p "/config/.config/kdedefaults/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/config/.config/kdedefaults/autostart/$XPIPE_PACKAGE.desktop"