aboutsummaryrefslogtreecommitdiff
path: root/src/desktop-lite
diff options
context:
space:
mode:
authorChuck Lantz <clantz@microsoft.com>2022-11-29 02:07:38 +0300
committerGitHub <noreply@github.com>2022-11-29 02:07:38 +0300
commitd1972b4d8d2dc75370c236c9dafe505ea42590f2 (patch)
tree9bcd472a0fab51cb2c389f6527df5e51f22ec0b0 /src/desktop-lite
parent4af4c291225a165e5a9b0e5a65c450e81e5aecf0 (diff)
Use _REMOTE_USER when available (#264)
* Use _REMOTE_USER when available * Update src/python/install.sh Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Update src/python/install.sh Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Fix java test issue - JDK 18 not available for the "open" distro * Bump breakfix numbers Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> Co-authored-by: Josh Spicer <joshspicer@github.com>
Diffstat (limited to 'src/desktop-lite')
-rw-r--r--src/desktop-lite/devcontainer-feature.json2
-rwxr-xr-xsrc/desktop-lite/install.sh7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 9420dc3..e033386 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "desktop-lite",
- "version": "1.0.5",
+ "version": "1.0.6",
"name": "Light-weight Desktop",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index dc8ee39..60bec12 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -7,14 +7,13 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md
# Maintainer: The VS Code and Codespaces Teams
-NOVNC_VERSION=${NOVNCVERSION:-"1.2.0"} # TODO: Add in a 'latest' auto-detect and swap name to 'version'
+NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
VNC_PASSWORD=${PASSWORD:-"vscode"}
NOVNC_PORT="${WEBPORT:-6080}"
VNC_PORT="${VNCPORT:-5901}"
-INSTALL_NOVNC=${INSTALL_NOVNC:-"true"}
-USERNAME=${USERNAME:-"automatic"}
-
+INSTALL_NOVNC="${INSTALL_NOVNC:-"true"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
WEBSOCKETIFY_VERSION=0.10.0