Merge pull request #13330 from docker/master

Publish updates from master

compose/cli-command-compatibility.md

@@ -8,14 +8,14 @@ The `compose` command in the Docker CLI supports most of the `docker-compose` co
 
 You can follow progress on the implementation of the remaining commands and flags in the  [Compose-CLI](https://github.com/docker/compose-cli/issues/1283){:target="_blank" rel="noopener" class="_"} GitHub repository.
 
-If you see some Compose functionality that is not available in the `compose` command, create an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues){:target="_blank" rel="noopener" class="_"} GitHub repository so we can prioritize it.
+If you see any Compose functionality that is not available in the `compose` command, create an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues){:target="_blank" rel="noopener" class="_"} GitHub repository so we can prioritize it.
 
 ## Commands or flags not yet implemented
 
 The following commands have not been implemented yet, and maybe implemented at a later time.
-Let us know if these commands are a higher priority for your usecases.
+Let us know if these commands are a higher priority for your use cases.
 
-`compose build --memory`. This option is not yet supported by buildkit. The flag is currently supported but is hidden to avoid breaking existing Compose usage. It does not have any effect.
+`compose build --memory`: This option is not yet supported by buildkit. The flag is currently supported, but is hidden to avoid breaking existing Compose usage. It does not have any effect.
 
 ## Flags that will not be implemented
 

compose/cli-command.md

@@ -1,16 +1,18 @@
 ---
-description: Compose V2 in the Docker CLI
-keywords: compose, V2, beta, Tech preview
-title: Compose V2 beta
+description: Compose V2 RC1 in the Docker CLI
+keywords: compose, V2, release candidate RC 1
+title: Compose V2 release candidate
 ---
 
 ## Compose V2 and the new `docker compose` command
 
 > Important
 >
-> The new Compose V2, which supports the compose command as part of the Docker CLI, is now available as a beta version.  Compose V2 seamlessly integrates compose functions into the Docker platform, continuing to support most of the previous `docker-compose` features and flags. You can test the Compose V2 today, by simply replacing the dash (`-`) with a space, and running `docker compose`, instead of `docker-compose`.
+> The new Compose V2, which supports the `compose` command as part of the Docker CLI, is available as a release candidate with the Docker Desktop 3.6 release.
 >
