maxscout/docker-steam-headless
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Arch build with latest changes

Browse Source
This commit is contained in:
Josh.5
2023-07-09 20:23:42 +12:00
committed by Josh Sunnex
parent 0b600108f7
commit 42ebc826b8
10 changed files with 213 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Dockerfile
View File

@@ -53,6 +53,27 @@ RUN \
&& \ && \
echo echo
# Configure default user and set env
ENV \
PUID=99 \
PGID=100 \
UMASK=000 \
USER="default" \
USER_PASSWORD="password" \
USER_HOME="/home/default" \
TZ="Pacific/Auckland" \
USER_LOCALES="en_US.UTF-8 UTF-8"
RUN \
echo "**** Configure default user '${USER}' ****" \
&& mkdir -p \
${USER_HOME} \
&& useradd -d ${USER_HOME} -s /bin/bash ${USER} \
&& chown -R ${USER} \
${USER_HOME} \
&& echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
&& \
echo
# Install core packages # Install core packages
RUN \ RUN \
echo "**** Update apt database ****" \ echo "**** Update apt database ****" \
@@ -251,9 +272,10 @@ RUN \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar-settings.desktop \ && sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar-settings.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar.desktop \ && sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/pavucontrol.desktop \ && sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/pavucontrol.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/debian-uxterm.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/debian-xterm.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/x11vnc.desktop \ && sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/x11vnc.desktop \
# These are named specifically for Debain
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/debian-xterm.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/debian-uxterm.desktop \
# Force these apps to be "System" Apps rather than "Categories=System;Utility;Core;GTK;Filesystem;" # Force these apps to be "System" Apps rather than "Categories=System;Utility;Core;GTK;Filesystem;"
&& sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/xfce4-appfinder.desktop \ && sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/xfce4-appfinder.desktop \
&& sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/thunar-bulk-rename.desktop \ && sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/thunar-bulk-rename.desktop \
@@ -474,28 +496,6 @@ RUN \
&& \ && \
echo echo
# Configure default user and set env
ENV \
PUID=99 \
PGID=100 \
UMASK=000 \
USER="default" \
USER_PASSWORD="password" \
USER_HOME="/home/default" \
TZ="Pacific/Auckland" \
USER_LOCALES="en_US.UTF-8 UTF-8"
RUN \
echo "**** Configure default user '${USER}' ****" \
&& mkdir -p \
${USER_HOME} \
&& useradd -d ${USER_HOME} -s /bin/bash ${USER} \
&& chown -R ${USER} \
${USER_HOME} \
&& echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
&& \
echo
# Add FS overlay # Add FS overlay
COPY overlay / COPY overlay /

322
Dockerfile.arch
View File

