NickBland/xpipe-selkies
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release]
Some checks failed
Docker Push / build-and-push-image (push) Failing after 5m41s
Details

Browse Source 
Remove sudo calls from dockerfile, adjust to ensure using amd64 platform for builds.
This commit is contained in:
NickBland
2026-01-09 09:44:36 +10:00
parent 4527704660
commit fc028854d0
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Dockerfile
View File

@@ -1,13 +1,15 @@
FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble AS build
ARG DEBIAN_FRONTEND="noninteractive"
ENV TITLE="XPipe Webtop"
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
ENV TITLE="XPipe Webtop"
# prevent Ubuntu's firefox stub from being installed
# COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
@@ -91,19 +93,24 @@ VOLUME /config
# "https://rawcdn.githack.com/xpipe-io/xpipe/a097ae7a41131fa358b5343345557ad00a45c309/dist/logo/logo.png"
RUN echo "**** Wezterm ****" && \
curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list && \
curl -fsSL https://apt.fury.io/wez/gpg.key | gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | tee /etc/apt/sources.list.d/wezterm.list && \
chmod 644 /usr/share/keyrings/wezterm-fury.gpg && \
apt-get update && \
apt-get install --no-install-recommends -y wezterm
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 \
apt-get update && \
apt-get install --no-install-recommends -y "./vscode.deb" && \
rm "./vscode.deb"
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}" && \
apt-get update && \
apt-get install --no-install-recommends -y ./vscode.deb && \
rm vscode.deb && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
RUN echo "**** install tool packages ****" && \
DEBIAN_FRONTEND=noninteractive \
@@ -125,47 +132,47 @@ RUN echo "**** install tool packages ****" && \
remmina-plugin-rdp && \
apt-get autoclean
RUN echo "**** tailscale ****" && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null && \
curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list && \
sudo apt-get update && \
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y tailscale
RUN echo "**** tailscale ****" && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null && \
curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/noble.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y tailscale
RUN echo "**** netbird ****" && \
sudo apt-get update && \
sudo apt-get install ca-certificates curl gnupg -y && \
curl -sSL https://pkgs.netbird.io/debian/public.key | sudo gpg --dearmor --output /usr/share/keyrings/netbird-archive-keyring.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' | sudo tee /etc/apt/sources.list.d/netbird.list && \
sudo apt-get update && \
sudo apt-get install netbird
apt-get update && \
apt-get install ca-certificates curl gnupg -y && \
curl -sSL https://pkgs.netbird.io/debian/public.key | gpg --dearmor --output /usr/share/keyrings/netbird-archive-keyring.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' | tee /etc/apt/sources.list.d/netbird.list && \
apt-get update && \
pt-get install netbird
RUN echo "**** teleport ****" && sudo curl https://apt.releases.teleport.dev/gpg -o /etc/apt/keyrings/teleport-archive-keyring.asc && \
RUN echo "**** teleport ****" && curl https://apt.releases.teleport.dev/gpg -o /etc/apt/keyrings/teleport-archive-keyring.asc && \
. /etc/os-release && \
echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v17" | sudo tee /etc/apt/sources.list.d/teleport.list > /dev/null && \
sudo apt-get update && \
DEBIAN_FRONTEND=noninteractive sudo apt-get -y install teleport
echo "deb [signed-by=/etc/apt/keyrings/teleport-archive-keyring.asc] https://apt.releases.teleport.dev/${ID?} ${VERSION_CODENAME?} stable/v17" | tee /etc/apt/sources.list.d/teleport.list > /dev/null && \
apt-get update && \
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 "${KUBECTL_LINK}" && \
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
rm kubectl
RUN echo "**** aws ****" && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" && \
unzip "/tmp/awscliv2.zip" -d "/tmp" && \
sudo "/tmp/aws/install" && \
"/tmp/aws/install" && \
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 "${SSM_LINK}" -o "/tmp/session-manager-plugin.deb" && \
sudo dpkg -i "/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 "${ZELLIJ_LINK}" && \
tar -xvf zellij*.tar.gz && \
sudo install -o root -g root -m 0755 zellij /usr/local/bin/zellij && \
install -o root -g root -m 0755 zellij /usr/local/bin/zellij && \
rm zellij && \
rm zellij*.tar.gz