-> As Docker Compose V2 is in beta, we recommend that you extensively test before using it in production environments.
+> Compose V2 integrates compose functions into the Docker platform, continuing to support most of the previous `docker-compose` features and flags. You can test the Compose V2 by simply replacing the dash (`-`) with a space, and by running `docker compose`, instead of `docker-compose`.
+>
+> As Docker Compose V2 is a release candidate, we recommend that you extensively test before using it in production environments.
 {: .important}
 
 Starting with Docker Desktop 3.4.0, you can run Compose V2 commands without modifying your invocations, by enabling the drop-in replacement of the previous `docker-compose` with the new command.  See the section [Installing Compose v2](#installing-compose-v2) for detailed instructions how to enable the drop-in replacement.
@@ -65,6 +67,6 @@ from the [project release page](https://github.com/docker/compose-cli/releases){
 
 ```console
 $ mkdir -p ~/.docker/cli-plugins/
-$ curl -SL https://github.com/docker/compose-cli/releases/download/v2.0.0-beta.6/docker-compose-linux-amd64 -o ~/.docker/cli-plugins/docker-compose
+$ curl -SL https://github.com/docker/compose-cli/releases/download/v2.0.0-rc.1/docker-compose-linux-amd64 -o ~/.docker/cli-plugins/docker-compose
 $ chmod +x ~/.docker/cli-plugins/docker-compose
 ```

desktop/dashboard.md

@@ -227,7 +227,9 @@ To interact with remote repositories:
 
 ## Explore volumes
 
-The **Volumes** view in Docker Dashboard enables you to easily create and delete [volumes](../storage/volumes.md) and see which ones are being used. If you are a developer subscribed to a Pro or a Team plan, you can also see which container is using a specific volume and explore the files and folders in your volumes.
+You can use [volumes](../storage/volumes.md) to store files and share them among containers. Volumes are created and are directly managed by Docker. They are also the preferred mechanism to persist data in Docker containers and services.
+
+The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are a developer subscribed to a Pro or a Team plan, you can also see which container is using a specific volume and explore the files and folders in your volumes.
 
 {% include upgrade-cta.html
   body="To start exploring the details in your volumes, upgrade to a Pro or a Team plan."
@@ -235,15 +237,30 @@ The **Volumes** view in Docker Dashboard enables you to easily create and delete
   target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_volumes"
 %}
 
+The following table lists the Volumes UI features available in each plan:
+
+{% assign yes = '![yes](/images/green-check.svg){: .inline style="height: 14px; margin: 0 auto"}' %}
+
+| Feature                                       | Free      | Pro       | Team      |
+|:----------------------------------------------|:---------:|:---------:|:--------:|
+|  View, create, and delete volumes             | {{ yes }} | {{ yes }} |  {{ yes }}  |
+| See which volumes are in use                  | {{ yes }} | {{ yes }} |  {{ yes }}  |
+| See the size of the volume                    | {{ yes }} | {{ yes }} |  {{ yes }}  |
+| See volume data details (modified date, size) | X         | {{ yes }} |  {{ yes }}  |
+| See which container is using a volume         | X         | {{ yes }} |  {{ yes }}  |
+| Save or delete files from a volume            | X         | {{ yes }} |  {{ yes }}  |
+
 ### Manage volumes
 
-By default, the **Volumes** view displays a list of all the volumes.
+By default, the **Volumes** view displays a list of all the volumes. Volumes that are currently used by a container display the **In Use** badge.
 
 ![List volumes](images/volumes-list.png){:width="700px"}
 
+Use the **Search** field to search for any specific volumes. You can also sort volumes by the name, the date created, and the size of the volume.
+
 To explore the details of a specific volume, select a volume from the list. This opens the detailed view.
 
-The **In Use** tab displays the name of the container that’s using the volume, the image name, the port number used by the container, CPU, memory, disk read/write, and network I/O consumed by the container.
+The **In Use** tab displays the name of the container using the volume, the image name, the port number used by the container, and the target. A target is a path inside a container that gives access to the files in the volume.
 
 The **Data** tab displays the files and folders in the volume and their file size. To save a file or a folder, hover over the file or folder and click on the more options menu. Select **Save As** and then specify a location to download the file.
 

desktop/dev-environments.md

@@ -51,7 +51,7 @@ The simplest way to get started with Dev Environments is to create a new environ
 >
 > When cloning a Git repository using SSH, ensure you've added your SSH key to the ssh-agent. To do this, open a terminal and run `ssh-add <path to your private ssh key>`.
 
-1. First, let's copy `git@github.com:dockersamples/single-dev-env.git` and add it to the **Create** field on the **Create a Development Environment** page.
+1. Click **Create New Environment**. This opens the **Create a Dev Environment** dialog. Copy `https://github.com/dockersamples/single-dev-env.git` and add it to the **Repository URL** field on the **Remote Git Repository** tab.
 2. Now, click **Create**.
 
     This clones the Git code inside a volume, determines the best image for your Dev Environment, and finally, opens VS Code inside the Dev Environment container.
@@ -78,10 +78,6 @@ You can create a dev environment from a specific branch (for example, a branch c
 
 Docker then clones the repository with your specified branch or tag.
 
-> **Note**
->
-> Known issue: when cloning a Git branch using `https://`, you must remove the `.git` suffix at the end of the URL.
-
 ### Recap
 
 Let's summarize the tasks we performed so far to start a single container Dev Environment.
@@ -100,7 +96,7 @@ This creates a Docker image of your dev environment, uploads it to the Docker Hu
 
 ![Dev environment shared](/images/dev-env-shared.png){:width="700px"}
 
-Your team members just need to add this URL in the **Create** field and then click **Create**. Your Dev Environment now starts in the exact same state as you shared it!
+Your team members need to open the **Create** dialog, select the **Existing Dev Environment** tab, and then paste the URL. Your Dev Environment now starts in the exact same state as you shared it.
 
 Using this shared Dev Environment, your team members can access the code, any dependencies, and the current Git branch you are working on. They can also review your changes and provide feedback even before you create a pull request!
 
@@ -112,7 +108,7 @@ You can also use Dev Environments to collaborate on any Docker Compose-based pro
   >
   > When cloning a Git repository using SSH, ensure you've added your SSH key to the ssh-agent. To do this, open a terminal and run `ssh-add <path to your private ssh key>`.
 
-1. Copy `git@github.com:dockersamples/compose-dev-env.git` and add it to the **Create** field on the **Create a Development Environment** page.
+1. Click **Create** to open the **Create a Dev Environment** dialog. Then, copy `https://github.com/dockersamples/compose-dev-env.git` and add it to the **Docker image** field on the **Remote** tab.
 2. Click **Create**. This initializes the project and clones the Git code and builds the Compose application. This:
 
     - Builds local images for services that are defined in the Compose file
@@ -221,14 +217,26 @@ In this preview, Dev Environments support a simple YAML file which allows you to
 >
 > To get involved with the discussion on how we are going to implement this as part of Compose, join the **#docker-dev-environments** channel in the [Docker Community Slack](https://dockercommunity.slack.com/messages){:target="_blank" rel="noopener" class="_"}, or let us know your feedback by creating an issue in the [Dev Environments](https://github.com/docker/dev-environments/issues){:target="_blank" rel="noopener" class="_"} GitHub repository.
 
+## Start a Dev Environment from a local folder
+
+You can also start a Dev Environment from local code on your machine.
+
+1. Click **Create** to open the **Create a Dev Environment** dialog. Select the **Local Folder** tab, and click **Select directory** to open the root of the code that you would like to work on.
+2. Now, click **Create**.
+
+    This creates a Dev Environment using your local folder, and bind-mounts your local code in the Dev Environment. Finally, it opens VS Code inside the Dev Environment container.
+
+> **Note**
+>
+> When using a local folder for a Dev Environment, file changes are synchronized between your Dev Environment container and your local files. This can affect the performance inside the container, depending on the number of files in your local folder and the operations performed in the container.
+
 ## Known issues
 
 The following section lists known issues and workarounds in the Dev Environments Preview:
 
 1. It is currently not possible to share Compose-based applications using Dev Environments because registries do not support Compose applications. Refer to the [Feedback](#feedback) section to let us know your requirements for sharing Compose-based applications.
 2. When sharing a Dev Environment between Mac and Windows, the VS Code terminal may not function correctly in some cases. To work around this issue, use the Exec in CLI option in the Docker Dashboard.
-3. You must wait until Dev Environment is successfully created (indicated by a green icon) before closing the Docker Dashboard. Dev Environments may not be created successfully if you attempt to close the Docker Dashboard while the Dev Environment creation process is in progress.
-4. When sharing a Dev Environment between ARM64 and AMD64 machines, the environment will be emulated.
+3. When sharing a Dev Environment between ARM64 and AMD64 machines, the environment will be emulated.
 
 ## Feedback
 

desktop/faqs.md

@@ -81,6 +81,19 @@ nested virtualization scenarios**. It might work in some cases, and not in other
 
 For more information, see [Running Docker Desktop in nested virtualization scenarios](../docker-for-windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios).
 
+### Docker Desktop's UI appears green, distorted, or has visual artifacts. How do I fix this?
+
+Docker Desktop uses hardware-accelerated graphics by default, which may cause problems for some GPUs. In such cases, 
+Docker Desktop will launch successfully, but some screens may appear green, distorted, 
+or have some visual artifacts.
+
+To work around this issue, disable hardware acceleration by creating a `"disableHardwareAcceleration": true` entry in Docker Desktop's `settings.json` file. You can find this file at:
+
+- **Mac**: `~/Library/Group Containers/group.com.docker/settings.json`
+- **Windows**: `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings.json`
+ 
+After updating the `settings.json` file, close and restart Docker Desktop to apply the changes.
+
 ## Releases
 
 ### When will Docker Desktop move to a cumulative release stream?
@@ -210,4 +223,4 @@ For workarounds and to learn more, see
 
 Docker Desktop supports two types of symlinks: Windows native symlinks and symlinks created inside a container.
 
-The Windows native symlinks are visible within the containers as symlinks, whereas symlinks created inside a container are represented as [mfsymlinks](https://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks): target="_blank" rel="noopener" class="_"}. These are regular Windows files with a special metadata. Therefore the symlinks created inside a container appear as symlinks inside the container, but not on the host.
+The Windows native symlinks are visible within the containers as symlinks, whereas symlinks created inside a container are represented as [mfsymlinks](https://wiki.samba.org/index.php/UNIX_Extensions#Minshall.2BFrench_symlinks){:target="_blank" rel="noopener" class="_"}. These are regular Windows files with a special metadata. Therefore the symlinks created inside a container appear as symlinks inside the container, but not on the host.

docker-for-mac/release-notes.md

@@ -13,14 +13,44 @@ This page contains information about the new features, improvements, known issue
 
 {% include eula.md %}
 
-## Docker Desktop 3.5.2
-2021-07-08
+## Docker Desktop 3.6.0
+2021-08-11
 
 [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn}
 [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
 
 ### New
 
+- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder).
+- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
+- Volume Management: Add name search to volumes list
+
+### Upgrades
+
+- [Compose V2 RC1](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.1)
+  - Docker compose command line completion.
+  - Allow setting 0 scale/replicas.
+  - Detect new container on logs —follow.
+- [Go 1.16.7](https://github.com/golang/go/releases/tag/go1.16.7)
+- [Docker Engine 20.10.8](https://docs.docker.com/engine/release-notes/#20108)
+- [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9)
+- [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1)
+- [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3)
+
+### Bug fixes and minor changes
+
+- Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram.
+- Fixed an issue related to hardware acceleration [docker/for-mac#5121](https://github.com/docker/for-mac/issues/5121)
+- Fixed an issue related to Skip This Update for mac [docker/for-mac#5842](https://github.com/docker/for-mac/issues/5842)
+
+## Docker Desktop 3.5.2
+2021-07-08
+
+[Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg)
+[Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg)
+
+### New
+
 **Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
 
 

docker-for-mac/troubleshoot.md

@@ -115,6 +115,28 @@ To view the contents of the diagnostic file, run:
 $ open /tmp/BE9AFAAF-F68B-41D0-9D12-84760E6B8740/20190905152051.zip
 ```
 
+### Experimental self-diagnose tool
+
+Docker Desktop 3.6.0 contains an experimental "self-diagnose" tool which helps identify some common
+problems. To run it: first locate `com.docker.diagnose`. If you have installed Docker Desktop
+in the Applications directory, then it is located at
+`/Applications/Docker.app/Contents/MacOS/com.docker.diagnose`.
+
+To run the self-diagnose tool:
+
+```console
+$ /Applications/Docker.app/Contents/MacOS/com.docker.diagnose check
+```
+
+The tool runs a suite of checks and displays **PASS** or **FAIL** next to each one. If there are any failures, it highlights the most relevant at the end.
+it will try to highlight the most relevant at the end.
+
+> **Note**
+>
+> The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
+
+The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
+
 <a name="logs"></a>
 
 ## Check the logs

docker-for-windows/release-notes.md

@@ -13,10 +13,46 @@ This page contains information about the new features, improvements, known issue
 
 {% include eula.md %}
 
+## Docker Desktop 3.6.0
+2021-08-11
+
+[Download](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn}
+
+### New
+
+- Dev Environments: You can now create a Dev Environment from your local git repository
+- Volume Management: Add sorting to volume list
+- Volume Management: Add name search to volumes list
+
+### Upgrades
+
+- [Compose V2 RC1](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.1)
+  - Docker compose command line completion.
+  - Allow setting 0 scale/replicas.
+  - Detect new container on logs —follow.
+- [Go 1.16.7](https://github.com/golang/go/releases/tag/go1.16.7)
+- [Docker Engine 20.10.8](https://docs.docker.com/engine/release-notes/#20108)
+- [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9)
+- [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1)
+- [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3)
+
+### Bug fixes and minor changes
+
+- Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram.
+- Fixed spurious traces on iptables updates.
+- Fixed slowness when adding multiple ports forwarding option.
+- Fixed bug where the WSL 2 synchonization code creates dangling symlinks if the WSL 2 home directory if it is the same as the Windows home directory. Fixes [docker/for-win#11668](https://github.com/docker/for-win/issues/11668).
+- Fixed `docker context ls` after upgrade from 3.5.x when the Linux WSL 2 home directory is the same as the Windows home directory.
+- Fixed the permissions on `%PROGRAMDATA%\Docker` to avoid a potential Windows containers compromise. See https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-37841
+- Fixed bug where the Linux home directory under WSL 2 was set to the Windows home directory e.g. `/mnt/c/Users/...`.
+- Fixed bug where Desktop would fail to start if it could not parse CLI contexts. Fixes [docker/for-win#11601](https://github.com/docker/for-win/issues/11601).
+- Fixed an issue related to log display inside a container [docker/for-win#11251](https://github.com/docker/for-win/issues/11251).
+- Fixed failures of the Windows Background Intelligent Transfer Service preventing Docker Desktop to start. [docker/for-win#11273](https://github.com/docker/for-win/issues/11273)
+
 ## Docker Desktop 3.5.2
 2021-07-08
 
-[Download](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn}
+> [Download](https://desktop.docker.com/win/stable/amd64/66501/Docker%20Desktop%20Installer.exe)
 
 ### New
 

docker-for-windows/troubleshoot.md

@@ -81,6 +81,27 @@ Diagnostics Bundle: C:\Users\User\AppData\Local\Temp\CD6CF862-9CBD-4007-9C2F-5FB
 Diagnostics ID:     CD6CF862-9CBD-4007-9C2F-5FBE0572BBC2/20180720152545 (uploaded)
 ```
 
+### Experimental self-diagnose tool
+
+Docker Desktop 3.6.0 contains an experimental "self-diagnose" tool which helps identify some common
+problems. To run it: first locate `com.docker.diagnose.exe`, usually installed in `C:\Program
+Files\Docker\Docker\resources\com.docker.diagnose.exe`.
+
+To run the self-diagnose tool in Powershell:
+
+```powershell
+  PS C:\> & "C:\Program Files\Docker\Docker\resources\com.docker.diagnose.exe" check
+```
+
+The tool runs a suite of checks and displays **PASS** or **FAIL** next to each one. If there are any failures, it highlights the most relevant at the end.
+it will try to highlight the most relevant at the end.
+
+> **Note**
+>
+> The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository.
+
+The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository.
+
 ## Troubleshooting topics
 
 ### Make sure certificates are set up correctly

go/deprecated.md

@@ -0,0 +1,5 @@
+---
+title: Deprecated Engine features
+description: Redirect to features that have been deprecated in the Docker Engine.
+redirect_to: /engine/deprecated/#deprecated-engine-features-1
+---