From eb96104512d75b07a5e4f1ff248fcd1c74457d30 Mon Sep 17 00:00:00 2001 From: Christopher Schnick Date: Fri, 3 Jan 2025 09:05:24 +0100 Subject: [PATCH] Fix [release] --- .github/workflows/docker-push.yml | 2 +- Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 3944e7f..2bd4175 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -67,7 +67,7 @@ jobs: "XPIPE_VERSION=${{ env.XPIPE_VERSION }}" "XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}" "XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}" - platforms: linux/amd64,linux/arm64 + platforms: linux/arm64 - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 with: diff --git a/Dockerfile b/Dockerfile index 430105e..5e8c2ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ ENV TITLE="XPipe Webtop" ARG XPIPE_VERSION ARG XPIPE_REPOSITORY ARG XPIPE_PACKAGE +ARG TARGETPLATFORM # prevent Ubuntu's firefox stub from being installed COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap @@ -47,7 +48,7 @@ RUN echo "**** install packages ****" && \ /var/tmp/* \ /tmp/* -RUN echo "**** VsCode ****" && \ +RUN echo "**** VsCode **** ($TARGETPLATFORM)" && \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64"; else VSCODE_LINK="https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64"; fi && \ wget -O vscode.deb "${VSCODE_LINK}" && \ DEBIAN_FRONTEND=noninteractive \ @@ -68,7 +69,7 @@ RUN \ /kclient/public/icon.png \ https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.png -RUN echo "**** XPipe ****" && \ +RUN echo "**** XPipe **** ($TARGETPLATFORM)" && \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then XPIPE_ARTIFACT="xpipe-installer-linux-x86_64.deb"; else XPIPE_ARTIFACT="xpipe-installer-linux-arm64.deb"; fi && \ wget "https://github.com/$XPIPE_REPOSITORY/releases/download/$XPIPE_VERSION/${XPIPE_ARTIFACT}" && \ DEBIAN_FRONTEND=noninteractive \