diff options
| author | Chuck Lantz <clantz@microsoft.com> | 2020-07-06 18:52:04 +0300 |
|---|---|---|
| committer | Chuck Lantz <clantz@microsoft.com> | 2020-07-06 18:52:04 +0300 |
| commit | a731434df95b8ca66fba9fb3a835529700983042 (patch) | |
| tree | 7ce675ab9d9b35f49447f608eac192c93c3afbf6 /.devcontainer | |
| parent | 4fbaace9b638cc0c8ee71a21d4d1b585ab76abb6 (diff) | |
Clarify requirements, fix for smoke tests
Diffstat (limited to '.devcontainer')
| -rw-r--r-- | .devcontainer/Dockerfile | 2 | ||||
| -rw-r--r-- | .devcontainer/README.md | 6 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d352b823d05..23c94155f3f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-10 +FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12 ARG TARGET_DISPLAY=":1" diff --git a/.devcontainer/README.md b/.devcontainer/README.md index 79fdfb487aa..e16795062d7 100644 --- a/.devcontainer/README.md +++ b/.devcontainer/README.md @@ -6,9 +6,9 @@ This repository includes configuration for a development container for working w ## Quick start - local -1. Install Docker Desktop or Docker on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.) +1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.) -2. [Docker Desktop] If you are not using the new WSL2 Docker Desktop engine, increase the resources allocated to Docker Desktop to at least **4 Cores and 4 GB of RAM (8 GB recommended)**. Right-click on the Docker status bar item, go to **Preferences/Settings > Resources > Advanced** to do so. +2. **Important**: Docker needs at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run full build. If you on macOS, or using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item, going to **Preferences/Settings > Resources > Advanced**. > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar. @@ -44,7 +44,7 @@ Next: **[Try it out!](#try-it)** 3. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> and select **Codespaces: Create New Codespace**. -4. Use default settings, select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted. +4. Use default settings (which should include **Standard** 4 core, 8 GB RAM Codespace), select a plan, and then enter the repository URL `https://github.com/microsoft/vscode` (or a branch or PR URL) in the input box when prompted. 5. After the container is running, 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/devcontainer.json b/.devcontainer/devcontainer.json index b9f3e6d79b1..722bace6df7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -12,7 +12,11 @@ } }, "overrideCommand": false, - "runArgs": ["--init"], + "runArgs": [ + "--init", + // seccomp=unconfined is required for Chrome sandboxing + "--security-opt", "seccomp=unconfined" + ], "settings": { // zsh is also available |