@@ -37,19 +37,51 @@ RUN \
&& \ && \
echo echo
# Configure default user and set env
ENV \
PUID=99 \
PGID=100 \
UMASK=000 \
USER="default" \
USER_PASSWORD="password" \
USER_HOME="/home/default" \
TZ="Pacific/Auckland" \
USER_LOCALES="en_US.UTF-8 UTF-8"
RUN \
echo "**** Configure default user '${USER}' ****" \
&& mkdir -p \
${USER_HOME} \
&& useradd -d ${USER_HOME} -s /bin/bash ${USER} \
&& chown -R ${USER} \
${USER_HOME} \
&& usermod -aG video,audio,input ${USER} \
&& echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
&& \
echo
# Install core packages # Install core packages
RUN \ RUN \
echo "**** Install tools ****" \ echo "**** Install tools ****" \
&& pacman -Syu --noconfirm --needed \ && pacman -Syu --noconfirm --needed \
base-devel \
bash \ bash \
bash-completion \ bash-completion \
curl \ curl \
docbook-xml \
docbook-xsl \
fakeroot \
git \ git \
jq \
less \ less \
locate \
man-db \ man-db \
nano \ nano \
net-tools \ net-tools \
pciutils \
pkg-config \ pkg-config \
procps \
psmisc \
psutils \
rsync \ rsync \
screen \ screen \
sudo \ sudo \
@@ -65,8 +97,13 @@ RUN \
python-pip \ python-pip \
python-setuptools \ python-setuptools \
&& \ && \
echo "**** Install Yay ****" \
&& su - default -c 'git clone https://aur.archlinux.org/yay.git /tmp/yay && cd /tmp/yay && makepkg --noconfirm --syncdeps --install' \
&& \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \ && pacman -Scc --noconfirm \
&& rm -rf \
/tmp/yay* \
&& \ && \
echo echo
@@ -111,8 +148,6 @@ RUN \
echo echo
# Install X Server requirements # Install X Server requirements
# TODO: Remove doubles
# TODO: Things that are not required
RUN \ RUN \
echo "**** Install X Server requirements ****" \ echo "**** Install X Server requirements ****" \
&& pacman -Syu --noconfirm --needed \ && pacman -Syu --noconfirm --needed \
@@ -145,19 +180,6 @@ RUN \
&& \ && \
echo echo
# pacman -Syu --noconfirm --needed \
# xorg-server \
# xorg-server-xephyr \
# xorg-xwininfo \
# xorg-xhost \
# xorg-xinit \
# xorg-xinput \
# xorg-xrandr \
# xorg-xprop \
# xorg-xkill \
# xorg-xbacklight \
# xorg-xsetroot
# s
# pacman -Syu --noconfirm --needed autorandr xdg-desktop-portal xdg-desktop-portal-gtk wmctrl xbindkeys xdotool xautolock # pacman -Syu --noconfirm --needed autorandr xdg-desktop-portal xdg-desktop-portal-gtk wmctrl xbindkeys xdotool xautolock
# #
# #
@@ -174,27 +196,89 @@ RUN \
RUN \ RUN \
echo "**** Install X Server requirements ****" \ echo "**** Install X Server requirements ****" \
&& pacman -Syu --noconfirm --needed \ && pacman -Syu --noconfirm --needed \
alsa-utils \
pavucontrol \
pulseaudio \ pulseaudio \
pulseaudio-alsa \
&& \ && \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \ && pacman -Scc --noconfirm \
&& \ && \
echo echo
# Install openssh server # Install desktop environment
# TODO: Install equivelent of 'msttcorefonts' and 'fonts-vlgothic'
RUN \ RUN \
echo "**** Install openssh server ****" \ echo "**** Install desktop environment ****" \
&& pacman -Syu --noconfirm --needed \ && pacman -Syu --noconfirm --needed \
openssh \ gedit \
&& echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config \ xfce4 \
xfce4-goodies \
xfce4-terminal \
xterm \
# Delete these as they are not needed at all
&& rm -f \
/usr/share/applications/software-properties-drivers.desktop \
/usr/share/applications/xfce4-about.desktop \
/usr/share/applications/xfce4-session-logout.desktop \
# Hide these apps. They can be displayed if a user really wants them.
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/xfce4-accessibility-settings.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/xfce4-color-settings.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/xfce4-mail-reader.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/vim.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar-settings.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/thunar.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/pavucontrol.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/x11vnc.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/xterm.desktop \
&& sed -i '/[Desktop Entry]/a\NoDisplay=true' /usr/share/applications/uxterm.desktop \
# Force these apps to be "System" Apps rather than "Categories=System;Utility;Core;GTK;Filesystem;"
&& sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/xfce4-appfinder.desktop \
&& sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/thunar-bulk-rename.desktop \
&& sed -i 's/^Categories=.*$/Categories=System;/' /usr/share/applications/org.gnome.gedit.desktop \
&& \ && \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \ && pacman -Scc --noconfirm \
&& \ && \
echo echo
# Add support for flatpaks
# Note: Debian Bullseye had bubblewrap v0.4.1 which worked fine in the Nvidia docker runtime
# At the moment this is only working beacuse /proc is being mounted again in 10-setup_user.sh
# Need to find a better solution for this...
ARG BUBBLEWRAP_VERSION=0.8.0
RUN \
echo "**** Install flatpak support ****" \
&& pacman -Syu --noconfirm --needed \
bridge-utils \
flatpak \
gnome-software \
lxc \
xdg-desktop-portal-gtk \
&& \
#echo "**** Build and install custom bubblewrap ****" \
# && cd /tmp \
# && wget -O /tmp/bubblewrap-${BUBBLEWRAP_VERSION:?}.tar.xz https://github.com/containers/bubblewrap/releases/download/v${BUBBLEWRAP_VERSION:?}/bubblewrap-${BUBBLEWRAP_VERSION:?}.tar.xz \
# && tar -xvf /tmp/bubblewrap-${BUBBLEWRAP_VERSION:?}.tar.xz \
# && cd /tmp/bubblewrap-${BUBBLEWRAP_VERSION:?} \
# && sed -i 's|die ("Unexpected capabilities but not setuid, old file caps config?");|printf ("Unexpected capabilities but not setuid, old file caps config?");|' ./bubblewrap.c \
# && ./autogen.sh \
# && make clean \
# && make \
# && make install
#&& \
echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \
&& \
echo
# TODO: Setup dind
# Ref:
# - https://github.com/docker-library/docker/blob/master/20.10/dind/Dockerfile
# - https://docs.nvidia.com/ai-enterprise/deployment-guide/dg-docker.html
# Install noVNC # Install noVNC
# TODO: Add nginx # TODO: Add nginx or remove the whole proxy setup and just connect directly for audio (I think that is the better option)
ARG NOVNC_VERSION=1.2.0 ARG NOVNC_VERSION=1.2.0
RUN \ RUN \
echo "**** Fetch noVNC ****" \ echo "**** Fetch noVNC ****" \
@@ -220,10 +304,17 @@ RUN \
&& sed -i '/ document.title =/c\ document.title = "Steam Headless - noVNC";' \ && sed -i '/ document.title =/c\ document.title = "Steam Headless - noVNC";' \
/opt/noVNC/app/ui.js \ /opt/noVNC/app/ui.js \
&& \ && \
echo "**** Install nginx support ****" \
&& pacman -Syu --noconfirm --needed \
nginx \
&& \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \
&& rm -rf \ && rm -rf \
/tmp/noVNC* \ /tmp/noVNC* \
/tmp/novnc.tar.gz /tmp/novnc.tar.gz \
&& \
echo
# Install Websockify # Install Websockify
ARG WEBSOCKETIFY_VERSION=0.10.0 ARG WEBSOCKETIFY_VERSION=0.10.0
@@ -247,175 +338,84 @@ RUN \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& rm -rf \ && rm -rf \
/tmp/websockify-* \ /tmp/websockify-* \
/tmp/websockify.tar.gz /tmp/websockify.tar.gz \
# Install firefox
# TODO: MOve under de
RUN \
echo "**** Install firefox ****" \
&& pacman -Syu --noconfirm --needed \
firefox \
&& \
echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \
&& \ && \
echo echo
# # Install Steam # Setup browser audio streaming deps
# RUN \
# echo "**** Install steam ****" \
# && pacman -Syu --noconfirm --needed \
# lib32-vulkan-icd-loader
# steam \
# vulkan-icd-loader \
# && \
# echo "**** Section cleanup ****" \
# && pacman -Scc --noconfirm \
# && \
# echo
# Install desktop environment
RUN \ RUN \
echo "**** Install desktop environment ****" \ echo "**** Install audio streaming deps ****" \
&& pacman -Syu --noconfirm --needed \ && pacman -Syu --noconfirm --needed \
gedit \ bzip2 \
xfce4 \ gst-libav \
xfce4-terminal \ gst-plugins-bad \
gst-plugins-base \
gst-plugins-good \
gst-plugins-ugly \
&& \
echo "**** Fetch ucspi-tcp ****" \
&& cd /tmp \
&& wget -O /tmp/ucspi-tcp.tar.gz http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz \
&& tar -xvf /tmp/ucspi-tcp.tar.gz \
&& \
echo "**** Build and install ucspi-tcp ****" \
&& cd /tmp/ucspi-tcp-0.88/ \
&& wget -O /tmp/ucspi-tcp-0.88/ucspi-tcp-0.88.errno.patch https://git.alpinelinux.org/aports/plain/testing/ucspi-tcp/ucspi-tcp-0.88.errno.patch \
&& wget -O /tmp/ucspi-tcp-0.88/ucspi-tcp-0.88.a_record.patch https://git.alpinelinux.org/aports/plain/testing/ucspi-tcp/ucspi-tcp-0.88.a_record.patch \
&& patch -p1 --input=ucspi-tcp-0.88.errno.patch \
&& patch -p1 --input=ucspi-tcp-0.88.a_record.patch \
&& sed -i 's|^/usr/local|/usr|' /tmp/ucspi-tcp-0.88/conf-home \
&& make \
&& for f in tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd; do \
cp $f /usr/bin/$f; \
done \
&& \ && \
echo "**** Section cleanup ****" \ echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \ && pacman -Scc --noconfirm \
&& rm -rf \
/tmp/ucspi-tcp-* \
&& \ && \
echo echo
# Add support for flatpaks
RUN \
echo "**** Install flatpak support ****" \
&& pacman -Syu --noconfirm --needed \
flatpak \
xdg-desktop-portal-gtk \
&& \
echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \
&& \
echo
# TODO Append to tools
RUN \
echo "**** Install flatpak support ****" \
&& pacman -Syu --noconfirm --needed \
patch \
&& \
echo "**** Section cleanup ****" \
&& pacman -Scc --noconfirm \
&& \
echo
# # Install desktop environment
# RUN \
# echo "**** Install desktop environment ****" \
# && pacman -Syu --noconfirm --needed \
# kde-system-meta \
# konsole \
# plasma-desktop \
# && \
# echo "**** Section cleanup ****" \
# && pacman -Scc --noconfirm \
# && \
# echo
# # Install desktop environment
# RUN \
# echo "**** Install desktop environment ****" \
# && pacman -Syu --noconfirm --needed \
# cinnamon \
# polkit-gnome \
# gnome-terminal \
# && \
# echo "**** Section cleanup ****" \
# && pacman -Scc --noconfirm \
# && \
# echo
# # Setup browser audio streaming deps
# RUN \
# echo "**** Update apt database ****" \
# && apt-get update \
# && \
# echo "**** Install audio streaming deps ****" \
# && apt-get install -y --no-install-recommends \
# bzip2 \
# gstreamer1.0-alsa \
# gstreamer1.0-gl \
# gstreamer1.0-gtk3 \
# gstreamer1.0-libav \
# gstreamer1.0-plugins-base \
# gstreamer1.0-plugins-good \
# gstreamer1.0-pulseaudio \
# gstreamer1.0-qt5 \
# gstreamer1.0-tools \
# gstreamer1.0-x \
# libgstreamer1.0-0 \
# libncursesw5 \
# libopenal1 \
# libsdl-image1.2 \
# libsdl-ttf2.0-0 \
# libsdl1.2debian \
# libsndfile1 \
# ucspi-tcp \
# && \
# echo "**** Section cleanup ****" \
# && apt-get clean autoclean -y \
# && apt-get autoremove -y \
# && rm -rf \
# /var/lib/apt/lists/* \
# /var/tmp/* \
# /tmp/* \
# && \
# echo
# Configure default user and set env
ENV \
USER="default" \
USER_PASSWORD="password" \
USER_HOME="/home/default" \
TZ="Pacific/Auckland" \
USER_LOCALES="en_US.UTF-8 UTF-8"
RUN \
echo "**** Configure default user '${USER}' ****" \
&& mkdir -p \
${USER_HOME} \
&& useradd -d ${USER_HOME} -s /bin/bash ${USER} \
&& chown -R ${USER} \
${USER_HOME} \
&& echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
# Add FS overlay # Add FS overlay
COPY overlay / COPY overlay /
# Set display environment variables # Set display environment variables
ENV \ ENV \
DISPLAY_CDEPTH="24" \ DISPLAY_CDEPTH="24" \
DISPLAY_REFRESH="60" \ DISPLAY_REFRESH="120" \
DISPLAY_SIZEH="900" \ DISPLAY_SIZEH="900" \
DISPLAY_SIZEW="1600" \ DISPLAY_SIZEW="1600" \
DISPLAY_VIDEO_PORT="DFP" \ DISPLAY_VIDEO_PORT="DFP" \
DISPLAY=":55" \ DISPLAY=":55"
ENV \
XORG_SOCKET_DIR="/tmp/.X11-unix" \
XDG_RUNTIME_DIR="/tmp/.X11-unix/run" \
XDG_DATA_DIRS="/home/default/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share/:/usr/share/"
ENV \
NVIDIA_DRIVER_CAPABILITIES="all" \ NVIDIA_DRIVER_CAPABILITIES="all" \
NVIDIA_VISIBLE_DEVICES="all" NVIDIA_VISIBLE_DEVICES="all"
# Set pulseaudio environment variables
ENV \
PULSE_SOCKET_DIR="/tmp/pulse" \
PULSE_SERVER="unix:/tmp/pulse/pulse-socket"
# Set container configuration environment variables # Set container configuration environment variables
ENV \ ENV \
MODE="primary" \ MODE="primary" \
ENABLE_VNC_AUDIO="true" WEB_UI_MODE="vnc" \
ENABLE_VNC_AUDIO="true" \
NEKO_PASSWORD=neko \
NEKO_PASSWORD_ADMIN=admin \
ENABLE_SUNSHINE="false" \
ENABLE_EVDEV_INPUTS="false"
# Configure required ports # Configure required ports
ENV \ ENV \
PORT_SSH="" \ PORT_SSH="" \
PORT_NOVNC_WEB="8083" PORT_NOVNC_WEB="8083" \
NEKO_NAT1TO1=""
# Expose the required ports # Expose the required ports
EXPOSE 8083 EXPOSE 8083

