Set desktop script defaults

Author: Chuxel

script-library/container-features/src/features.json

@@ -462,6 +462,9 @@
 			"init": true,
 			"buildArg": "_VSC_INSTALL_DESKTOP_LITE",
 			"entrypoint": "/usr/local/share/desktop-init.sh",
+			"containerEnv": {
+				"DISPLAY": ":1"
+			},
 			"include": [
 				"cpp",
 				"kubernetes-helm",

script-library/desktop-lite-debian.sh

@@ -206,11 +206,17 @@ EOF
 # Container ENTRYPOINT script
 tee /usr/local/share/desktop-init.sh > /dev/null \
 << EOF
- #!/bin/bash
+#!/bin/bash
 
 USERNAME=${USERNAME}
 LOG=/tmp/container-init.log
 
+export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-"autolaunch:"}"
+export DISPLAY="${DISPLAY:-:1}"
+export VNC_RESOLUTION="${VNC_RESOLUTION:-1440x768x16}" 
+export LANG="${LANG:-"en_US.UTF-8"}"
+export LANGUAGE="${LANGUAGE:-"en_US.UTF-8"}"
+
 # Execute the command it not already running
 startInBackgroundIfNotRunning()
 {
@@ -280,7 +286,7 @@ sudoIf chown root:\${USERNAME} /tmp/.X11-unix
 if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
 screen_geometry="\${VNC_RESOLUTION%*x*}"
 screen_depth="\${VNC_RESOLUTION##*x}"
-startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver \${DISPLAY:-:1} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport \${VNC_PORT:-5901} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
+startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport \${VNC_PORT:-5901} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
 
 # Spin up noVNC if installed and not runnning.
 if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then