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

Add variable FORCE_X11_DUMMY_CONFIG for forcing the initial use of the dummy xorg config

Browse Source
This commit is contained in:
Josh.5
2023-10-02 11:13:17 +13:00
parent 7f04d8df01
commit c165e28f07
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.debian
View File

@@ -186,7 +186,8 @@ RUN \
ENV \ ENV \
XORG_SOCKET_DIR="/tmp/.X11-unix" \ XORG_SOCKET_DIR="/tmp/.X11-unix" \
XDG_RUNTIME_DIR="/tmp/.X11-unix/run" \ XDG_RUNTIME_DIR="/tmp/.X11-unix/run" \
XDG_SESSION_TYPE="x11" XDG_SESSION_TYPE="x11" \
FORCE_X11_DUMMY_CONFIG="false"
RUN \ RUN \
echo "**** Update apt database ****" \ echo "**** Update apt database ****" \
&& apt-get update \ && apt-get update \

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

@@ -84,7 +84,7 @@ function configure_x_server {
chmod 1777 /tmp/.ICE-unix/ chmod 1777 /tmp/.ICE-unix/
# Check if this container is being run as a secondary instance # Check if this container is being run as a secondary instance
if [ "${MODE}" == "p" ] | [ "${MODE}" == "primary" ]; then if ([ "${MODE}" = "p" ] || [ "${MODE}" = "primary" ]); then
echo "Configure container as primary the X server" echo "Configure container as primary the X server"
# Enable supervisord script # Enable supervisord script
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/xorg.ini sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/xorg.ini
@@ -108,7 +108,7 @@ function configure_x_server {
fi fi
# Configure dummy config if no monitor is connected (not applicable to NVIDIA) # Configure dummy config if no monitor is connected (not applicable to NVIDIA)
if [[ "X${monitor_connected}" == "X" ]]; then if ([ "X${monitor_connected}" = "X" ] || [ "${FORCE_X11_DUMMY_CONFIG}" = "true" ]); then
echo "No monitors connected. Installing dummy xorg.conf" echo "No monitors connected. Installing dummy xorg.conf"
# Use a dummy display input # Use a dummy display input
cp -fv /templates/xorg/xorg.dummy.conf /etc/X11/xorg.conf cp -fv /templates/xorg/xorg.dummy.conf /etc/X11/xorg.conf