From 446a043703c4fb4052f96919a5bad70450e84ebe Mon Sep 17 00:00:00 2001
From: "Josh.5" <jsunnex@gmail.com>
Date: Sat, 15 Jan 2022 08:37:53 +1300
Subject: [PATCH] Improvements to my script for testing the container
 generation

---
 devops/run_server.sh | 62 +++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/devops/run_server.sh b/devops/run_server.sh
index cf4bf1e..b79e168 100755
--- a/devops/run_server.sh
+++ b/devops/run_server.sh
@@ -48,17 +48,17 @@ for ARG in ${@}; do
 done
 if [[ "${primary}" == "true" ]]; then
     container_name="${container_name}-p"
-    additional_docker_params="${additional_docker_params} -e MODE='primary'"
+    additional_docker_params="${additional_docker_params} -e MODE=primary"
     hostx="false"
 else
     container_name="${container_name}-s"
-    additional_docker_params="${additional_docker_params} -e MODE='secondary'"
+    additional_docker_params="${additional_docker_params} -e MODE=secondary"
     framebuffer="false"
 fi
 if [[ "${hostx}" == "true" ]]; then
     container_name="${container_name}-hx"
     additional_docker_params="${additional_docker_params} -v /tmp/.X11-unix:/tmp/.X11-unix"
-    additional_docker_params="${additional_docker_params} -e MODE='secondary'"
+    additional_docker_params="${additional_docker_params} -e MODE=secondary"
     nvidia="false"
     framebuffer="false"
 else
@@ -73,6 +73,9 @@ if [[ "${framebuffer}" == "true" ]]; then
     # TODO: Enable xvfb
     container_name="${container_name}-fb"
 fi
+if [[ -e /dev/dri ]]; then
+    additional_docker_params="${additional_docker_params} --device=/dev/dri"
+fi
 
 
 # If a mode was given, run that instead
@@ -99,35 +102,36 @@ sleep 1
 
 
 # Run
-docker run -d --name="${container_name}" \
+cmd="docker run -d --name='${container_name}' \
     --privileged=true \
     --network=host \
-    --ipc="host" \
-    -e PUID="99"  \
-    -e PGID="100"  \
-    -e UMASK="000"  \
-    -e USER_PASSWORD="password" \
-    -e USER="default" \
-    -e USER_HOME="/home/default" \
-    -e TZ="Pacific/Auckland" \
-    -e USER_LOCALES="en_US.UTF-8 UTF-8" \
-    -e DISPLAY_CDEPTH="24" \
-    -e DISPLAY_DPI="96" \
-    -e DISPLAY_REFRESH="60" \
-    -e DISPLAY_SIZEH="720" \
-    -e DISPLAY_SIZEW="1280" \
-    -e DISPLAY_VIDEO_PORT="DFP" \
-    -e DISPLAY=":2" \
-    -e NVIDIA_DRIVER_CAPABILITIES="all" \
-    -e NVIDIA_VISIBLE_DEVICES="all" \
-    -e ENABLE_VNC_AUDIO="false" \
-    -v "${project_base_path}/config/home/default-${container_name}":"/home/default":"rw"  \
-    -v "/tmp/":"/tmp/":"rw"  \
-    -v /dev/input:/dev/input:ro \
-    --hostname="${container_name}" \
+    --ipc='host' \
+    -e PUID='99'  \
+    -e PGID='100'  \
+    -e UMASK='000'  \
+    -e USER_PASSWORD='password' \
+    -e USER='default' \
+    -e USER_HOME='/home/default' \
+    -e TZ='Pacific/Auckland' \
+    -e USER_LOCALES='en_US.UTF-8 UTF-8' \
+    -e DISPLAY_CDEPTH='24' \
+    -e DISPLAY_DPI='96' \
+    -e DISPLAY_REFRESH='60' \
+    -e DISPLAY_SIZEH='720' \
+    -e DISPLAY_SIZEW='1280' \
+    -e DISPLAY_VIDEO_PORT='DFP' \
+    -e DISPLAY=':55' \
+    -e NVIDIA_DRIVER_CAPABILITIES='all' \
+    -e NVIDIA_VISIBLE_DEVICES='all' \
+    -e ENABLE_VNC_AUDIO='false' \
+    -v '${project_base_path}/config/home/default-${container_name}':'/home/default':'rw'  \
+    -v '/tmp/.X11-unix/':'/tmp/.X11-unix/':'rw'  \
+    -v '/dev/input':'/dev/input':'ro' \
+    --hostname='${container_name}' \
     --shm-size=2G \
     ${additional_docker_params} \
-    josh5/steam-headless:develop
-
+    josh5/steam-headless:develop"
+echo ${cmd}
+bash -c "${cmd}"
 
 docker logs -f ${container_name}