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>
80 lines
2.5 KiB
Bash
80 lines
2.5 KiB
Bash
#!/bin/bash
|
|
set -euo pipefail
|
|
|
|
declare container_runtime="none"
|
|
declare -Ag container_info=()
|
|
|
|
function detect_container_runtime {
|
|
if [[ -n "${SINGULARITY_CONTAINER:-}" ]] || [[ -n "${APPTAINER_CONTAINER:-}" ]] || [[ -d "/.singularity.d" ]]; then
|
|
echo "apptainer"
|
|
elif [[ "${container:-}" == "podman" ]] || [[ -f "/run/.containerenv" ]]; then
|
|
echo "podman"
|
|
elif [[ -f "/.dockerenv" ]]; then
|
|
echo "docker"
|
|
else
|
|
# General check for containerization signs
|
|
if grep -qE "docker|lxc|kubepods|containerd" "/proc/1/cgroup" 2>/dev/null; then
|
|
echo "unknown"
|
|
else
|
|
echo "none"
|
|
fi
|
|
fi
|
|
}
|
|
|
|
function collect_container_info {
|
|
local runtime="$1"
|
|
case "$runtime" in
|
|
apptainer)
|
|
container_info["runtime"]="apptainer"
|
|
container_info["version"]="${SINGULARITY_VERSION:-${APPTAINER_VERSION:-unknown}}"
|
|
container_info["image"]="${SINGULARITY_CONTAINER:-${APPTAINER_CONTAINER:-unknown}}"
|
|
;;
|
|
podman)
|
|
container_info["runtime"]="podman"
|
|
if [[ -f "/run/.containerenv" ]]; then
|
|
if grep -q "name=" "/run/.containerenv" 2>/dev/null; then
|
|
container_info["name"]=$(grep "^name=" "/run/.containerenv" | sed 's/^name=//' | tr -d '"' | xargs)
|
|
fi
|
|
if grep -q "image=" "/run/.containerenv" 2>/dev/null; then
|
|
container_info["image"]=$(grep "^image=" "/run/.containerenv" | sed 's/^image=//' | tr -d '"' | xargs)
|
|
fi
|
|
fi
|
|
;;
|
|
docker)
|
|
container_info["runtime"]="docker"
|
|
container_info["detected_via"]="dockerenv"
|
|
;;
|
|
unknown)
|
|
container_info["runtime"]="unknown"
|
|
container_info["detected_via"]="cgroup_generic"
|
|
;;
|
|
esac
|
|
}
|
|
|
|
function get_container_info {
|
|
container_runtime=$(detect_container_runtime)
|
|
if [[ "${container_runtime}" != "none" ]]; then
|
|
collect_container_info "$container_runtime"
|
|
fi
|
|
}
|
|
|
|
function debug_container_info {
|
|
echo "Container Detection Results:"
|
|
echo "> Runtime: $container_runtime"
|
|
|
|
if [[ "$container_runtime" != "none" ]]; then
|
|
for key in "${!container_info[@]}"; do
|
|
echo ">> $key: ${container_info[$key]}"
|
|
done
|
|
else
|
|
echo "> Status: Not running in a known container"
|
|
fi
|
|
}
|
|
|
|
# # Usage examples:
|
|
# get_container_info
|
|
# debug_container_info
|
|
|
|
# # Get runtime
|
|
# echo "Container runtime: ${container_runtime}"
|