Merge pull request #143 from StarlingUAS/dev

Xvfb fix and other minor fixes
StarlingUAS · Jan 10, 2022 · 0b5bf28 · 0b5bf28
2 parents 2275eea + d407ea0
commit 0b5bf28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -20,3 +20,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REQUIREMENTS: docs/requirements.txt
+          CUSTOM_DOMAIN: docs.starlinguas.dev
diff --git a/simulator/base/core/setup_display.sh b/simulator/base/core/setup_display.sh
@@ -3,12 +3,12 @@ echo "--------------- Start setup_display.sh ----------------------"
 
 if [ "$ENABLE_VIRTUAL_FRAMEBUFFER" = true ]; then
     echo "Creating virtual display using virtual framebuffer"
-    export DISPLAY=:1
-    rm -f /tmp/.X1-lock
-    Xvfb $DISPLAY -screen 0 1600x900x24 &
+    Xvfb -displayfd 3 -screen 0 1600x900x24 3>/tmp/displaynum &
+    while [ "$(cat /tmp/displaynum)" == "" ]; do sleep 0.1; done
+    export DISPLAY=:$(cat /tmp/displaynum)
 
     echo "Waiting for display to become available"
-    while [ ! -e /tmp/.X11-unix/X1 ]; do echo "Wait for X server.."; sleep 0.1; done
+    while [ ! -e /tmp/.X11-unix/X${DISPLAY#:} ]; do echo "Wait for X server.."; sleep 0.1; done
 else
     echo "Virtual Framebuffer Disabled"
 fi