mirror of
https://github.com/nestriness/nestri.git
synced 2025-12-12 08:45:38 +02:00
590fe5e196
## Description Works in apptainer now.. podman is still the goat since apptainer needs docker treatment and even more.. - Added container detection so podman can be used to it's fullest, the non-sane ones are handled separately.. - Added video bit-depth option, cuz AV1 and 10-bit encoding go well together. - Some other package updates to nestri-server. - General tidying up of scripts to make multi-container-engine handling less of a pain. - Updated old wireplumber lua script to new json format. Further changes: - Removed unused debug arg from nestri-server. - Moved configs to config file folder rather than keeping them in containerfile. - Improved audio configs, moved some into wireplumber to keep things tidy. - Bit better arg handling in nestri-server. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Optional 10‑bit video support and auto‑launch of an app after display setup. * **Changes** * Standardized runtime/user env to NESTRI_* with updated home/cache paths and explicit LANG; password generation now logged. * Improved container/GPU detection and startup logging; reduced blanket root usage during startup; SSH setup surfaced. * WirePlumber/PipeWire moved to JSON configs; low‑latency clock and loopback audio policies added; audio capture defaults to PipeWire. * **Chores** * GStreamer/libp2p dependency upgrades and Rust toolchain pinned; NVIDIA driver capability exposed. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>
205 lines
7.9 KiB
Docker
205 lines
7.9 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 --depth 1 --rev "dfeebb19b48f32207469e166a3955f5d65b5e6c6" https://github.com/games-on-whales/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
|
|
|
|
### 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 \
|
|
vulkan-radeon lib32-vulkan-radeon \
|
|
mesa steam-native-runtime proton-cachyos lib32-mesa \
|
|
steam gtk3 lib32-gtk3 \
|
|
sudo xorg-xwayland seatd libinput gamescope mangohud wlr-randr \
|
|
libssh2 curl wget \
|
|
pipewire pipewire-pulse pipewire-alsa wireplumber \
|
|
noto-fonts-cjk supervisor jq chwd lshw pacman-contrib \
|
|
hwdata openssh \
|
|
# GStreamer stack
|
|
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
|
|
lib32-gstreamer lib32-gst-plugins-base lib32-gst-plugins-good && \
|
|
# Cleanup
|
|
paccache -rk1 && \
|
|
rm -rf /usr/share/{info,man,doc}/*
|
|
|
|
### User Configuration ###
|
|
ARG NESTRI_USER_PWD=""
|
|
ENV NESTRI_USER="nestri" \
|
|
NESTRI_UID=1000 \
|
|
NESTRI_GID=1000 \
|
|
NESTRI_LANG=en_US.UTF-8 \
|
|
NESTRI_XDG_RUNTIME_DIR=/run/user/1000 \
|
|
NESTRI_HOME=/home/nestri \
|
|
NVIDIA_DRIVER_CAPABILITIES=all
|
|
|
|
RUN mkdir -p "/home/${NESTRI_USER}" && \
|
|
groupadd -g "${NESTRI_GID}" "${NESTRI_USER}" && \
|
|
useradd -d "/home/${NESTRI_USER}" -u "${NESTRI_UID}" -g "${NESTRI_GID}" -s /bin/bash "${NESTRI_USER}" && \
|
|
echo "${NESTRI_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
|
|
NESTRI_USER_PWD="${NESTRI_USER_PWD:-$(openssl rand -base64 12)}" && \
|
|
echo "Setting password for ${NESTRI_USER} as: ${NESTRI_USER_PWD}" && \
|
|
echo "${NESTRI_USER}:${NESTRI_USER_PWD}" | chpasswd && \
|
|
mkdir -p "${NESTRI_XDG_RUNTIME_DIR}" && \
|
|
chown "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_XDG_RUNTIME_DIR}" && \
|
|
usermod -aG input,video,render,seat "${NESTRI_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
|
|
|
|
### Audio Systems Configs - Latency optimizations + Loopback ###
|
|
RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
|
|
mkdir -p /etc/wireplumber/wireplumber.conf.d
|
|
|
|
COPY packages/configs/wireplumber.conf.d/* /etc/wireplumber/wireplumber.conf.d/
|
|
COPY packages/configs/pipewire.conf.d/* /etc/pipewire/pipewire.conf.d/
|
|
|
|
## Steam Configs - Proton (CachyOS flavor) ##
|
|
RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
|
|
|
|
COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
|
|
|
|
### 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} && \
|
|
chown -R "${NESTRI_USER}:${NESTRI_USER}" "${NESTRI_HOME}" && \
|
|
sed -i 's/^#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && \
|
|
LANG=en_US.UTF-8 locale-gen
|
|
|
|
# Root for most container engines, nestri-user compatible for apptainer without fakeroot
|
|
USER root
|
|
ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]
|