14
overlay/etc/cont-init.d/10-setup_user.sh
View File

@@ -5,8 +5,8 @@
# File Created: Friday, 12th January 2022 8:54:01 am # File Created: Friday, 12th January 2022 8:54:01 am
# Author: Josh.5 (jsunnex@gmail.com) # Author: Josh.5 (jsunnex@gmail.com)
# ----- # -----
# Last Modified: Tuesday, 4th October 2022 11:27:10 am # Last Modified: Sunday, 9th July 2023 7:43:44 pm
# Modified By: Josh.5 (jsunnex@gmail.com) # Modified By: Console and webGui login account (jsunnex@gmail.com)
### ###
PUID=${PUID:-99} PUID=${PUID:-99}
@@ -21,10 +21,6 @@ usermod -o -u "${PUID}" ${USER}
groupmod -o -g "${PGID}" ${USER} groupmod -o -g "${PGID}" ${USER}
echo "Adding default user to video, audio, input and pulse groups"
usermod -a -G video,audio,input,pulse ${USER}
echo "Adding default user to any additional required device groups" echo "Adding default user to any additional required device groups"
device_nodes=( /dev/uinput /dev/input/event* /dev/dri/* ) device_nodes=( /dev/uinput /dev/input/event* /dev/dri/* )
added_groups="" added_groups=""
@@ -52,7 +48,7 @@ for dev in "${device_nodes[@]}"; do
# Add group to user # Add group to user
if [[ "${added_groups}" != *"${dev_group}"* ]]; then if [[ "${added_groups}" != *"${dev_group}"* ]]; then
echo "Adding user '${USER}' to group: '${dev_group}' for device: ${dev}" echo "Adding user '${USER}' to group: '${dev_group}' for device: ${dev}"
usermod -a -G ${dev_group} ${USER} usermod -aG ${dev_group} ${USER}
added_groups=" ${added_groups} ${dev_group} " added_groups=" ${added_groups} ${dev_group} "
fi fi
done done
@@ -99,4 +95,8 @@ echo "${USER}:${USER_PASSWORD}" | chpasswd
mkdir -p /tmp/runtime-root mkdir -p /tmp/runtime-root
chown root:root /tmp/runtime-root chown root:root /tmp/runtime-root
# Fix some flatpak quirks (not sure what is happening here)
mount -t proc none /proc
flatpak list
echo "DONE" echo "DONE"

21
overlay/etc/cont-init.d/20-configre_sshd.sh
View File

@@ -1,21 +0,0 @@
echo "**** Configure SSH server ****"
if [[ "X${PORT_SSH:-}" != "X" ]]; then
# Generate new SSH host keys if they dont exist
if [[ ! -f /etc/ssh/ssh_host_rsa_key ]]; then
echo "**** Generating SSH keys ****";
/usr/bin/ssh-keygen -A
fi
mkdir -p /run/sshd
chmod 744 /run/sshd
echo "Set port to '${PORT_SSH}'"
sed -i "s|^# Port 22.*$|Port ${PORT_SSH}|" /etc/ssh/ssh_config
else
echo "Disable SSH server"
# Disable supervisord script
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/sshd.ini
fi
echo "DONE"

16
overlay/etc/cont-init.d/60-configure_gpu_driver.sh
View File

@@ -85,7 +85,6 @@ function install_amd_gpu_driver {
echo "Install AMD vulkan driver" echo "Install AMD vulkan driver"
if command -v pacman &> /dev/null; then if command -v pacman &> /dev/null; then
pacman -Syu --noconfirm --needed \ pacman -Syu --noconfirm --needed \
lib32-mesa \
lib32-vulkan-icd-loader \ lib32-vulkan-icd-loader \
lib32-vulkan-radeon \ lib32-vulkan-radeon \
vulkan-icd-loader \ vulkan-icd-loader \
@@ -105,7 +104,6 @@ function install_intel_gpu_driver {
echo "Install Intel vulkan driver" echo "Install Intel vulkan driver"
if command -v pacman &> /dev/null; then if command -v pacman &> /dev/null; then
pacman -Syu --noconfirm --needed \ pacman -Syu --noconfirm --needed \
lib32-mesa \
lib32-vulkan-icd-loader \ lib32-vulkan-icd-loader \
lib32-vulkan-intel \ lib32-vulkan-intel \
vulkan-icd-loader \ vulkan-icd-loader \
@@ -121,13 +119,6 @@ function install_intel_gpu_driver {
fi fi
} }
# NVIDIA GPU
if [[ ! -z ${nvidia_pci_address} ]]; then
echo "**** Found NVIDIA device '${nvidia_gpu_name}' ****";
install_nvidia_driver
else
echo "**** No NVIDIA device found ****";
fi
# Intel Arc GPU or Intel CPU with possible iGPU # Intel Arc GPU or Intel CPU with possible iGPU
if [[ ! -z ${intel_gpu_model} ]]; then if [[ ! -z ${intel_gpu_model} ]]; then
echo "**** Found Intel device '${intel_gpu_model}' ****"; echo "**** Found Intel device '${intel_gpu_model}' ****";
@@ -145,5 +136,12 @@ if [[ ! -z ${amd_gpu_model} ]]; then
else else
echo "**** No AMD device found ****"; echo "**** No AMD device found ****";
fi fi
# NVIDIA GPU
if [[ ! -z ${nvidia_pci_address} ]]; then
echo "**** Found NVIDIA device '${nvidia_gpu_name}' ****";
install_nvidia_driver
else
echo "**** No NVIDIA device found ****";
fi
echo "DONE" echo "DONE"

6
overlay/etc/cont-init.d/70-configure_xorg.sh
View File

@@ -54,7 +54,11 @@ function configure_nvidia_x_server {
# Allow anybody for running x server # Allow anybody for running x server
function configure_x_server { function configure_x_server {
# Configure x to be run by anyone # Configure x to be run by anyone
if grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then if [[ ! -f /etc/X11/Xwrapper.config ]]; then
echo "Create Xwrapper.config"
echo 'allowed_users=anybody' > /etc/X11/Xwrapper.config
echo 'needs_root_rights=yes' >> /etc/X11/Xwrapper.config
elif grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then
echo "Configure Xwrapper.config" echo "Configure Xwrapper.config"
sed -i "s/allowed_users=console/allowed_users=anybody/" /etc/X11/Xwrapper.config sed -i "s/allowed_users=console/allowed_users=anybody/" /etc/X11/Xwrapper.config
echo 'needs_root_rights=yes' >> /etc/X11/Xwrapper.config echo 'needs_root_rights=yes' >> /etc/X11/Xwrapper.config

9
overlay/etc/cont-init.d/95-configure_secondary.sh
View File

@@ -6,9 +6,6 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
# Disable desktop # Disable desktop
echo " - Disable desktop" echo " - Disable desktop"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini
# Disable sshd
echo " - Disable sshd"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/sshd.ini
# Disable vnc # Disable vnc
echo " - Disable vnc" echo " - Disable vnc"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc.ini sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc.ini
@@ -34,4 +31,10 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini
fi fi
# TODO: Disabled some stuff for development... re-enable it after Archis working
echo " - DISABLEING dind"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/dind.ini
#echo " - DISABLEING desktop"
#sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini
echo "DONE" echo "DONE"

14
overlay/etc/supervisor.d/sshd.ini
View File

@@ -1,14 +0,0 @@
[program:sshd]
priority=10
autostart=true
autorestart=true
user=root
command=/usr/sbin/sshd -Ddp "%(ENV_PORT_SSH)s"
stopsignal=INT
stdout_logfile=/var/log/supervisor/sshd.log
stdout_logfile_maxbytes=10MB
stdout_logfile_backups=7
stderr_logfile=/var/log/supervisor/sshd.err.log
stderr_logfile_maxbytes=10MB
stderr_logfile_backups=7

2
overlay/etc/supervisor.d/vnc-audio.ini
View File

@@ -18,7 +18,7 @@ priority=40
autostart=false autostart=false
autorestart=true autorestart=true
user=%(ENV_USER)s user=%(ENV_USER)s
command=/usr/local/bin/websockify %(ENV_PORT_AUDIO_WEBSOCKET)s localhost:%(ENV_PORT_AUDIO_STREAM)s command=websockify %(ENV_PORT_AUDIO_WEBSOCKET)s localhost:%(ENV_PORT_AUDIO_STREAM)s
stopsignal=INT stopsignal=INT
stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.log stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.log
stdout_logfile_maxbytes=10MB stdout_logfile_maxbytes=10MB

2
overlay/opt/scripts/install_sunshine.sh
View File

@@ -25,6 +25,7 @@ Terminal=false
Hidden=false Hidden=false
EOF EOF
)" )"
mkdir -p "${USER_HOME:?}/.config/autostart"
if [[ ! -f "${USER_HOME:?}/.config/autostart/Sunshine.desktop" ]]; then if [[ ! -f "${USER_HOME:?}/.config/autostart/Sunshine.desktop" ]]; then
echo "${sunshine_autostart_desktop:?}" > "${USER_HOME:?}/.config/autostart/Sunshine.desktop" echo "${sunshine_autostart_desktop:?}" > "${USER_HOME:?}/.config/autostart/Sunshine.desktop"
fi fi
@@ -61,6 +62,7 @@ sunshine_apps_json="$(cat <<EOF
} }
EOF EOF
)" )"
mkdir -p "${USER_HOME:?}/.config/sunshine"
if [[ ! -f "${USER_HOME:?}/.config/sunshine/apps.json" ]]; then if [[ ! -f "${USER_HOME:?}/.config/sunshine/apps.json" ]]; then
echo "${sunshine_apps_json:?}" > "${USER_HOME:?}/.config/sunshine/apps.json" echo "${sunshine_apps_json:?}" > "${USER_HOME:?}/.config/sunshine/apps.json"
fi fi