From e462e22c62079400321f0b3492abfefc4aef4e46 Mon Sep 17 00:00:00 2001
From: vajonam <152501+vajonam@users.noreply.github.com>
Date: Wed, 3 Apr 2024 09:27:07 -0400
Subject: [PATCH] fix: convert all environment variables to supervosord

Signed-off-by: vajonam <152501+vajonam@users.noreply.github.com>
---
 entrypoint.sh    | 20 ++++++++++++++++++++
 supervisord.conf |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100755 entrypoint.sh

diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..a505961
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -x 
+set -e
+rm -f /tmp/.X*-lock
+rm -f /tmp/.X11-unix/X*
+DISPLAY=${DISPLAY:-:10}
+DISPLAY_NUMBER=$(echo $DISPLAY | cut -d: -f2)
+export NOVNC_PORT=${NOVNC_PORT:-8080}
+VNC_RESOLUTION=${VNC_RESOLUTION:-1280x800}
+if [ -n "$VNC_PASSWORD" ]; then
+  mkdir -p /root/.vnc
+  echo "$VNC_PASSWORD" | vncpasswd -f > /root/.vnc/passwd
+  chmod 0600 /root/.vnc/passwd
+fi
+# vncserver "$DISPLAY" -securitytypes TLSNone,X509None,None -depth 24 -geometry "$VNC_RESOLUTION"
+# websockify -D --web=/usr/share/novnc/ "$NOVNC_PORT" localhost:$((5900 + DISPLAY_NUMBER))
+# echo "NoVNC server started on port $NOVNC_PORT"
+# EXEC=$@
+# exec "$@"
+export VGLRUN=vglrun
+chown -R slic3r:slic3r /home/slic3r/ /configs/ /prints/ /dev/stdout && exec gosu slic3r supervisord # -e TRACE
diff --git a/supervisord.conf b/supervisord.conf
index a4fba64..b5ac496 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -4,19 +4,19 @@ pidfile=/tmp/supervisord.pid
 
 [program:vnc]
 priority=0
-command=/opt/TurboVNC/bin/vncserver :1 -fg  -securitytypes TLSNone,X509None,None -depth 24 -geometry 1920x1080
+command=/opt/TurboVNC/bin/vncserver %(ENV_DISPLAY)s -fg  -securitytypes TLSNone,X509None,None -depth 24 -geometry %(ENV_VNC_RESOLUTION)s
 autorestart=true
 redirect_stderr=true
 
 [program:novnc]
 priority=0
-command=websockify --web=/usr/share/novnc/ 8080  localhost:5901
+command=websockify --web=/usr/share/novnc/ %(ENV_NOVNC_PORT)s  localhost:5901
 autorestart=true
 redirect_stderr=true
 
 [program:prusaslicer]
 priority=1
 environment=DISPLAY=:1
-command=/bin/bash -c 'vglrun /slic3r/slic3r-dist/prusa-slicer --datadir /configs/.config/PrusaSlicer/'
+command=/bin/bash -c '%(ENV_VGLRUN)s /slic3r/slic3r-dist/prusa-slicer --datadir /configs/.config/PrusaSlicer/'
 autorestart=true
 redirect_stderr=true