From d386c282e6c29b927f5a67a8bfabb8d6961e52cb Mon Sep 17 00:00:00 2001 From: Tem Date: Tue, 1 Aug 2023 09:14:52 +0300 Subject: [PATCH 1/4] Update Arch Dockerfile --- Dockerfile.arch | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index 7cdee2c..ee28c8e 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -162,6 +162,9 @@ RUN \ echo # Install X Server requirements +ENV \ + XORG_SOCKET_DIR="/tmp/.X11-unix" \ + XDG_RUNTIME_DIR="/tmp/.X11-unix/run" RUN \ echo "**** Install X Server requirements ****" \ && pacman -Syu --noconfirm --needed \ @@ -197,6 +200,9 @@ RUN \ echo # Install audio requirements +ENV \ + PULSE_SOCKET_DIR="/tmp/pulse" \ + PULSE_SERVER="unix:/tmp/pulse/pulse-socket" RUN \ echo "**** Install X Server requirements ****" \ && pacman -Syu --noconfirm --needed \ @@ -252,6 +258,8 @@ RUN \ # 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 +ENV \ + XDG_DATA_DIRS="/home/default/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share/:/usr/share/" RUN \ echo "**** Install flatpak support ****" \ && pacman -Syu --noconfirm --needed \ @@ -385,6 +393,18 @@ RUN \ && \ echo +# Install Steam +RUN \ + echo "**** Install X Server requirements ****" \ + && pacman -Syu --noconfirm --needed \ + steam \ + && \ + echo "**** Section cleanup ****" \ + && pacman -Scc --noconfirm \ + && rm -fr /var/lib/pacman/sync/* \ + && \ + echo + # Add FS overlay COPY overlay / @@ -396,19 +416,10 @@ ENV \ DISPLAY_SIZEW="1600" \ DISPLAY_VIDEO_PORT="DFP" \ 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_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 ENV \ MODE="primary" \ @@ -416,12 +427,13 @@ ENV \ ENABLE_VNC_AUDIO="true" \ NEKO_PASSWORD=neko \ NEKO_PASSWORD_ADMIN=admin \ + ENABLE_STEAM="true" \ + STEAM_ARGS="-silent" \ ENABLE_SUNSHINE="false" \ ENABLE_EVDEV_INPUTS="false" # Configure required ports ENV \ - PORT_SSH="" \ PORT_NOVNC_WEB="8083" \ NEKO_NAT1TO1="" From 658b18a634ffce809b54880fc87c221c870809be Mon Sep 17 00:00:00 2001 From: Ali Ansari Date: Tue, 1 Aug 2023 09:25:44 +0300 Subject: [PATCH 2/4] remove opencl-mesa --- Dockerfile | 1 + Dockerfile.arch | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 120000 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 120000 index 0000000..3efca4f --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +Dockerfile.arch \ No newline at end of file diff --git a/Dockerfile.arch b/Dockerfile.arch index ee28c8e..5c8638b 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -150,7 +150,6 @@ RUN \ libva-mesa-driver \ mesa-utils \ mesa-vdpau \ - opencl-mesa \ pciutils \ vulkan-mesa-layers \ vdpauinfo \ From 9c3497d73a5eb9ef0ee32521281b4cf95ed4b7f1 Mon Sep 17 00:00:00 2001 From: Ali Ansari Date: Tue, 1 Aug 2023 09:42:19 +0300 Subject: [PATCH 3/4] Adjust supervisor path --- Dockerfile.arch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile.arch b/Dockerfile.arch index 5c8638b..b8130a1 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -407,6 +407,12 @@ RUN \ # Add FS overlay COPY overlay / +RUN \ + echo "**** Setup Steam Supervisor ****" \ + && sed -i 's#/usr/games/steam#/usr/bin/steam#g' /etc/supervisor.d/steam.ini \ + && \ + echo + # Set display environment variables ENV \ DISPLAY_CDEPTH="24" \ From 6913938585cf86525f39b17e64309e4d7653e96c Mon Sep 17 00:00:00 2001 From: Ali Ansari Date: Tue, 1 Aug 2023 09:49:39 +0300 Subject: [PATCH 4/4] cleanup --- Dockerfile | 1 - 1 file changed, 1 deletion(-) delete mode 120000 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 120000 index 3efca4f..0000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.arch \ No newline at end of file