Adjust CI/CD and Dockerfile

.github/workflows/docker-push.yml

@@ -74,4 +74,4 @@ jobs:
             XPIPE_VERSION=${{ env.XPIPE_VERSION }}
             XPIPE_REPOSITORY=${{ env.XPIPE_REPOSITORY }}
             XPIPE_PACKAGE=${{ env.XPIPE_PACKAGE }}
-          platforms: ${{ contains(github.event.head_commit.message, '[release]') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          platforms: linux/amd64

Dockerfile

@@ -2,11 +2,8 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ARG XPIPE_VERSION=20.2
 ARG XPIPE_REPOSITORY=xpipe-io/xpipe
 ARG XPIPE_PACKAGE=xpipe
-ARG TARGETPLATFORM=linux/amd64
-
-
-FROM --platform=$TARGETPLATFORM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble AS build
 
+FROM --platform=linux/amd64 ghcr.io/linuxserver/baseimage-selkies:ubuntunoble AS build
 
 ENV TITLE="XPipe Webtop"
 
@@ -100,12 +97,7 @@ RUN echo "**** Wezterm ****" && \
   apt-get install --no-install-recommends -y wezterm
 
 RUN echo "**** VsCode **** ($TARGETPLATFORM)" && \
-    if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+    wget -O vscode.deb "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" && \
-        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}" && \
     apt-get update && \
     apt-get install --no-install-recommends -y ./vscode.deb && \
     rm vscode.deb && \
@@ -152,8 +144,7 @@ RUN echo "**** teleport ****" && curl https://apt.releases.teleport.dev/gpg -o /
     DEBIAN_FRONTEND=noninteractive apt-get -y install teleport
 
 RUN echo "**** kubectl **** ($TARGETPLATFORM)" && \
-  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then KUBECTL_LINK="https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; else KUBECTL_LINK="https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl"; fi && \
+  curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
-  curl -LO "${KUBECTL_LINK}" && \
   install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
   rm kubectl
 
@@ -163,14 +154,12 @@ RUN echo "**** aws ****" && curl "https://awscli.amazonaws.com/awscli-exe-linux-
   rm -rf "/tmp/aws" "/tmp/awscliv2.zip"
 
 RUN echo "**** aws ssm **** ($TARGETPLATFORM)" && \
-  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then SSM_LINK="https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb"; else SSM_LINK="https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_arm64/session-manager-plugin.deb"; fi && \
+  curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" -o "/tmp/session-manager-plugin.deb" && \
-  curl "${SSM_LINK}" -o "/tmp/session-manager-plugin.deb" && \
   dpkg -i "/tmp/session-manager-plugin.deb" && \
   rm -rf "/tmp/aws" "/tmp/session-manager-plugin.deb"
 
 RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
-  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"; else ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-aarch64-unknown-linux-musl.tar.gz"; fi && \
+  curl -LO "https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz" && \
-  curl -LO "${ZELLIJ_LINK}" && \
   tar -xvf zellij*.tar.gz && \
   install -o root -g root -m 0755 zellij /usr/local/bin/zellij && \
   rm zellij && \
@@ -179,11 +168,10 @@ RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
 RUN echo "**** dolphin tweaks ****" && printf "x-scheme-handler/file=org.kde.dolphin.desktop\n" >> /usr/share/applications/kde-mimeapps.list
 
 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 \
   apt-get update && \
-  apt-get install --no-install-recommends -y "./${XPIPE_ARTIFACT}" && \
+  apt-get install --no-install-recommends -y ".xpipe-installer-linux-x86_64.deb" && \
   rm "./${XPIPE_ARTIFACT}"
 
 # RUN mkdir -p "/etc/xdg/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/etc/xdg/autostart/$XPIPE_PACKAGE.desktop"