mirror of
https://github.com/nestriness/nestri.git
synced 2025-12-11 08:15:38 +02:00
9a6826b069
## Description - Improves latency for runner - Fixes bugs in entrypoint bash scripts - Package updates, gstreamer 1.26 and workaround for it Modified runner workflow to hopefully pull latest cachyos base image on nightlies. This will cause a full build but for nightlies should be fine? Also removed the duplicate key-down workaround as we've enabled ordered datachannels now. Increased retransmit to 2 from 0 to see if it'll help with some network issues. Marked as draft as I need to do bug testing still, I'll do it after fever calms down 😅 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced deployment workflows with optimized container image management. - Improved audio and video processing for lower latency and better synchronization. - Consolidated debugging options to ease command-line monitoring. - **Refactor** - Streamlined internal script flow and process handling for smoother performance. - Updated dependency management and communication protocols to boost overall stability. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>
227 lines
8.5 KiB
Docker
227 lines
8.5 KiB
Docker
# Container build arguments #
|
|
ARG BASE_IMAGE=docker.io/cachyos/cachyos:latest
|
|
|
|
#******************************************************************************
|
|
# Base Stage - Updates system packages
|
|
#******************************************************************************
|
|
FROM ${BASE_IMAGE} AS base
|
|
|
|
RUN --mount=type=cache,target=/var/cache/pacman/pkg \
|
|
pacman --noconfirm -Syu
|
|
|
|
#******************************************************************************
|
|
# Base Builder Stage - Prepares core build environment
|
|
#******************************************************************************
|
|
FROM base AS base-builder
|
|
|
|
# Environment setup for Rust and Cargo
|
|
ENV CARGO_HOME=/usr/local/cargo \
|
|
ARTIFACTS=/artifacts \
|
|
PATH="${CARGO_HOME}/bin:${PATH}" \
|
|
RUSTFLAGS="-C link-arg=-fuse-ld=mold"
|
|
|
|
# Install build essentials and caching tools
|
|
RUN --mount=type=cache,target=/var/cache/pacman/pkg \
|
|
pacman -Sy --noconfirm mold rustup && \
|
|
mkdir -p "${ARTIFACTS}"
|
|
|
|
# Install latest Rust using rustup
|
|
RUN rustup default stable
|
|
|
|
# Install cargo-chef with proper caching
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
cargo install -j $(nproc) cargo-chef cargo-c --locked
|
|
|
|
#******************************************************************************
|
|
# Nestri Server Build Stages
|
|
#******************************************************************************
|
|
FROM base-builder AS nestri-server-deps
|
|
WORKDIR /builder
|
|
|
|
# Install build dependencies
|
|
RUN --mount=type=cache,target=/var/cache/pacman/pkg \
|
|
pacman -Sy --noconfirm meson pkgconf cmake git gcc make \
|
|
gstreamer gst-plugins-base gst-plugins-good gst-plugin-rswebrtc
|
|
|
|
#--------------------------------------------------------------------
|
|
FROM nestri-server-deps AS nestri-server-planner
|
|
WORKDIR /builder/nestri
|
|
|
|
COPY packages/server/Cargo.toml packages/server/Cargo.lock ./
|
|
|
|
# Prepare recipe for dependency caching
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
cargo chef prepare --recipe-path recipe.json
|
|
|
|
#--------------------------------------------------------------------
|
|
FROM nestri-server-deps AS nestri-server-cached-builder
|
|
WORKDIR /builder/nestri
|
|
|
|
COPY --from=nestri-server-planner /builder/nestri/recipe.json .
|
|
|
|
# Cache dependencies using cargo-chef
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
cargo chef cook --release --recipe-path recipe.json
|
|
|
|
|
|
ENV CARGO_TARGET_DIR=/builder/target
|
|
|
|
COPY packages/server/ ./
|
|
|
|
# Build and install directly to artifacts
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
--mount=type=cache,target=/builder/target \
|
|
cargo build --release && \
|
|
cp "${CARGO_TARGET_DIR}/release/nestri-server" "${ARTIFACTS}"
|
|
|
|
#******************************************************************************
|
|
# GST-Wayland Plugin Build Stages
|
|
#******************************************************************************
|
|
FROM base-builder AS gst-wayland-deps
|
|
WORKDIR /builder
|
|
|
|
# Install build dependencies
|
|
RUN --mount=type=cache,target=/var/cache/pacman/pkg \
|
|
pacman -Sy --noconfirm meson pkgconf cmake git gcc make \
|
|
libxkbcommon wayland gstreamer gst-plugins-base gst-plugins-good libinput
|
|
|
|
# Clone repository
|
|
RUN git clone -b dev-dmabuf https://github.com/DatCaptainHorse/gst-wayland-display.git
|
|
|
|
#--------------------------------------------------------------------
|
|
FROM gst-wayland-deps AS gst-wayland-planner
|
|
WORKDIR /builder/gst-wayland-display
|
|
|
|
# Prepare recipe for dependency caching
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
cargo chef prepare --recipe-path recipe.json
|
|
|
|
#--------------------------------------------------------------------
|
|
FROM gst-wayland-deps AS gst-wayland-cached-builder
|
|
WORKDIR /builder/gst-wayland-display
|
|
|
|
COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
|
|
|
|
# Cache dependencies using cargo-chef
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
cargo chef cook --release --recipe-path recipe.json
|
|
|
|
|
|
ENV CARGO_TARGET_DIR=/builder/target
|
|
|
|
COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
|
|
|
|
# Build and install directly to artifacts
|
|
RUN --mount=type=cache,target=${CARGO_HOME}/registry \
|
|
--mount=type=cache,target=/builder/target \
|
|
cargo cinstall --prefix=${ARTIFACTS} --release
|
|
|
|
#******************************************************************************
|
|
# Final Runtime Stage
|
|
#******************************************************************************
|
|
FROM base AS runtime
|
|
|
|
### System Configuration ###
|
|
RUN sed -i \
|
|
-e '/#\[multilib\]/,/#Include = \/etc\/pacman.d\/mirrorlist/ s/#//' \
|
|
-e "s/#Color/Color/" /etc/pacman.conf && \
|
|
pacman --noconfirm -Sy archlinux-keyring && \
|
|
dirmngr </dev/null > /dev/null 2>&1
|
|
|
|
### Package Installation ###
|
|
# Core system components
|
|
RUN --mount=type=cache,target=/var/cache/pacman/pkg \
|
|
pacman -Sy --needed --noconfirm \
|
|
vulkan-intel lib32-vulkan-intel vpl-gpu-rt mesa \
|
|
steam steam-native-runtime gtk3 lib32-gtk3 \
|
|
sudo xorg-xwayland seatd libinput labwc wlr-randr gamescope mangohud \
|
|
libssh2 curl wget \
|
|
pipewire pipewire-pulse pipewire-alsa wireplumber \
|
|
noto-fonts-cjk supervisor jq chwd lshw pacman-contrib && \
|
|
# GStreamer stack
|
|
pacman -Sy --needed --noconfirm \
|
|
gstreamer gst-plugins-base gst-plugins-good \
|
|
gst-plugins-bad gst-plugin-pipewire \
|
|
gst-plugin-webrtchttp gst-plugin-rswebrtc gst-plugin-rsrtp \
|
|
gst-plugin-va gst-plugin-qsv && \
|
|
# lib32 GStreamer stack to fix some games with videos
|
|
pacman -Sy --needed --noconfirm \
|
|
lib32-gstreamer lib32-gst-plugins-base lib32-gst-plugins-good && \
|
|
# Cleanup
|
|
paccache -rk1 && \
|
|
rm -rf /usr/share/{info,man,doc}/*
|
|
|
|
### Application Installation ###
|
|
ARG LUDUSAVI_VERSION="0.28.0"
|
|
RUN curl -fsSL -o ludusavi.tar.gz \
|
|
"https://github.com/mtkennerly/ludusavi/releases/download/v${LUDUSAVI_VERSION}/ludusavi-v${LUDUSAVI_VERSION}-linux.tar.gz" && \
|
|
tar -xzvf ludusavi.tar.gz && \
|
|
mv ludusavi /usr/bin/ && \
|
|
rm ludusavi.tar.gz
|
|
|
|
### User Configuration ###
|
|
ENV USER="nestri" \
|
|
UID=1000 \
|
|
GID=1000 \
|
|
USER_PWD="nestri1234" \
|
|
XDG_RUNTIME_DIR=/run/user/1000 \
|
|
HOME=/home/nestri \
|
|
NVIDIA_DRIVER_CAPABILITIES=all \
|
|
NVIDIA_VISIBLE_DEVICES=all
|
|
|
|
RUN mkdir -p /home/${USER} && \
|
|
groupadd -g ${GID} ${USER} && \
|
|
useradd -d /home/${USER} -u ${UID} -g ${GID} -s /bin/bash ${USER} && \
|
|
chown -R ${USER}:${USER} /home/${USER} && \
|
|
echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
|
|
echo "${USER}:${USER_PWD}" | chpasswd && \
|
|
mkdir -p /run/user/${UID} && \
|
|
chown ${USER}:${USER} /run/user/${UID} && \
|
|
usermod -aG input,video,render,seat root && \
|
|
usermod -aG input,video,render,seat ${USER}
|
|
|
|
### System Services Configuration ###
|
|
RUN mkdir -p /run/dbus && \
|
|
# Wireplumber suspend disable
|
|
sed -i -z \
|
|
-e 's/{[[:space:]]*name = node\/suspend-node\.lua,[[:space:]]*type = script\/lua[[:space:]]*provides = hooks\.node\.suspend[[:space:]]*}[[:space:]]*//g' \
|
|
-e '/wants = \[/{s/hooks\.node\.suspend\s*//; s/,\s*\]/]/}' \
|
|
/usr/share/wireplumber/wireplumber.conf
|
|
|
|
### PipeWire Latency Optimizations (1-5ms instead of 20ms) ###
|
|
RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
|
|
echo "[audio]\
|
|
\n default.clock.rate = 48000\
|
|
\n default.clock.quantum = 128\
|
|
\n default.clock.min-quantum = 128\
|
|
\n default.clock.max-quantum = 256" > /etc/pipewire/pipewire.conf.d/low-latency.conf && \
|
|
mkdir -p /etc/wireplumber/main.lua.d && \
|
|
echo 'table.insert(default_nodes.rules, {\
|
|
\n matches = { { { "node.name", "matches", ".*" } } },\
|
|
\n apply_properties = {\
|
|
\n ["audio.format"] = "S16LE",\
|
|
\n ["audio.rate"] = 48000,\
|
|
\n ["audio.channels"] = 2,\
|
|
\n ["api.alsa.period-size"] = 128,\
|
|
\n ["api.alsa.headroom"] = 0,\
|
|
\n ["session.suspend-timeout-seconds"] = 0\
|
|
\n }\
|
|
\n})' > /etc/wireplumber/main.lua.d/50-low-latency.lua && \
|
|
echo "default-fragments = 2\
|
|
\ndefault-fragment-size-msec = 2" >> /etc/pulse/daemon.conf && \
|
|
echo "load-module module-loopback latency_msec=1" >> /etc/pipewire/pipewire.conf.d/loopback.conf
|
|
|
|
|
|
### Artifacts and Verification ###
|
|
COPY --from=nestri-server-cached-builder /artifacts/nestri-server /usr/bin/
|
|
COPY --from=gst-wayland-cached-builder /artifacts/lib/ /usr/lib/
|
|
COPY --from=gst-wayland-cached-builder /artifacts/include/ /usr/include/
|
|
RUN which nestri-server && ls -la /usr/lib/ | grep 'gstwaylanddisplay'
|
|
|
|
### Scripts and Final Configuration ###
|
|
COPY packages/scripts/ /etc/nestri/
|
|
RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \
|
|
locale-gen
|
|
|
|
ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]
|