diff options
| author | Chuck Lantz <clantz@microsoft.com> | 2020-06-23 05:16:41 +0300 |
|---|---|---|
| committer | Chuck Lantz <clantz@microsoft.com> | 2020-06-23 05:16:41 +0300 |
| commit | fde43b37990ee606e5e1128c3183125473b60121 (patch) | |
| tree | 42c19afb9dafe9c0953e0a7c48f228ed599fa2c8 /.devcontainer | |
| parent | fa6364164840820442d4ea3a1ada3fc01a7808d8 (diff) | |
Resolve windows related issues
Diffstat (limited to '.devcontainer')
| -rw-r--r-- | .devcontainer/README.md | 2 | ||||
| -rw-r--r-- | .devcontainer/bin/init-dev-container.sh | 5 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json | 1 | ||||
| -rw-r--r-- | .devcontainer/fluxbox/menu | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 361b2bb5a66..79fdfb487aa 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -62,7 +62,7 @@ To start working with Code - OSS, follow these steps: ```bash yarn install - scripts/code.sh + bash scripts/code.sh ``` 2. After the build is complete, open a web browser and go to [http://localhost:6080](http://localhost:6080) or use a [VNC Viewer](https://www.realvnc.com/en/connect/download/viewer/) to connect to `localhost:5901` and enter `vscode` as the password. diff --git a/.devcontainer/bin/init-dev-container.sh b/.devcontainer/bin/init-dev-container.sh index d517bff53a3..260cc275922 100644 --- a/.devcontainer/bin/init-dev-container.sh +++ b/.devcontainer/bin/init-dev-container.sh @@ -70,11 +70,12 @@ startInBackgroundIfNotRunning "Xvfb" sudoIf "Xvfb ${DISPLAY:-:1} +extension RAND # Start fluxbox as a light weight window manager. startInBackgroundIfNotRunning "fluxbox" sudoUserIf "dbus-launch startfluxbox" +# Start x11vnc +startInBackgroundIfNotRunning "x11vnc" sudoIf "x11vnc -display ${DISPLAY:-:1} -rfbport ${VNC_PORT:-5901} -localhost -no6 -xkb -shared -forever -passwdfile $HOME/.vnc/passwd" + # Set resolution /usr/local/bin/set-resolution ${VNC_RESOLUTION:-1280x720} ${VNC_DPI:-72} -# Start x11vnc -startInBackgroundIfNotRunning "x11vnc" sudoIf "x11vnc -display ${DISPLAY:-:1} -rfbport ${VNC_PORT:-5901} -localhost -no6 -xkb -shared -forever -passwdfile $HOME/.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 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aa41fe9c169..b9f3e6d79b1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -32,7 +32,6 @@ "extensions": [ "dbaeumer.vscode-eslint", "EditorConfig.EditorConfig", - "ms-vscode.js-debug-nightly", "msjsdiag.debugger-for-chrome", "mutantdino.resourcemonitor", "GitHub.vscode-pull-request-github" diff --git a/.devcontainer/fluxbox/menu b/.devcontainer/fluxbox/menu index f00e0f7967e..ff5955a2fe7 100644 --- a/.devcontainer/fluxbox/menu +++ b/.devcontainer/fluxbox/menu @@ -1,7 +1,7 @@ [begin] ( Code - OSS Development Container ) [exec] (File Manager) { nautilus ~ } <> [exec] (Terminal) {/usr/bin/gnome-terminal --working-directory=~ } <> - [exec] (Start Code - OSS) { x-terminal-emulator -T "Code - OSS Build" -e /workspaces/vscode*/scripts/code.sh } <> + [exec] (Start Code - OSS) { x-terminal-emulator -T "Code - OSS Build" -e bash /workspaces/vscode*/scripts/code.sh } <> [submenu] (System >) {} [exec] (Set Resolution) { x-terminal-emulator -T "Set Resolution" -e bash /usr/local/bin/set-resolution } <> [exec] (Passwords and Keys) { seahorse } <> |