Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 311c253

Browse files
author
CI
committed
Automated update for script library changes
1 parent d2afa15 commit 311c253

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

repository-containers/images/github.com/microsoft/vscode/.devcontainer/library-scripts/desktop-lite-debian.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,17 @@ EOF
206206
# Container ENTRYPOINT script
207207
tee /usr/local/share/desktop-init.sh > /dev/null \
208208
<< EOF
209-
#!/bin/bash
209+
#!/bin/bash
210210
211211
USERNAME=${USERNAME}
212212
LOG=/tmp/container-init.log
213213
214+
export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-"autolaunch:"}"
215+
export DISPLAY="${DISPLAY:-:1}"
216+
export VNC_RESOLUTION="${VNC_RESOLUTION:-1440x768x16}"
217+
export LANG="${LANG:-"en_US.UTF-8"}"
218+
export LANGUAGE="${LANGUAGE:-"en_US.UTF-8"}"
219+
214220
# Execute the command it not already running
215221
startInBackgroundIfNotRunning()
216222
{
@@ -280,7 +286,7 @@ sudoIf chown root:\${USERNAME} /tmp/.X11-unix
280286
if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
281287
screen_geometry="\${VNC_RESOLUTION%*x*}"
282288
screen_depth="\${VNC_RESOLUTION##*x}"
283-
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"
289+
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"
284290
285291
# Spin up noVNC if installed and not runnning.
286292
if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then

0 commit comments

Comments
 (0)