|
|
@@ -2,25 +2,38 @@
|
|
|
|
|
|
trap "echo TRAPed signal" HUP INT QUIT KILL TERM
|
|
|
|
|
|
+# Make user directory owned by the user in case it is not
|
|
|
sudo chown user:user /home/user
|
|
|
+# Change operating system password to environment variable
|
|
|
echo "user:$PASSWD" | sudo chpasswd
|
|
|
-sudo rm -rf /tmp/.X*
|
|
|
+# Remove directories to make sure the desktop environment starts
|
|
|
+sudo rm -rf /tmp/.X* ~/.cache ~/.config/xfce4
|
|
|
+# Change time zone from environment variable
|
|
|
sudo ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" | sudo tee /etc/timezone > /dev/null
|
|
|
+# Add LibreOffice to library path
|
|
|
export LD_LIBRARY_PATH="/usr/lib/libreoffice/program:${LD_LIBRARY_PATH}"
|
|
|
|
|
|
+# This symbolic link enables running Xorg inside a container with `-sharevts`
|
|
|
sudo ln -snf /dev/ptmx /dev/tty7
|
|
|
+# Start DBus without systemd
|
|
|
sudo /etc/init.d/dbus start
|
|
|
+# Configure environment for selkies-gstreamer utilities
|
|
|
source /opt/gstreamer/gst-env
|
|
|
|
|
|
-# Install NVIDIA drivers including X graphic drivers
|
|
|
+# Install NVIDIA userspace driver components including X graphic libraries
|
|
|
if ! command -v nvidia-xconfig &> /dev/null; then
|
|
|
+ # Driver version is provided by the kernel through the container toolkit
|
|
|
export DRIVER_VERSION=$(head -n1 </proc/driver/nvidia/version | awk '{print $8}')
|
|
|
cd /tmp
|
|
|
+ # If version is different, new installer will overwrite the existing components
|
|
|
if [ ! -f "/tmp/NVIDIA-Linux-x86_64-$DRIVER_VERSION.run" ]; then
|
|
|
+ # Check multiple sources in order to probe both consumer and datacenter driver versions
|
|
|
curl -fsL -O "https://us.download.nvidia.com/XFree86/Linux-x86_64/$DRIVER_VERSION/NVIDIA-Linux-x86_64-$DRIVER_VERSION.run" || curl -fsL -O "https://us.download.nvidia.com/tesla/$DRIVER_VERSION/NVIDIA-Linux-x86_64-$DRIVER_VERSION.run" || { echo "Failed NVIDIA GPU driver download. Exiting."; exit 1; }
|
|
|
fi
|
|
|
+ # Extract installer before installing
|
|
|
sudo sh "NVIDIA-Linux-x86_64-$DRIVER_VERSION.run" -x
|
|
|
cd "NVIDIA-Linux-x86_64-$DRIVER_VERSION"
|
|
|
+ # Run installation without the kernel modules and host components
|
|
|
sudo ./nvidia-installer --silent \
|
|
|
--no-kernel-module \
|
|
|
--install-compat32-libs \
|
|
|
@@ -32,18 +45,25 @@ if ! command -v nvidia-xconfig &> /dev/null; then
|
|
|
sudo rm -rf /tmp/NVIDIA* && cd ~
|
|
|
fi
|
|
|
|
|
|
+# Allow starting Xorg from a pseudoterminal instead of strictly on a tty console
|
|
|
+if [ ! -f /etc/X11/Xwrapper.config ]; then
|
|
|
+ echo -e "allowed_users=anybody\nneeds_root_rights=yes" | sudo tee /etc/X11/Xwrapper.config > /dev/null
|
|
|
+fi
|
|
|
if grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then
|
|
|
sudo sed -i "s/allowed_users=console/allowed_users=anybody/;$ a needs_root_rights=yes" /etc/X11/Xwrapper.config
|
|
|
fi
|
|
|
|
|
|
+# Remove existing Xorg configuration
|
|
|
if [ -f "/etc/X11/xorg.conf" ]; then
|
|
|
sudo rm -f "/etc/X11/xorg.conf"
|
|
|
fi
|
|
|
|
|
|
+# Get first GPU device if all devices are available or `NVIDIA_VISIBLE_DEVICES` is not set
|
|
|
if [ "$NVIDIA_VISIBLE_DEVICES" == "all" ]; then
|
|
|
export GPU_SELECT=$(sudo nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)
|
|
|
elif [ -z "$NVIDIA_VISIBLE_DEVICES" ]; then
|
|
|
export GPU_SELECT=$(sudo nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)
|
|
|
+# Get first GPU device out of the visible devices in other situations
|
|
|
else
|
|
|
export GPU_SELECT=$(sudo nvidia-smi --id=$(echo "$NVIDIA_VISIBLE_DEVICES" | cut -d ',' -f1) --query-gpu=uuid --format=csv | sed -n 2p)
|
|
|
if [ -z "$GPU_SELECT" ]; then
|
|
|
@@ -56,24 +76,37 @@ if [ -z "$GPU_SELECT" ]; then
|
|
|
exit 1
|
|
|
fi
|
|
|
|
|
|
+# Setting `VIDEO_PORT` to none disables RANDR/XRANDR, do not set this if using datacenter GPUs
|
|
|
if [ "${VIDEO_PORT,,}" = "none" ]; then
|
|
|
export CONNECTED_MONITOR="--use-display-device=None"
|
|
|
+# The X server is otherwise deliberately set to a specific video port despite not being plugged to enable RANDR/XRANDR, monitor will display the screen if plugged to the specific port
|
|
|
else
|
|
|
export CONNECTED_MONITOR="--connected-monitor=${VIDEO_PORT}"
|
|
|
fi
|
|
|
|
|
|
+# Bus ID from nvidia-smi is in hexadecimal format, should be converted to decimal format which Xorg understands, required because nvidia-xconfig doesn't work as intended in a container
|
|
|
HEX_ID=$(sudo nvidia-smi --query-gpu=pci.bus_id --id="$GPU_SELECT" --format=csv | sed -n 2p)
|
|
|
IFS=":." ARR_ID=($HEX_ID)
|
|
|
unset IFS
|
|
|
BUS_ID=PCI:$((16#${ARR_ID[1]})):$((16#${ARR_ID[2]})):$((16#${ARR_ID[3]}))
|
|
|
+# A custom modeline should be generated because there is no monitor to fetch this information normally
|
|
|
export MODELINE=$(cvt -r "${SIZEW}" "${SIZEH}" "${REFRESH}" | sed -n 2p)
|
|
|
+# Generate /etc/X11/xorg.conf with nvidia-xconfig
|
|
|
sudo nvidia-xconfig --virtual="${SIZEW}x${SIZEH}" --depth="$CDEPTH" --mode=$(echo "$MODELINE" | awk '{print $2}' | tr -d '"') --allow-empty-initial-configuration --no-probe-all-gpus --busid="$BUS_ID" --no-multigpu --no-sli --no-base-mosaic --only-one-x-screen ${CONNECTED_MONITOR}
|
|
|
+# Guarantee that the X server starts without a monitor by adding more options to the configuration
|
|
|
sudo sed -i '/Driver\s\+"nvidia"/a\ Option "ModeValidation" "NoMaxPClkCheck, NoEdidMaxPClkCheck, NoMaxSizeCheck, NoHorizSyncCheck, NoVertRefreshCheck, NoVirtualSizeCheck, NoExtendedGpuCapabilitiesCheck, NoTotalSizeCheck, NoDualLinkDVICheck, NoDisplayPortBandwidthCheck, AllowNon3DVisionModes, AllowNonHDMI3DModes, AllowNonEdidModes, NoEdidHDMI2Check, AllowDpInterlaced"\n Option "HardDPMS" "False"' /etc/X11/xorg.conf
|
|
|
+# Add custom generated modeline to the configuration
|
|
|
sudo sed -i '/Section\s\+"Monitor"/a\ '"$MODELINE" /etc/X11/xorg.conf
|
|
|
+# Prevent interference between GPUs, add this to the host or other containers running Xorg as well
|
|
|
+echo -e "Section \"ServerFlags\"\n Option \"AutoAddGPU\" \"false\"\nEndSection" | sudo tee -a /etc/X11/xorg.conf > /dev/null
|
|
|
|
|
|
+# Default display is :0 across the container
|
|
|
export DISPLAY=":0"
|
|
|
+# Disable VSYNC in OpenGL by default, change this to "1" to enable
|
|
|
export __GL_SYNC_TO_VBLANK="0"
|
|
|
+# Prioritize NVIDIA Vulkan driver if multiple GPU vendors exist
|
|
|
export __NV_PRIME_RENDER_OFFLOAD="1"
|
|
|
+# Run Xorg server with required extensions
|
|
|
Xorg vt7 -noreset -novtswitch -sharevts -dpi "${DPI}" +extension "GLX" +extension "RANDR" +extension "RENDER" +extension "MIT-SHM" "${DISPLAY}" &
|
|
|
|
|
|
# Wait for X11 to start
|
|
|
@@ -81,16 +114,19 @@ echo "Waiting for X socket"
|
|
|
until [ -S "/tmp/.X11-unix/X${DISPLAY/:/}" ]; do sleep 1; done
|
|
|
echo "X socket is ready"
|
|
|
|
|
|
+# Run the x11vnc + noVNC fallback web interface if enabled
|
|
|
if [ "${NOVNC_ENABLE,,}" = "true" ]; then
|
|
|
if [ -n "$NOVNC_VIEWPASS" ]; then export NOVNC_VIEWONLY="-viewpasswd ${NOVNC_VIEWPASS}"; else unset NOVNC_VIEWONLY; fi
|
|
|
x11vnc -display "${DISPLAY}" -passwd "${BASIC_AUTH_PASSWORD:-$PASSWD}" -shared -forever -repeat -xkb -snapfb -threads -xrandr "resize" -rfbport 5900 ${NOVNC_VIEWONLY} &
|
|
|
/opt/noVNC/utils/novnc_proxy --vnc localhost:5900 --listen 8080 --heartbeat 10 &
|
|
|
fi
|
|
|
|
|
|
-# Add custom processes below this section, or within `supervisord.conf` to perform service management like systemd
|
|
|
+# Start Xfce4 desktop environment
|
|
|
xfce4-session &
|
|
|
|
|
|
-# Fix selkies-gstreamer keyboard mapping
|
|
|
+# Add custom processes here, or within `supervisord.conf` to perform service management similar to systemd
|
|
|
+
|
|
|
+# Fix selkies-gstreamer keyboard mapping, remove if selkies-gstreamer issue #6 is fixed and in release
|
|
|
if [ "${NOVNC_ENABLE,,}" != "true" ]; then
|
|
|
sudo xmodmap -e "keycode 94 shift = less less"
|
|
|
fi
|
ehfd